| Index: android_webview/browser/renderer_host/aw_render_view_host_ext.cc
|
| diff --git a/android_webview/browser/renderer_host/aw_render_view_host_ext.cc b/android_webview/browser/renderer_host/aw_render_view_host_ext.cc
|
| index 7472599e66ce2f6217beca40b022dfde8b042327..65641d7b334e3f7fd9f41a3eb7b9ad2d7bd45e86 100644
|
| --- a/android_webview/browser/renderer_host/aw_render_view_host_ext.cc
|
| +++ b/android_webview/browser/renderer_host/aw_render_view_host_ext.cc
|
| @@ -18,7 +18,6 @@
|
| #include "content/public/browser/user_metrics.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/common/frame_navigate_params.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositorInputHandler.h"
|
|
|
| namespace android_webview {
|
|
|
| @@ -112,8 +111,6 @@ bool AwRenderViewHostExt::OnMessageReceived(const IPC::Message& message) {
|
| OnDocumentHasImagesResponse)
|
| IPC_MESSAGE_HANDLER(AwViewHostMsg_UpdateHitTestData,
|
| OnUpdateHitTestData)
|
| - IPC_MESSAGE_HANDLER(AwViewHostMsg_DidActivateAcceleratedCompositing,
|
| - OnDidActivateAcceleratedCompositing)
|
| IPC_MESSAGE_HANDLER(AwViewHostMsg_PageScaleFactorChanged,
|
| OnPageScaleFactorChanged)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| @@ -142,27 +139,6 @@ void AwRenderViewHostExt::OnUpdateHitTestData(
|
| has_new_hit_test_data_ = true;
|
| }
|
|
|
| -void AwRenderViewHostExt::OnDidActivateAcceleratedCompositing(
|
| - int input_handler_id) {
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kNoMergeUIAndRendererCompositorThreads)) {
|
| - return;
|
| - }
|
| -
|
| - // This call is only meaningful and thread-safe when the UI and renderer
|
| - // compositor share the same thread. Any other case will likely yield
|
| - // terrible, terrible damage.
|
| - WebKit::WebCompositorInputHandler* input_handler =
|
| - WebKit::WebCompositorInputHandler::fromIdentifier(input_handler_id);
|
| - if (!input_handler)
|
| - return;
|
| -
|
| - content::ContentViewCore* content_view_core
|
| - = content::ContentViewCore::FromWebContents(web_contents());
|
| - if (content_view_core)
|
| - content_view_core->SetInputHandler(input_handler);
|
| -}
|
| -
|
| void AwRenderViewHostExt::OnPageScaleFactorChanged(float page_scale_factor) {
|
| client_->OnPageScaleFactorChanged(page_scale_factor);
|
| }
|
|
|