| Index: android_webview/browser/render_thread_manager.h
|
| diff --git a/android_webview/browser/render_thread_manager.h b/android_webview/browser/render_thread_manager.h
|
| index b1b9301681b1b7dd4378cf0250eed2204b9e0268..072592962518ed046d20488f6f4872ff6d194f9c 100644
|
| --- a/android_webview/browser/render_thread_manager.h
|
| +++ b/android_webview/browser/render_thread_manager.h
|
| @@ -47,10 +47,7 @@ class RenderThreadManager : public CompositorFrameConsumer {
|
| void SetCompositorFrameProducer(
|
| CompositorFrameProducer* compositor_frame_producer) override;
|
| void SetScrollOffsetOnUI(gfx::Vector2d scroll_offset) override;
|
| - void SetFrameOnUI(
|
| - std::unique_ptr<ChildFrame> frame,
|
| - const scoped_refptr<content::SynchronousCompositor::FrameFuture>&
|
| - frame_future) override;
|
| + void SetFrameOnUI(std::unique_ptr<ChildFrame> frame) override;
|
| void InitializeHardwareDrawIfNeededOnUI() override;
|
| ParentCompositorDrawConstraints GetParentDrawConstraintsOnUI() const override;
|
| void SwapReturnedResourcesOnUI(
|
| @@ -63,8 +60,6 @@ class RenderThreadManager : public CompositorFrameConsumer {
|
| // Render thread methods.
|
| gfx::Vector2d GetScrollOffsetOnRT();
|
| std::unique_ptr<ChildFrame> PassFrameOnRT();
|
| - scoped_refptr<content::SynchronousCompositor::FrameFuture>
|
| - PassFrameFutureOnRT();
|
| void DrawGL(AwDrawGLInfo* draw_info);
|
| void PostExternalDrawConstraintsToChildCompositorOnRT(
|
| const ParentCompositorDrawConstraints& parent_draw_constraints);
|
| @@ -117,7 +112,6 @@ class RenderThreadManager : public CompositorFrameConsumer {
|
| gfx::Vector2d scroll_offset_;
|
| std::unique_ptr<ChildFrame> child_frame_;
|
| const bool async_on_draw_hardware_;
|
| - scoped_refptr<content::SynchronousCompositor::FrameFuture> frame_future_;
|
| bool inside_hardware_release_;
|
| ParentCompositorDrawConstraints parent_draw_constraints_;
|
| ReturnedResourcesMap returned_resources_map_;
|
|
|