Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Side by Side Diff: ui/compositor/test_web_graphics_context_3d.cc

Issue 10635024: Return different IDs from TestWebGraphicsContext3D::createTexture (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: style Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/compositor/test_web_graphics_context_3d.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/compositor/test_web_graphics_context_3d.h" 5 #include "ui/compositor/test_web_graphics_context_3d.h"
6 6
7 #include "ui/gl/gl_context_stub.h" 7 #include "ui/gl/gl_context_stub.h"
8 #include "ui/gl/gl_surface_stub.h" 8 #include "ui/gl/gl_surface_stub.h"
9 9
10 namespace ui { 10 namespace ui {
11 11
12 TestWebGraphicsContext3D::TestWebGraphicsContext3D() {} 12 TestWebGraphicsContext3D::TestWebGraphicsContext3D()
13 : next_texture_id_(1) {}
14
13 TestWebGraphicsContext3D::~TestWebGraphicsContext3D() {} 15 TestWebGraphicsContext3D::~TestWebGraphicsContext3D() {}
14 16
15 void TestWebGraphicsContext3D::Initialize() { 17 void TestWebGraphicsContext3D::Initialize() {
16 gl_surface_ = new gfx::GLSurfaceStub; 18 gl_surface_ = new gfx::GLSurfaceStub;
17 gl_context_ = new gfx::GLContextStub; 19 gl_context_ = new gfx::GLContextStub;
18 gl_context_->MakeCurrent(gl_surface_.get()); 20 gl_context_->MakeCurrent(gl_surface_.get());
19 } 21 }
20 22
21 bool TestWebGraphicsContext3D::makeContextCurrent() { 23 bool TestWebGraphicsContext3D::makeContextCurrent() {
22 return true; 24 return true;
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 WebKit::WebGLId TestWebGraphicsContext3D::createRenderbuffer() { 211 WebKit::WebGLId TestWebGraphicsContext3D::createRenderbuffer() {
210 return 1; 212 return 1;
211 } 213 }
212 214
213 WebKit::WebGLId TestWebGraphicsContext3D::createShader( 215 WebKit::WebGLId TestWebGraphicsContext3D::createShader(
214 WebKit::WGC3Denum value) { 216 WebKit::WGC3Denum value) {
215 return 1; 217 return 1;
216 } 218 }
217 219
218 WebKit::WebGLId TestWebGraphicsContext3D::createTexture() { 220 WebKit::WebGLId TestWebGraphicsContext3D::createTexture() {
219 return 1; 221 return next_texture_id_++;
220 } 222 }
221 223
222 WebKit::WebGLId TestWebGraphicsContext3D::createQueryEXT() 224 WebKit::WebGLId TestWebGraphicsContext3D::createQueryEXT()
223 { 225 {
224 return 1; 226 return 1;
225 } 227 }
226 228
227 WebKit::WGC3Dboolean TestWebGraphicsContext3D::isQueryEXT(WebKit::WebGLId) 229 WebKit::WGC3Dboolean TestWebGraphicsContext3D::isQueryEXT(WebKit::WebGLId)
228 { 230 {
229 return true; 231 return true;
230 } 232 }
231 233
232 } // namespace ui 234 } // namespace ui
OLDNEW
« no previous file with comments | « ui/compositor/test_web_graphics_context_3d.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698