Remove offscreen compositor contexts.

content/browser/android/in_process/synchronous_compositor_factory_impl.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_FACTORY_IMPL_H_
 #define CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_FACTORY_IMPL_H_
 
 #include "base/synchronization/lock.h"
 #include "content/browser/android/in_process/synchronous_input_event_filter.h"
 #include "content/renderer/android/synchronous_compositor_factory.h"
@@ skipping 23 matching lines @@
   virtual ~SynchronousCompositorFactoryImpl();
 
   // SynchronousCompositorFactory
   virtual scoped_refptr<base::MessageLoopProxy> GetCompositorMessageLoop()
       OVERRIDE;
   virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(int routing_id)
       OVERRIDE;
   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 will complain.

[danakj, 2014/04/24 15:01:32]

This method is still in the SynchronousCompositorFactory interface, so I think
it needs to stay.

[danakj, 2014/04/24 15:02:42]

But it looks like I could remoev it from the interface

[danakj, 2014/04/24 15:04:07]

This was me looking at my file without refreshing it after switching branches.

Done!

   virtual scoped_refptr<StreamTextureFactory> CreateStreamTextureFactory(
       int view_id) OVERRIDE;
   virtual blink::WebGraphicsContext3D* CreateOffscreenGraphicsContext3D(
       const blink::WebGraphicsContext3D::Attributes& attributes) OVERRIDE;
 
   SynchronousInputEventFilter* synchronous_input_event_filter() {
     return &synchronous_input_event_filter_;
   }
 
   void SetDeferredGpuService(
       scoped_refptr<gpu::InProcessCommandBuffer::Service> service);
   void CompositorInitializedHardwareDraw();
   void CompositorReleasedHardwareDraw();
 
   scoped_refptr<cc::ContextProvider>
       CreateOnscreenContextProviderForCompositorThread(
           scoped_refptr<gfx::GLSurface> surface);
 
  private:
   bool CanCreateMainThreadContext();
   scoped_refptr<StreamTextureFactorySynchronousImpl::ContextProvider>
       TryCreateStreamTextureFactory();
 
   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
   // |offscreen_context_for_main_thread_|.
   gpu::GLInProcessContext* wrapped_gl_context_for_compositor_thread_;
   scoped_refptr<cc::ContextProvider> offscreen_context_for_compositor_thread_;
 
   scoped_refptr<gpu::InProcessCommandBuffer::Service> service_;
   scoped_refptr<StreamTextureFactorySynchronousImpl::ContextProvider>
       video_context_provider_;
 
   // |num_hardware_compositor_lock_| is updated on UI thread only but can be
   // read on renderer main thread.
   base::Lock num_hardware_compositor_lock_;
   unsigned int num_hardware_compositors_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_FACTORY_IMPL_H_