Expose locks for CopyFromCompositingSurface/CopyFromBackingStore API

content/browser/renderer_host/render_widget_host_view_android.h

Index: content/browser/renderer_host/render_widget_host_view_android.h
diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h
index 869e5377cfc124ff45606f5b7b7cee1b92bed7f8..1003c51428689634dbba7f23415f60e4a06632ab 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -174,6 +174,8 @@ class RenderWidgetHostViewAndroid
                                        const SkBitmap& zoomed_bitmap) OVERRIDE;
   virtual scoped_ptr<SyntheticGestureTarget> CreateSyntheticGestureTarget()
       OVERRIDE;
+  virtual void LockSurfaceForCopy() OVERRIDE;
+  virtual void UnlockSurfaceForCopy() OVERRIDE;
 
   // Implementation of BrowserAccessibilityDelegate:
   virtual void SetAccessibilityFocus(int acc_obj_id) OVERRIDE;
@@ -217,9 +219,6 @@ class RenderWidgetHostViewAndroid
   void OnSetNeedsBeginFrame(bool enabled);
   void OnSmartClipDataExtracted(const base::string16& result);
 
-  void LockResources();
-  void UnlockResources();
-
   long GetNativeImeAdapter();
 
   void WasResized();
@@ -292,6 +291,11 @@ class RenderWidgetHostViewAndroid
       const base::Callback<void(bool, const SkBitmap&)>& callback,
       const SkBitmap::Config config);
 
+  // If we have locks on a frame during a ContentViewCore swap or a context
+  // lost, the frame is no longer valid and we can safely release all the locks.
+  // Use this method to release all the locks.
+  void ReleaseLocksOnSurface();
+
   // The model object.
   RenderWidgetHostImpl* host_;
 
@@ -357,6 +361,8 @@ class RenderWidgetHostViewAndroid
 
   bool using_delegated_renderer_;
 
+  size_t locks_on_frame_count_;
+
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);
 };