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

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

Issue 1395923003: Share context creation logic with sync compositor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 2 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: content/browser/android/in_process/synchronous_compositor_factory_impl.h
diff --git a/content/browser/android/in_process/synchronous_compositor_factory_impl.h b/content/browser/android/in_process/synchronous_compositor_factory_impl.h
index a297c2126d3b0c40cbbaba794622e524e5fca961..a15ec710a7742778cb27b1a8c87f11bfc143736d 100644
--- a/content/browser/android/in_process/synchronous_compositor_factory_impl.h
+++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.h
@@ -40,8 +40,9 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory {
override;
scoped_ptr<cc::OutputSurface> CreateOutputSurface(
int routing_id,
- scoped_refptr<content::FrameSwapMessageQueue> frame_swap_message_queue)
- override;
+ scoped_refptr<content::FrameSwapMessageQueue> frame_swap_message_queue,
boliu 2015/10/13 18:49:09 just realized these are not const&, I'll fix them
+ scoped_refptr<cc::ContextProvider> onscreen_context,
+ scoped_refptr<cc::ContextProvider> worker_context) override;
InputHandlerManagerClient* GetInputHandlerManagerClient() override;
scoped_ptr<cc::BeginFrameSource> CreateExternalBeginFrameSource(
int routing_id) override;
@@ -61,9 +62,6 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory {
private:
- scoped_refptr<cc::ContextProvider> CreateContextProviderForCompositor(
- int surface_id,
- CommandBufferContextType type);
scoped_refptr<cc::ContextProvider> GetSharedWorkerContextProvider();
bool CanCreateMainThreadContext();
scoped_refptr<StreamTextureFactorySynchronousImpl::ContextProvider>
@@ -77,8 +75,6 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory {
class VideoContextProvider;
scoped_refptr<VideoContextProvider> video_context_provider_;
- scoped_refptr<ContextProviderCommandBuffer> shared_worker_context_;
-
// |num_hardware_compositor_lock_| is updated on UI thread only but can be
// read on renderer main thread.
base::Lock num_hardware_compositor_lock_;

Powered by Google App Engine
This is Rietveld 408576698