Changeset 143783 in webkit

Timestamp:

Feb 22, 2013, 1:24:22 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry]Adjust fatfinger detection rect size
​https://bugs.webkit.org/show_bug.cgi?id=108678.

Patch by Tiancheng Jiang <​tijiang@rim.com> on 2013-02-22
Reviewed by Antonio Gomes.

Changing HitTestRequest::IgnoreClipping does not solve the problem that
FatFinger rect detect the element out of the viewport. We have to clip
the fatfinger rect according to the current viewport size to avoid picking
the element out of the viewport.

• WebKitSupport/FatFingers.cpp:

(BlackBerry::WebKit::FatFingers::fingerRectForPoint):
(BlackBerry::WebKit::FatFingers::findBestPoint):
(BlackBerry::WebKit::FatFingers::getAdjustedPaddings):
(BlackBerry::WebKit::FatFingers::getNodesFromRect):

• WebKitSupport/FatFingers.h:

Location:

trunk/Source/WebKit/blackberry

Files:

• ChangeLog (modified) (1 diff)
• WebKitSupport/FatFingers.cpp (modified) (5 diffs)
• WebKitSupport/FatFingers.h (modified) (1 diff)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-02-22  Tiancheng Jiang  <tijiang@rim.com>
+
+        [BlackBerry]Adjust fatfinger detection rect size
+        https://bugs.webkit.org/show_bug.cgi?id=108678.
+
+        Reviewed by Antonio Gomes.
+
+        Changing HitTestRequest::IgnoreClipping does not solve the problem that
+        FatFinger rect detect the element out of the viewport. We have to clip
+        the fatfinger rect according to the current viewport size to avoid picking
+        the element out of the viewport.
+
+        * WebKitSupport/FatFingers.cpp:
+        (BlackBerry::WebKit::FatFingers::fingerRectForPoint):
+        (BlackBerry::WebKit::FatFingers::findBestPoint):
+        (BlackBerry::WebKit::FatFingers::getAdjustedPaddings):
+        (BlackBerry::WebKit::FatFingers::getNodesFromRect):
+        * WebKitSupport/FatFingers.h:
+
 2013-02-22  Mike Fenton  <mifenton@rim.com>
 

trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.cpp

@@ -67 +67 @@
 {
     unsigned topPadding, rightPadding, bottomPadding, leftPadding;
-    getPaddings(topPadding, rightPadding, bottomPadding, leftPadding);
+    IntPoint contentViewportPos = m_webPage->mapFromContentsToViewport(point);
+    getAdjustedPaddings(contentViewportPos, topPadding, rightPadding, bottomPadding, leftPadding);
 
     return HitTestResult::rectForPoint(point, topPadding, rightPadding, bottomPadding, leftPadding);
@@ -151 +152 @@
     ASSERT(m_webPage);
     ASSERT(m_webPage->m_mainFrame);
+
+    // Even though we have clamped the point in libwebview to viewport, but there might be a rounding difference for viewport rect.
+    // Clamp position to viewport to ensure we are inside viewport.
+    IntRect viewportRect = m_webPage->mainFrame()->view()->visibleContentRect();
+    m_contentPos = Platform::pointClampedToRect(m_contentPos, viewportRect);
 
     m_cachedRectHitTestResults.clear();
@@ -429 +435 @@
 }
 
-void FatFingers::getPaddings(unsigned& top, unsigned& right, unsigned& bottom, unsigned& left) const
+void FatFingers::getAdjustedPaddings(const IntPoint& contentViewportPos, unsigned& top, unsigned& right, unsigned& bottom, unsigned& left) const
 {
     static unsigned topPadding = Platform::Settings::instance()->topFatFingerPadding();
@@ -441 +447 @@
     bottom = bottomPadding / currentScale;
     left = leftPadding / currentScale;
+
+    IntRect viewportRect = m_webPage->mainFrame()->view()->visibleContentRect();
+    // We clamp the event position inside the viewport. We should not expand the fat finger rect to the edge again.
+    top = std::min(unsigned(std::max(contentViewportPos.y() - 1, 0)), top);
+    left = std::min(unsigned(std::max(contentViewportPos.x() - 1, 0)), left);
+    bottom = std::min(unsigned(std::max(viewportRect.height() - contentViewportPos.y() - 1, 0)), bottom);
+    right = std::min(unsigned(std::max(viewportRect.width() - contentViewportPos.x() - 1, 0)), right);
 }
 
@@ -446 +459 @@
 {
     unsigned topPadding, rightPadding, bottomPadding, leftPadding;
-    getPaddings(topPadding, rightPadding, bottomPadding, leftPadding);
+    IntPoint contentViewportPos = m_webPage->mapFromContentsToViewport(m_contentPos);
+    // Do not allow fat fingers detect anything not visible(ie outside of the viewport)
+    adjustPaddings(contentViewportPos, topPadding, rightPadding, bottomPadding, leftPadding);
 
     // The user functions checkForText() and findIntersectingRegions() uses the Node.wholeText() to checkFingerIntersection()

trunk/Source/WebKit/blackberry/WebKitSupport/FatFingers.h

@@ -104 +104 @@
 
     inline WebCore::IntRect fingerRectForPoint(const WebCore::IntPoint&) const;
-    void getPaddings(unsigned& top, unsigned& right, unsigned& bottom, unsigned& left) const;
+    void getAdjustedPaddings(const WebCore::IntPoint&, unsigned& top, unsigned& right, unsigned& bottom, unsigned& left) const;
 
     WebPagePrivate* m_webPage;