Chromium Code Reviews| Index: android_webview/browser/child_frame.cc |
| diff --git a/android_webview/browser/child_frame.cc b/android_webview/browser/child_frame.cc |
| index 6b695f8f420f976d71a836abd04b3e2014bea1d5..dbd52c80fe46c8ec63e36b02357d12e89c174227 100644 |
| --- a/android_webview/browser/child_frame.cc |
| +++ b/android_webview/browser/child_frame.cc |
| @@ -8,15 +8,18 @@ |
| namespace android_webview { |
| -ChildFrame::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) |
| - : output_surface_id(output_surface_id), |
| - frame(std::move(frame)), |
| +// ChildFrame::ChildFrame(uint32_t output_surface_id, |
|
boliu
2016/09/16 16:26:12
ditto
ojars
2016/09/19 22:02:36
Done.
|
| +// std::unique_ptr<cc::CompositorFrame> frame, |
| +ChildFrame::ChildFrame( |
| + scoped_refptr<content::SynchronousCompositor::FrameFuture> frame_future, |
| + 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) |
| + // : output_surface_id(output_surface_id), |
|
boliu
2016/09/16 16:26:12
ditto
ojars
2016/09/19 22:02:37
Done.
|
| + // frame(std::move(frame)), |
| + : frame_future(frame_future), |
| compositor_id(compositor_id), |
| viewport_rect_for_tile_priority_empty( |
| viewport_rect_for_tile_priority_empty), |