diff options
author | jdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 07:24:58 +0000 |
---|---|---|
committer | jdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 07:24:58 +0000 |
commit | f953135b58cca0faee67aa2125737aeeb0e7cf40 (patch) | |
tree | fbf61efb40ac41d21c842ea34f4a51318fa2418f | |
parent | d0f49dfead092241b6840e83af7df416fa31d03c (diff) | |
download | chromium_src-f953135b58cca0faee67aa2125737aeeb0e7cf40.zip chromium_src-f953135b58cca0faee67aa2125737aeeb0e7cf40.tar.gz chromium_src-f953135b58cca0faee67aa2125737aeeb0e7cf40.tar.bz2 |
[Android] Remove unused RWHVA touch handler notification
The RenderWidgetHostViewAndroid::HasTouchEventHandlers notification is no longer
used, remove accordingly.
Review URL: https://codereview.chromium.org/153953003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248900 0039d316-1c4b-4281-b951-d872f2087c98
9 files changed, 0 insertions, 22 deletions
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc index 0ea67bd..4ca79c1 100644 --- a/content/browser/frame_host/render_widget_host_view_child_frame.cc +++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc @@ -289,10 +289,6 @@ void RenderWidgetHostViewChildFrame::ShowDisambiguationPopup( const gfx::Rect& target_rect, const SkBitmap& zoomed_bitmap) { } - -void RenderWidgetHostViewChildFrame::HasTouchEventHandlers( - bool need_touch_events) { -} #endif // defined(OS_ANDROID) #if defined(TOOLKIT_GTK) diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.h b/content/browser/frame_host/render_widget_host_view_child_frame.h index 256a3bf3..9f9b9ea 100644 --- a/content/browser/frame_host/render_widget_host_view_child_frame.h +++ b/content/browser/frame_host/render_widget_host_view_child_frame.h @@ -153,7 +153,6 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame virtual void ShowDisambiguationPopup( const gfx::Rect& target_rect, const SkBitmap& zoomed_bitmap) OVERRIDE; - virtual void HasTouchEventHandlers(bool need_touch_events) OVERRIDE; #endif // defined(OS_ANDROID) #if defined(TOOLKIT_GTK) diff --git a/content/browser/frame_host/render_widget_host_view_guest.cc b/content/browser/frame_host/render_widget_host_view_guest.cc index 9ee16e1..59d1af6 100644 --- a/content/browser/frame_host/render_widget_host_view_guest.cc +++ b/content/browser/frame_host/render_widget_host_view_guest.cc @@ -457,9 +457,6 @@ void RenderWidgetHostViewGuest::ShowDisambiguationPopup( const gfx::Rect& target_rect, const SkBitmap& zoomed_bitmap) { } - -void RenderWidgetHostViewGuest::HasTouchEventHandlers(bool need_touch_events) { -} #endif // defined(OS_ANDROID) #if defined(TOOLKIT_GTK) diff --git a/content/browser/frame_host/render_widget_host_view_guest.h b/content/browser/frame_host/render_widget_host_view_guest.h index e4ac733..cd5d266 100644 --- a/content/browser/frame_host/render_widget_host_view_guest.h +++ b/content/browser/frame_host/render_widget_host_view_guest.h @@ -143,7 +143,6 @@ class CONTENT_EXPORT RenderWidgetHostViewGuest // RenderWidgetHostViewPort implementation. virtual void ShowDisambiguationPopup(const gfx::Rect& target_rect, const SkBitmap& zoomed_bitmap) OVERRIDE; - virtual void HasTouchEventHandlers(bool need_touch_events) OVERRIDE; #endif // defined(OS_ANDROID) #if defined(TOOLKIT_GTK) diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index 7e637a7..38ea485 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -2025,13 +2025,7 @@ void RenderWidgetHostImpl::DecrementInFlightEventCount() { } void RenderWidgetHostImpl::OnHasTouchEventHandlers(bool has_handlers) { - if (has_touch_handler_ == has_handlers) - return; has_touch_handler_ = has_handlers; -#if defined(OS_ANDROID) - if (view_) - view_->HasTouchEventHandlers(has_touch_handler_); -#endif } OverscrollController* RenderWidgetHostImpl::GetOverscrollController() const { 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 9e9148a..32d94bf 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc @@ -1376,10 +1376,6 @@ void RenderWidgetHostViewAndroid::RunAckCallbacks() { } } -void RenderWidgetHostViewAndroid::HasTouchEventHandlers( - bool need_touch_events) { -} - void RenderWidgetHostViewAndroid::OnCompositingDidCommit() { RunAckCallbacks(); } diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h index 3dd03e2..5f20ebf 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.h +++ b/content/browser/renderer_host/render_widget_host_view_android.h @@ -164,7 +164,6 @@ class RenderWidgetHostViewAndroid virtual void CreateBrowserAccessibilityManagerIfNeeded() OVERRIDE; virtual bool LockMouse() OVERRIDE; virtual void UnlockMouse() OVERRIDE; - virtual void HasTouchEventHandlers(bool need_touch_events) OVERRIDE; virtual void OnSwapCompositorFrame( uint32 output_surface_id, scoped_ptr<cc::CompositorFrame> frame) OVERRIDE; diff --git a/content/port/browser/render_widget_host_view_port.h b/content/port/browser/render_widget_host_view_port.h index 07c104b..ae00425 100644 --- a/content/port/browser/render_widget_host_view_port.h +++ b/content/port/browser/render_widget_host_view_port.h @@ -338,7 +338,6 @@ class CONTENT_EXPORT RenderWidgetHostViewPort : public RenderWidgetHostView, #if defined(OS_ANDROID) virtual void ShowDisambiguationPopup(const gfx::Rect& target_rect, const SkBitmap& zoomed_bitmap) = 0; - virtual void HasTouchEventHandlers(bool need_touch_events) = 0; #endif #if defined(OS_WIN) diff --git a/content/test/test_render_view_host.h b/content/test/test_render_view_host.h index 34ba8f6..9eecd7c2 100644 --- a/content/test/test_render_view_host.h +++ b/content/test/test_render_view_host.h @@ -153,7 +153,6 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase { virtual void ShowDisambiguationPopup( const gfx::Rect& target_rect, const SkBitmap& zoomed_bitmap) OVERRIDE {} - virtual void HasTouchEventHandlers(bool need_touch_events) OVERRIDE {} #endif virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE {} virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; |