diff options
| author | trchen@chromium.org <trchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 20:37:51 +0000 |
|---|---|---|
| committer | trchen@chromium.org <trchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 20:37:51 +0000 |
| commit | efd7e47fbeb0f2ce01c0d8ef7910c0359fd587fa (patch) | |
| tree | a9a653b5c6be2b9402c910f26b0c25d9c12c812a /content | |
| parent | 22cfe5fa8a8636af6eca91c99ca090cccd9d9dbd (diff) | |
| download | chromium_src-efd7e47fbeb0f2ce01c0d8ef7910c0359fd587fa.zip chromium_src-efd7e47fbeb0f2ce01c0d8ef7910c0359fd587fa.tar.gz chromium_src-efd7e47fbeb0f2ce01c0d8ef7910c0359fd587fa.tar.bz2 | |
Disable disambiguation popup handler for non-Android targets
The handler can cause gesture handling regressions for targets that haven't
implemented browser-side handling yet. Currently the only platform supporting
it is Android.
BUG=156702
Review URL: https://chromiumcodereview.appspot.com/11189079
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163049 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/render_view_impl.cc | 2 | ||||
| -rw-r--r-- | content/renderer/render_view_impl.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 7d8db32..af35bce 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -6391,6 +6391,7 @@ void RenderViewImpl::OnUpdatedFrameTree( updating_frame_tree_ = false; } +#if defined(OS_ANDROID) bool RenderViewImpl::didTapMultipleTargets( const WebKit::WebGestureEvent& event, const WebVector<WebRect>& target_rects) { @@ -6427,6 +6428,7 @@ bool RenderViewImpl::didTapMultipleTargets( return true; } +#endif void RenderViewImpl::OnReleaseDisambiguationPopupDIB( TransportDIB::Handle dib_handle) { diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h index 4530b62..84d9773 100644 --- a/content/renderer/render_view_impl.h +++ b/content/renderer/render_view_impl.h @@ -496,9 +496,11 @@ class RenderViewImpl : public RenderWidget, virtual void numberOfWheelEventHandlersChanged(unsigned num_handlers); virtual void hasTouchEventHandlers(bool has_handlers); virtual void didUpdateLayout(); +#if defined(OS_ANDROID) virtual bool didTapMultipleTargets( const WebKit::WebGestureEvent& event, const WebKit::WebVector<WebKit::WebRect>& target_rects); +#endif virtual void navigateBackForwardSoon(int offset); virtual int historyBackListCount(); virtual int historyForwardListCount(); |