Associate an id with the output surface to handle lost contexts

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 41f5d8f9e2f016995dd7b7f3ce1c503b00fb5203..5a530dd038ba6c6b3533e3f3bb00cd4148aea5cc 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -156,6 +156,7 @@ class RenderWidgetHostViewAndroid
   virtual void UnlockMouse() OVERRIDE;
   virtual void HasTouchEventHandlers(bool need_touch_events) OVERRIDE;
   virtual void OnSwapCompositorFrame(
+      uint32 output_surface_id,
       scoped_ptr<cc::CompositorFrame> frame) OVERRIDE;
   virtual void OnOverscrolled(gfx::Vector2dF accumulated_overscroll,
                               gfx::Vector2dF current_fling_velocity) OVERRIDE;
@@ -235,8 +236,9 @@ class RenderWidgetHostViewAndroid
 
   void RunAckCallbacks();
 
-  void SwapDelegatedFrame(scoped_ptr<cc::DelegatedFrameData> frame_data);
-  void SendDelegatedFrameAck();
+  void SwapDelegatedFrame(uint32 output_surface_id,
+                          scoped_ptr<cc::DelegatedFrameData> frame_data);
+  void SendDelegatedFrameAck(uint32 output_surface_id);
 
   void UpdateContentViewCoreFrameMetadata(
       const cc::CompositorFrameMetadata& frame_metadata);