Changeset 140282 in webkit

Timestamp:

Jan 20, 2013 2:55:50 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Improve Fatfinger phase.
​https://bugs.webkit.org/show_bug.cgi?id=107403

Patch by Tiancheng Jiang <​tijiang@rim.com> on 2013-01-20
Reviewed by Rob Buis.

RIM PR 219489
Internally reviewd by Mike Fenton & Gen Mak.

Treat ClickableByDefault and MadeClickableByTheWebpage elements as
same category. Avoid unnecessary nodes check step.

• WebKitSupport/FatFingers.cpp:

(BlackBerry::WebKit::FatFingers::isElementClickable):
(BlackBerry::WebKit::FatFingers::FatFingers):
(BlackBerry::WebKit::FatFingers::findBestPoint):
(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) (2 diffs)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-01-20  Tiancheng Jiang  <tijiang@rim.com>
+
+        [BlackBerry] Improve Fatfinger phase.
+        https://bugs.webkit.org/show_bug.cgi?id=107403
+
+        Reviewed by Rob Buis.
+
+        RIM PR 219489
+        Internally reviewd by Mike Fenton & Gen Mak.
+
+        Treat ClickableByDefault and MadeClickableByTheWebpage elements as
+        same category. Avoid unnecessary nodes check step.
+
+        * WebKitSupport/FatFingers.cpp:
+        (BlackBerry::WebKit::FatFingers::isElementClickable):
+        (BlackBerry::WebKit::FatFingers::FatFingers):
+        (BlackBerry::WebKit::FatFingers::findBestPoint):
+        (BlackBerry::WebKit::FatFingers::getNodesFromRect):
+        * WebKitSupport/FatFingers.h:
+
 2013-01-18  Andrew Lo  <anlo@rim.com>
-
         [BlackBerry] When acquiring/releasing backing store memory, allow web page client control suspend/resuming of backing store
         https://bugs.webkit.org/show_bug.cgi?id=107307

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

@@ -83 +83 @@
 {
     ASSERT(element);
-    ASSERT(m_matchingApproach != Done);
     ASSERT(m_targetType == ClickableElement);
 
-    switch (m_matchingApproach) {
-    case ClickableByDefault: {
-        ExceptionCode ec = 0;
-        return element->webkitMatchesSelector("a[href],*:link,*:visited,*[role=button],button,input,select,label[for],area[href],textarea,embed,object", ec)
-            || element->isMediaControlElement()
-            || element->isContentEditable();
-
-    }
-    case MadeClickableByTheWebpage:
-
-        // Elements within a shadow DOM can not be 'made clickable by the webpage', since
-        // they are not accessible.
-        if (element->isInShadowTree())
-            return false;
-
-        // FIXME: We fall back to checking for the presence of CSS style "cursor: pointer" to indicate whether the element A
-        // can be clicked when A neither registers mouse events handlers nor is a hyperlink or form control. This workaround
-        // ensures that we don't break various Google web apps, including <http://maps.google.com>. Ideally, we should walk
-        // up the DOM hierarchy to determine the first parent element that accepts mouse events.
-        // Consider the HTML snippet: <div id="A" onclick="..."><div id="B">Example</div></div>
-        // Notice, B is not a hyperlink, or form control, and does not register any mouse event handler. Then B cannot
-        // be clicked. Suppose B specified the CSS property "cursor: pointer". Then, B will be considered as clickable.
-        return hasMousePressListener(element)
-            || CSSComputedStyleDeclaration::create(element)->getPropertyValue(cssPropertyID("cursor")) == "pointer";
-    default:
-        ASSERT_NOT_REACHED();
-    }
-
-    return false;
+    ExceptionCode ec = 0;
+
+    if (element->webkitMatchesSelector("a[href],*:link,*:visited,*[role=button],button,input,select,label[for],area[href],textarea,embed,object", ec)
+        || element->isMediaControlElement()
+        || element->isContentEditable())
+        return true;
+
+    if (element->isInShadowTree())
+        return false;
+
+    return hasMousePressListener(element)
+        || CSSComputedStyleDeclaration::create(element)->getPropertyValue(cssPropertyID("cursor")) == "pointer";
 }
 
@@ -151 +133 @@
     , m_contentPos(contentPos)
     , m_targetType(targetType)
-    , m_matchingApproach(Done)
 {
     ASSERT(webPage);
@@ -174 +155 @@
 
     FatFingersResult result(m_contentPos);
-    m_matchingApproach = ClickableByDefault;
 
     // Lets set nodeUnderFatFinger to the result of a point based hit test here. If something
@@ -209 +189 @@
 
     bool foundOne = findIntersectingRegions(m_webPage->m_mainFrame->document(), intersectingRegions, remainingFingerRegion);
-    if (!foundOne) {
-        m_matchingApproach = MadeClickableByTheWebpage;
-        remainingFingerRegion = IntRectRegion(fingerRectForPoint(m_contentPos));
-        foundOne = findIntersectingRegions(m_webPage->m_mainFrame->document(), intersectingRegions, remainingFingerRegion);
-    }
-
-    m_matchingApproach = Done;
+
     m_cachedRectHitTestResults.clear();
 
@@ -465 +439 @@
 }
 
-FatFingers::CachedResultsStrategy FatFingers::cachingStrategy() const
-{
-    switch (m_matchingApproach) {
-    case ClickableByDefault:
-        return GetFromRenderTree;
-    case MadeClickableByTheWebpage:
-        return GetFromCache;
-    case Done:
-    default:
-        ASSERT_NOT_REACHED();
-        return GetFromRenderTree;
-    }
-}
-
 void FatFingers::getNodesFromRect(Document* document, const IntPoint& contentPos, ListHashSet<RefPtr<Node> >& intersectedNodes)
 {
-    FatFingers::CachedResultsStrategy cacheResolvingStrategy = cachingStrategy();
-
-    if (cacheResolvingStrategy == GetFromCache) {
-        ASSERT(m_cachedRectHitTestResults.contains(document));
-        intersectedNodes = m_cachedRectHitTestResults.get(document);
-        return;
-    }
-
-    ASSERT(cacheResolvingStrategy == GetFromRenderTree);
-
     unsigned topPadding, rightPadding, bottomPadding, leftPadding;
     getPaddings(topPadding, rightPadding, bottomPadding, leftPadding);

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

@@ -74 +74 @@
 
     enum CachedResultsStrategy { GetFromRenderTree = 0, GetFromCache };
-    CachedResultsStrategy cachingStrategy() const;
     typedef HashMap<RefPtr<WebCore::Document>, ListHashSet<RefPtr<WebCore::Node> > > CachedRectHitTestResults;
 
@@ -110 +109 @@
     WebCore::IntPoint m_contentPos;
     TargetType m_targetType;
-    MatchingApproachForClickable m_matchingApproach;
     CachedRectHitTestResults m_cachedRectHitTestResults;
 };