diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-22 16:54:39 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-07-27 10:20:27 +0100 |
| commit | 857bbedf9aadfe4ca72a5ae063a7908d37b1ffcd (patch) | |
| tree | dc6e9ad1ff03dceaab27b8c039d2b7c96eecbb47 /WebKit/android | |
| parent | f7b9e1372a8483ca361a3de2727538704fea8368 (diff) | |
| download | external_webkit-857bbedf9aadfe4ca72a5ae063a7908d37b1ffcd.zip external_webkit-857bbedf9aadfe4ca72a5ae063a7908d37b1ffcd.tar.gz external_webkit-857bbedf9aadfe4ca72a5ae063a7908d37b1ffcd.tar.bz2 | |
Merge Webkit at r63859 : Update call to hitTestResultAtPoint with the default hit test request
as we also wish to pass a padding rect to use the HITTEST_WITHSIZE codepath.
See http://trac.webkit.org/changeset/63807
Change-Id: I62109577c9468639971522a72adc3a543237516a
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index d3e32d3..2b66a8e 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -1393,7 +1393,7 @@ Vector<IntRect> WebViewCore::getTouchHighlightRects(int x, int y, int slop) m_mousePos = IntPoint(x - m_scrollOffsetX, y - m_scrollOffsetY); #ifdef ANDROID_HITTEST_WITHSIZE HitTestResult hitTestResult = m_mainFrame->eventHandler()->hitTestResultAtPoint(IntPoint(x, y), - false, false, DontHitTestScrollbars, IntSize(slop, slop)); + false, false, DontHitTestScrollbars, HitTestRequest::Active | HitTestRequest::ReadOnly, IntSize(slop, slop)); if (!hitTestResult.innerNode() || !hitTestResult.innerNode()->inDocument()) { LOGE("Should not happen: no in document Node found"); return rects; |