Added FrameFuture class

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 2cc3a4640e34a40ad3554b6cfbce90e65f662cf8..b6dc92d0a6f27df1e1477be9553f920432cc16e9 100644
--- a/android_webview/browser/child_frame.h
+++ b/android_webview/browser/child_frame.h
@@ -9,6 +9,8 @@
 
 #include "android_webview/browser/compositor_id.h"
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "content/public/browser/android/synchronous_compositor.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/transform.h"
@@ -21,17 +23,20 @@ namespace android_webview {
 
 class ChildFrame {
  public:
-  ChildFrame(uint32_t output_surface_id,
-             std::unique_ptr<cc::CompositorFrame> frame,
-             const CompositorID& compositor_id,
-             bool viewport_rect_for_tile_priority_empty,
-             const gfx::Transform& transform_for_tile_priority,
-             bool offscreen_pre_raster,
-             bool is_layer);
+  //  ChildFrame(uint32_t output_surface_id,

[boliu, 2016/09/16 16:26:12]

commented out code

[ojars, 2016/09/19 22:02:37]

Done.

+  //             std::unique_ptr<cc::CompositorFrame> frame,
+  ChildFrame(
+      scoped_refptr<content::SynchronousCompositor::FrameFuture> frame_future,

[boliu, 2016/09/16 16:26:12]

const &

[ojars, 2016/09/19 22:02:37]

Done.

+      const CompositorID& compositor_id,
+      bool viewport_rect_for_tile_priority_empty,
+      const gfx::Transform& transform_for_tile_priority,
+      bool offscreen_pre_raster,
+      bool is_layer);
   ~ChildFrame();
 
-  const uint32_t output_surface_id;
-  std::unique_ptr<cc::CompositorFrame> frame;
+  // const uint32_t output_surface_id;

[boliu, 2016/09/16 16:26:12]

ditto

[ojars, 2016/09/19 22:02:37]

Done.

+  // std::unique_ptr<cc::CompositorFrame> frame;
+  scoped_refptr<content::SynchronousCompositor::FrameFuture> frame_future;
   // The id of the compositor this |frame| comes from.
   const CompositorID compositor_id;
   const bool viewport_rect_for_tile_priority_empty;