Changeset 150091 in webkit

Timestamp:

May 14, 2013 3:40:20 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-05-14
Reviewed by Rob Buis.

Internally reviewed by Genevieve Mak.
BlackBerry PR 324965.

Cache and reuse intersected nodes as long as hit position has not been
changed.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::hitTestResult):

• Api/WebPage_p.h:

(WebPagePrivate):

• WebKitSupport/FatFingers.cpp:

(BlackBerry::WebKit::FatFingers::findBestPoint):
(BlackBerry::WebKit::FatFingers::findIntersectingRegions):
(BlackBerry::WebKit::FatFingers::getNodesFromRect):

• WebKitSupport/FatFingers.h:

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (1 diff)
• Api/WebPage_p.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebKitSupport/FatFingers.cpp (modified) (4 diffs)
• WebKitSupport/FatFingers.h (modified) (2 diffs)

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -6199 +6199 @@
     if (m_cachedHitTestContentPos != contentPos) {
         m_cachedHitTestContentPos = contentPos;
+        m_cachedRectHitTestResults.clear();
         m_cachedHitTestResult = m_mainFrame->eventHandler()->hitTestResultAtPoint(m_cachedHitTestContentPos, HitTestRequest::ReadOnly | HitTestRequest::Active);
     }

trunk/Source/WebKit/blackberry/Api/WebPage_p.h

@@ -646 +646 @@
     WebCore::HitTestResult m_cachedHitTestResult;
 
+    typedef HashMap<RefPtr<WebCore::Document>, ListHashSet<RefPtr<WebCore::Node> > > CachedRectHitTestResults;
+    CachedRectHitTestResults m_cachedRectHitTestResults;
+
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
     NotificationManager m_notificationManager;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-05-14  Tiancheng Jiang  <tijiang@rim.com>
+
+        [BlackBerry] Improve Fatfinger phase.
+        https://bugs.webkit.org/show_bug.cgi?id=107403
+
+        Reviewed by Rob Buis.
+
+        Internally reviewed by Genevieve Mak.
+        BlackBerry PR 324965.
+
+        Cache and reuse intersected nodes as long as hit position has not been
+        changed.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::hitTestResult):
+        * Api/WebPage_p.h:
+        (WebPagePrivate):
+        * WebKitSupport/FatFingers.cpp:
+        (BlackBerry::WebKit::FatFingers::findBestPoint):
+        (BlackBerry::WebKit::FatFingers::findIntersectingRegions):
+        (BlackBerry::WebKit::FatFingers::getNodesFromRect):
+        * WebKitSupport/FatFingers.h:
+
 2013-05-14  Andrew Lo  <anlo@rim.com>
 

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

@@ -160 +160 @@
     m_contentPos = Platform::pointClampedToRect(m_contentPos, viewportRect);
 
-    m_cachedRectHitTestResults.clear();
-
     FatFingersResult result(m_contentPos);
 
@@ -199 +197 @@
 
     bool foundOne = findIntersectingRegions(m_webPage->m_mainFrame->document(), intersectingRegions, remainingFingerRegion);
-
-    m_cachedRectHitTestResults.clear();
 
     if (!foundOne)
@@ -315 +311 @@
     // intersection of the bounding box with the finger rect.
     ListHashSet<RefPtr<Node> > intersectedNodes;
-    getNodesFromRect(document, frameContentPos, intersectedNodes);
+
+    if (m_webPage->m_cachedRectHitTestResults.contains(document))
+        intersectedNodes = m_webPage->m_cachedRectHitTestResults.get(document);
+    else
+        getNodesFromRect(document, frameContentPos, intersectedNodes);
 
     ListHashSet<RefPtr<Node> >::const_iterator it = intersectedNodes.begin();
@@ -479 +479 @@
     document->renderView()->layer()->hitTest(requestType, result);
     intersectedNodes = result.rectBasedTestResult();
-    m_cachedRectHitTestResults.add(document, intersectedNodes);
+    m_webPage->m_cachedRectHitTestResults.add(document, intersectedNodes);
 }
 

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

@@ -73 +73 @@
     typedef std::pair<WebCore::Node*, Platform::IntRectRegion> IntersectingRegion;
 
-    enum CachedResultsStrategy { GetFromRenderTree = 0, GetFromCache };
-    typedef HashMap<RefPtr<WebCore::Document>, ListHashSet<RefPtr<WebCore::Node> > > CachedRectHitTestResults;
-
     bool checkFingerIntersection(const Platform::IntRectRegion&,
         const Platform::IntRectRegion& remainingFingerRegion,
@@ -106 +103 @@
     WebCore::IntPoint m_contentPos;
     TargetType m_targetType;
-    CachedRectHitTestResults m_cachedRectHitTestResults;
 };