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

Unified Diff: cc/test/test_web_graphics_context_3d.cc

Issue 126973002: Decouple cc::FakeWebGraphicsContext3D from blink::WGC3D (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/test/test_web_graphics_context_3d.h ('k') | cc/trees/layer_tree_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « cc/test/test_web_graphics_context_3d.h ('k') | cc/trees/layer_tree_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698