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

Unified Diff: trunk/src/content/browser/android/in_process/synchronous_compositor_factory_impl.h

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
« no previous file with comments | « no previous file | trunk/src/content/browser/android/in_process/synchronous_compositor_factory_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/browser/android/in_process/synchronous_compositor_factory_impl.h
===================================================================
--- trunk/src/content/browser/android/in_process/synchronous_compositor_factory_impl.h (revision 244469)
+++ trunk/src/content/browser/android/in_process/synchronous_compositor_factory_impl.h (working copy)
@@ -9,7 +9,6 @@
#include "content/browser/android/in_process/synchronous_input_event_filter.h"
#include "content/renderer/android/synchronous_compositor_factory.h"
#include "content/renderer/media/android/stream_texture_factory_android_synchronous_impl.h"
-#include "webkit/common/gpu/context_provider_web_context.h"
namespace gpu {
class GLInProcessContext;
@@ -34,7 +33,7 @@
virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(int routing_id)
OVERRIDE;
virtual InputHandlerManagerClient* GetInputHandlerManagerClient() OVERRIDE;
- virtual scoped_refptr<webkit::gpu::ContextProviderWebContext>
+ virtual scoped_refptr<cc::ContextProvider>
GetOffscreenContextProviderForMainThread() OVERRIDE;
// This is called on both renderer main thread (offscreen context creation
// path shared between cross-process and in-process platforms) and renderer
@@ -67,8 +66,7 @@
// Only guards construction and destruction of
// |offscreen_context_for_compositor_thread_|, not usage.
base::Lock offscreen_context_for_compositor_thread_lock_;
- scoped_refptr<webkit::gpu::ContextProviderWebContext>
- offscreen_context_for_main_thread_;
+ scoped_refptr<cc::ContextProvider> offscreen_context_for_main_thread_;
// This is a pointer to the context owned by
// |offscreen_context_for_main_thread_|.
gpu::GLInProcessContext* wrapped_gl_context_for_main_thread_;
« no previous file with comments | « no previous file | trunk/src/content/browser/android/in_process/synchronous_compositor_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698