summaryrefslogtreecommitdiffstats
path: root/android_webview/browser
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-23 11:15:37 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-23 11:15:37 +0000
commit3207b125c01b82604e32af84e80a0fd669556f78 (patch)
tree946afd3c40854f2282bf142d87e116beec6bf826 /android_webview/browser
parent7cfaadd454452b8754ae0f02a550304fb74b5401 (diff)
downloadchromium_src-3207b125c01b82604e32af84e80a0fd669556f78.zip
chromium_src-3207b125c01b82604e32af84e80a0fd669556f78.tar.gz
chromium_src-3207b125c01b82604e32af84e80a0fd669556f78.tar.bz2
Remove dead WebCompositorInputHandler related code
This code is all a no-op as of r201016 BUG=241641 Review URL: https://chromiumcodereview.appspot.com/15484013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201750 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/browser')
-rw-r--r--android_webview/browser/renderer_host/aw_render_view_host_ext.cc24
-rw-r--r--android_webview/browser/renderer_host/aw_render_view_host_ext.h1
2 files changed, 0 insertions, 25 deletions
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 7472599..65641d7 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);
}
diff --git a/android_webview/browser/renderer_host/aw_render_view_host_ext.h b/android_webview/browser/renderer_host/aw_render_view_host_ext.h
index 8894793..24e6a43 100644
--- a/android_webview/browser/renderer_host/aw_render_view_host_ext.h
+++ b/android_webview/browser/renderer_host/aw_render_view_host_ext.h
@@ -81,7 +81,6 @@ class AwRenderViewHostExt : public content::WebContentsObserver,
void OnDocumentHasImagesResponse(int msg_id, bool has_images);
void OnUpdateHitTestData(const AwHitTestData& hit_test_data);
- void OnDidActivateAcceleratedCompositing(int input_handler_id);
void OnPageScaleFactorChanged(float page_scale_factor);
bool IsRenderViewReady() const;