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

Unified Diff: trunk/src/content/renderer/renderer_webkitplatformsupport_impl.cc

Issue 136273002: Revert 244383 "Use ContextProvider subclass to provide WGC3D poi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
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
Index: trunk/src/content/renderer/renderer_webkitplatformsupport_impl.cc
===================================================================
--- trunk/src/content/renderer/renderer_webkitplatformsupport_impl.cc (revision 244469)
+++ trunk/src/content/renderer/renderer_webkitplatformsupport_impl.cc (working copy)
@@ -48,7 +48,6 @@
#include "content/renderer/renderer_clipboard_client.h"
#include "content/renderer/webclipboard_impl.h"
#include "content/renderer/webcrypto/webcrypto_impl.h"
-#include "content/renderer/webgraphicscontext3d_provider_impl.h"
#include "content/renderer/webpublicsuffixlist_impl.h"
#include "gpu/config/gpu_info.h"
#include "ipc/ipc_sync_message_filter.h"
@@ -71,7 +70,7 @@
#include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
#include "ui/gfx/color_profile.h"
#include "url/gurl.h"
-#include "webkit/common/gpu/context_provider_web_context.h"
+#include "webkit/common/gpu/webgraphicscontext3d_provider_impl.h"
#include "webkit/common/quota/quota_types.h"
#include "webkit/glue/simple_webmimeregistry_impl.h"
#include "webkit/glue/webfileutilities_impl.h"
@@ -969,11 +968,11 @@
blink::WebGraphicsContext3DProvider* RendererWebKitPlatformSupportImpl::
createSharedOffscreenGraphicsContext3DProvider() {
- scoped_refptr<webkit::gpu::ContextProviderWebContext> provider =
+ scoped_refptr<cc::ContextProvider> provider =
RenderThreadImpl::current()->SharedMainThreadContextProvider();
if (!provider)
return NULL;
- return new WebGraphicsContext3DProviderImpl(provider);
+ return new webkit::gpu::WebGraphicsContext3DProviderImpl(provider);
}
//------------------------------------------------------------------------------
« no previous file with comments | « trunk/src/content/renderer/render_thread_impl.cc ('k') | trunk/src/content/renderer/webgraphicscontext3d_provider_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698