Index: cc/test/test_web_graphics_context_3d.cc |
diff --git a/cc/test/test_web_graphics_context_3d.cc b/cc/test/test_web_graphics_context_3d.cc |
index 91c8657c8071872257dcbe218f0efcbb0d469594..e454976851a95635df412b2df62f10853b6bf7dd 100644 |
--- a/cc/test/test_web_graphics_context_3d.cc |
+++ b/cc/test/test_web_graphics_context_3d.cc |
@@ -91,16 +91,12 @@ TestWebGraphicsContext3D::~TestWebGraphicsContext3D() { |
} |
void TestWebGraphicsContext3D::CreateNamespace() { |
- if (attributes_.shareResources) { |
- base::AutoLock lock(g_shared_namespace_lock.Get()); |
- if (shared_namespace_) { |
- namespace_ = shared_namespace_; |
- } else { |
- namespace_ = new Namespace; |
- shared_namespace_ = namespace_.get(); |
- } |
+ base::AutoLock lock(g_shared_namespace_lock.Get()); |
+ if (shared_namespace_) { |
+ namespace_ = shared_namespace_; |
} else { |
namespace_ = new Namespace; |
+ shared_namespace_ = namespace_.get(); |
} |
} |
@@ -123,11 +119,6 @@ WGC3Denum TestWebGraphicsContext3D::checkFramebufferStatus( |
return GL_FRAMEBUFFER_COMPLETE; |
} |
-WebGraphicsContext3D::Attributes |
- TestWebGraphicsContext3D::getContextAttributes() { |
- return attributes_; |
-} |
- |
blink::WebString TestWebGraphicsContext3D::getString(WGC3Denum name) { |
return blink::WebString(); |
} |
@@ -418,7 +409,7 @@ void TestWebGraphicsContext3D::genMailboxCHROMIUM(blink::WGC3Dbyte* mailbox) { |
} |
void TestWebGraphicsContext3D::setContextLostCallback( |
- WebGraphicsContextLostCallback* callback) { |
+ blink::WebGraphicsContext3D::WebGraphicsContextLostCallback* callback) { |
context_lost_callback_ = callback; |
} |