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

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

Issue 9160012: Change PluginWindowHandle to AcceleratedWidget in ui/gfx/gl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: oops mac 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 | « third_party/khronos/README.chromium ('k') | ui/gfx/gl/gl_context_nsview.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/compositor/compositor.cc
diff --git a/ui/gfx/compositor/compositor.cc b/ui/gfx/compositor/compositor.cc
index 6dd9fc3e576d8538b40903321c2f4a54bae10b5b..54d5b80c09c1b9f9da541665fe45b45e47ce9e71 100644
--- a/ui/gfx/compositor/compositor.cc
+++ b/ui/gfx/compositor/compositor.cc
@@ -254,19 +254,10 @@ WebKit::WebGraphicsContext3D* Compositor::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 =
SharedResources::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 | « third_party/khronos/README.chromium ('k') | ui/gfx/gl/gl_context_nsview.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698