| Index: android_webview/browser/child_frame.h
|
| diff --git a/android_webview/browser/child_frame.h b/android_webview/browser/child_frame.h
|
| index 2d37502787b08d3e009999f5c293b73074ca7a0f..17874024aaaf82dbf7eec4f052828d9f191898f4 100644
|
| --- a/android_webview/browser/child_frame.h
|
| +++ b/android_webview/browser/child_frame.h
|
| @@ -9,20 +9,18 @@
|
|
|
| #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"
|
|
|
| -namespace cc {
|
| -class CompositorFrame;
|
| -}
|
| -
|
| namespace android_webview {
|
|
|
| class ChildFrame {
|
| public:
|
| - ChildFrame(uint32_t compositor_frame_sink_id,
|
| - std::unique_ptr<cc::CompositorFrame> frame,
|
| + ChildFrame(const 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,
|
| @@ -30,8 +28,7 @@ class ChildFrame {
|
| bool is_layer);
|
| ~ChildFrame();
|
|
|
| - const uint32_t compositor_frame_sink_id;
|
| - 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;
|
|
|