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

Unified Diff: ui/gfx/compositor/compositor_cc.cc

Issue 9141034: Always use webkit compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix shared build Created 8 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 | « content/test/content_test_suite.cc ('k') | ui/gfx/compositor/compositor_setup.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/compositor/compositor_cc.cc
diff --git a/ui/gfx/compositor/compositor_cc.cc b/ui/gfx/compositor/compositor_cc.cc
index 8957990c10b3f8402a424f2117bb22355afe298c..91b2cb6bee4bf4445b346b17ab2447c408e9016c 100644
--- a/ui/gfx/compositor/compositor_cc.cc
+++ b/ui/gfx/compositor/compositor_cc.cc
@@ -264,10 +264,19 @@ WebKit::WebGraphicsContext3D* CompositorCC::createContext3D() {
// Use context that results in no rendering to the screen.
context = new TestWebGraphicsContext3D();
} else {
+#if defined(OS_MACOSX) && !defined(USE_AURA)
+ // Non-Aura builds compile this code but doesn't call it. Unfortunately
+ // this is where we translate gfx::AcceleratedWidget to
+ // gfx::PluginWindowHandle, and they are different on non-Aura Mac.
+ // TODO(piman): remove ifdefs when AcceleratedWidget is rationalized on Mac.
+ NOTIMPLEMENTED();
+ return NULL;
+#else
gfx::GLShareGroup* share_group =
SharedResourcesCC::GetInstance()->GetShareGroup();
context = new webkit::gpu::WebGraphicsContext3DInProcessImpl(
widget_, share_group);
+#endif
}
WebKit::WebGraphicsContext3D::Attributes attrs;
context->initialize(attrs, 0, true);
« no previous file with comments | « content/test/content_test_suite.cc ('k') | ui/gfx/compositor/compositor_setup.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698