Chromium Code Reviews| 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 6ea232825e1aad5a19022d1b1f0d8f12d01bdb97..d9a287ac533512baa3f99ec27af4814f940f8bc5 100644 |
| --- a/content/browser/android/in_process/synchronous_compositor_factory_impl.h |
| +++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.h |
| @@ -41,12 +41,9 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory { |
| virtual InputHandlerManagerClient* GetInputHandlerManagerClient() OVERRIDE; |
| virtual scoped_refptr<webkit::gpu::ContextProviderWebContext> |
| GetSharedOffscreenContextProviderForMainThread() OVERRIDE; |
| - // This is called on both renderer main thread (offscreen context creation |
| - // path shared between cross-process and in-process platforms) and renderer |
| - // compositor impl thread (InitializeHwDraw) in order to support Android |
| - // WebView synchronously enable and disable hardware mode multiple times in |
| - // the same task. This is ok because in-process WGC3D creation may happen on |
| - // any thread and is lightweight. |
| + // This is called on the renderer compositor impl thread (InitializeHwDraw) in |
| + // order to support Android WebView synchronously enable and disable hardware |
| + // mode multiple times in the same task. |
| virtual scoped_refptr<cc::ContextProvider> |
| GetOffscreenContextProviderForCompositorThread() OVERRIDE; |
|
boliu
2014/04/24 00:28:57
Can remove virtual and OVERRIDE, otherwise clang w
danakj
2014/04/24 15:01:32
This method is still in the SynchronousCompositorF
danakj
2014/04/24 15:02:42
But it looks like I could remoev it from the inter
danakj
2014/04/24 15:04:07
This was me looking at my file without refreshing
|
| virtual scoped_refptr<StreamTextureFactory> CreateStreamTextureFactory( |
| @@ -74,9 +71,6 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory { |
| SynchronousInputEventFilter synchronous_input_event_filter_; |
| - // 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_; |
| // This is a pointer to the context owned by |