| Index: content/browser/renderer_host/render_widget_host_view_android.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| index 54d8a0685b4d83c9f1dd960c4294d1c757469e07..78c0d2271379a3629f84f3621665b921121d1daf 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| @@ -450,7 +450,6 @@
|
| this),
|
| stylus_text_selector_(this),
|
| using_browser_compositor_(CompositorImpl::IsInitialized()),
|
| - synchronous_compositor_client_(nullptr),
|
| frame_evictor_(new DelegatedFrameEvictor(this)),
|
| locks_on_frame_count_(0),
|
| observing_root_window_(false),
|
| @@ -1203,14 +1202,6 @@
|
| &RenderFrameDevToolsAgentHost::SynchronousSwapCompositorFrame,
|
| static_cast<RenderFrameDevToolsAgentHost*>(dtah.get()),
|
| base::Passed(&frame_metadata)));
|
| - }
|
| -}
|
| -
|
| -void RenderWidgetHostViewAndroid::SetSynchronousCompositorClient(
|
| - SynchronousCompositorClient* client) {
|
| - synchronous_compositor_client_ = client;
|
| - if (!sync_compositor_ && synchronous_compositor_client_) {
|
| - sync_compositor_ = SynchronousCompositorHost::Create(this);
|
| }
|
| }
|
|
|
| @@ -1797,6 +1788,11 @@
|
| overscroll_controller_ = CreateOverscrollController(
|
| content_view_core_, ui::GetScaleFactorForNativeView(GetNativeView()));
|
| }
|
| +
|
| + if (!sync_compositor_) {
|
| + sync_compositor_ = SynchronousCompositorHost::Create(
|
| + this, content_view_core_->GetWebContents());
|
| + }
|
| }
|
|
|
| void RenderWidgetHostViewAndroid::RunAckCallbacks() {
|
|
|