| Index: cc/test/layer_tree_test_common.cc
|
| diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
|
| index bfa15dd91d64ca0269a67b582a8a5b104be35942..88b4a8a94fd01db43ff906b63dd6c2996613fb47 100644
|
| --- a/cc/test/layer_tree_test_common.cc
|
| +++ b/cc/test/layer_tree_test_common.cc
|
| @@ -35,21 +35,21 @@ scoped_ptr<CompositorFakeWebGraphicsContext3DWithTextureTracking> CompositorFake
|
| return make_scoped_ptr(new CompositorFakeWebGraphicsContext3DWithTextureTracking(attrs));
|
| }
|
|
|
| -WebGLId CompositorFakeWebGraphicsContext3DWithTextureTracking::createTexture()
|
| +WebKit::WebGLId CompositorFakeWebGraphicsContext3DWithTextureTracking::createTexture()
|
| {
|
| - WebGLId texture = m_textures.size() + 1;
|
| + WebKit::WebGLId texture = m_textures.size() + 1;
|
| m_textures.push_back(texture);
|
| return texture;
|
| }
|
|
|
| -void CompositorFakeWebGraphicsContext3DWithTextureTracking::deleteTexture(WebGLId texture)
|
| +void CompositorFakeWebGraphicsContext3DWithTextureTracking::deleteTexture(WebKit::WebGLId texture)
|
| {
|
| - std::vector<WebGLId>::iterator i(std::find(m_textures.begin(), m_textures.end(), texture));
|
| + std::vector<WebKit::WebGLId>::iterator i(std::find(m_textures.begin(), m_textures.end(), texture));
|
| if (i != m_textures.end())
|
| m_textures.erase(i);
|
| }
|
|
|
| -void CompositorFakeWebGraphicsContext3DWithTextureTracking::bindTexture(WGC3Denum /* target */, WebGLId texture)
|
| +void CompositorFakeWebGraphicsContext3DWithTextureTracking::bindTexture(WebKit::WGC3Denum /* target */, WebKit::WebGLId texture)
|
| {
|
| m_usedTextures.insert(texture);
|
| }
|
|
|