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

Unified Diff: ui/compositor/compositor.cc

Issue 14241034: ui: Use WebGraphicsContext3DInProcessCommandBufferImpl in compositor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/compositor.cc
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index fe66c3ea29f304956a74f464ef99953cc566730b..6f65e8a78a11d0b4a80fc80471a8cca6311c0aa2 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -33,7 +33,7 @@
#include "ui/gl/gl_surface.h"
#include "ui/gl/gl_switches.h"
#include "webkit/gpu/grcontext_for_webgraphicscontext3d.h"
-#include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
+#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
#if defined(OS_CHROMEOS)
#include "base/chromeos/chromeos_version.h"
@@ -245,12 +245,13 @@ WebKit::WebGraphicsContext3D* DefaultContextFactory::CreateContextCommon(
attrs.stencil = false;
attrs.antialias = false;
attrs.shareResources = true;
+ using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
WebKit::WebGraphicsContext3D* context =
offscreen ?
- webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWebView(
- attrs, false) :
- webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWindow(
- attrs, compositor->widget(), NULL);
+ WebGraphicsContext3DInProcessCommandBufferImpl::CreateOffscreenContext(
+ attrs) :
+ WebGraphicsContext3DInProcessCommandBufferImpl::CreateViewContext(
+ attrs, compositor->widget());
if (!context)
return NULL;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698