sync compositor: Add output_surface_id

android_webview/browser/child_frame.h

Index: android_webview/browser/child_frame.h
diff --git a/android_webview/browser/child_frame.h b/android_webview/browser/child_frame.h
index b83e57efc06567ce15514617d406235b5aab2c4a..ca429581ee7138d40b7919d0884c28df89a9e864 100644
--- a/android_webview/browser/child_frame.h
+++ b/android_webview/browser/child_frame.h
@@ -19,7 +19,8 @@ namespace android_webview {
 
 class ChildFrame {
  public:
-  ChildFrame(scoped_ptr<cc::CompositorFrame> frame,
+  ChildFrame(uint32_t output_surface_id,
+             scoped_ptr<cc::CompositorFrame> frame,
              uint32_t compositor_id,
              bool viewport_rect_for_tile_priority_empty,
              const gfx::Transform& transform_for_tile_priority,
@@ -27,6 +28,7 @@ class ChildFrame {
              bool is_layer);
   ~ChildFrame();
 
+  const uint32_t output_surface_id;
   scoped_ptr<cc::CompositorFrame> frame;
   // The id of the compositor this |frame| comes from.
   const uint32_t compositor_id;