| Index: content/browser/web_contents/web_contents_view_android.cc
|
| diff --git a/content/browser/web_contents/web_contents_view_android.cc b/content/browser/web_contents/web_contents_view_android.cc
|
| index f5364942b7d9e24e8ae3a2903933b5c9afcbf46c..e3b9d4ad53631b2a91caa1b4e1aa2bd54264310e 100644
|
| --- a/content/browser/web_contents/web_contents_view_android.cc
|
| +++ b/content/browser/web_contents/web_contents_view_android.cc
|
| @@ -46,22 +46,6 @@
|
| results->is_monochrome = display.is_monochrome();
|
| }
|
|
|
| -// static
|
| -void SynchronousCompositor::SetClientForWebContents(
|
| - WebContents* contents,
|
| - SynchronousCompositorClient* client) {
|
| - DCHECK(contents);
|
| - DCHECK(client);
|
| - WebContentsViewAndroid* wcva = static_cast<WebContentsViewAndroid*>(
|
| - static_cast<WebContentsImpl*>(contents)->GetView());
|
| - DCHECK(!wcva->synchronous_compositor_client());
|
| - wcva->set_synchronous_compositor_client(client);
|
| - RenderWidgetHostViewAndroid* rwhv = static_cast<RenderWidgetHostViewAndroid*>(
|
| - contents->GetRenderWidgetHostView());
|
| - if (rwhv)
|
| - rwhv->SetSynchronousCompositorClient(client);
|
| -}
|
| -
|
| WebContentsView* CreateWebContentsView(
|
| WebContentsImpl* web_contents,
|
| WebContentsViewDelegate* delegate,
|
| @@ -77,8 +61,7 @@
|
| WebContentsViewDelegate* delegate)
|
| : web_contents_(web_contents),
|
| content_view_core_(NULL),
|
| - delegate_(delegate),
|
| - synchronous_compositor_client_(nullptr) {
|
| + delegate_(delegate) {
|
| }
|
|
|
| WebContentsViewAndroid::~WebContentsViewAndroid() {
|
| @@ -201,10 +184,7 @@
|
| // order to paint it. See ContentView::GetRenderWidgetHostViewAndroid for an
|
| // example of how this is achieved for InterstitialPages.
|
| RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(render_widget_host);
|
| - RenderWidgetHostViewAndroid* rwhv =
|
| - new RenderWidgetHostViewAndroid(rwhi, content_view_core_);
|
| - rwhv->SetSynchronousCompositorClient(synchronous_compositor_client_);
|
| - return rwhv;
|
| + return new RenderWidgetHostViewAndroid(rwhi, content_view_core_);
|
| }
|
|
|
| RenderWidgetHostViewBase* WebContentsViewAndroid::CreateViewForPopupWidget(
|
|
|