Changeset 151648 in webkit

Timestamp:

Jun 17, 2013 11:06:27 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Cache FatFinger Text Result.
​https://bugs.webkit.org/show_bug.cgi?id=107403.

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

Internally Reviewed by Genevieve Mak.
Cache the FatFinger text result for later use in TouchEventHandler.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::contextNode):

• WebKitSupport/SelectionHandler.cpp:

(BlackBerry::WebKit::SelectionHandler::selectAtPoint):

• WebKitSupport/TouchEventHandler.h:

(BlackBerry::WebKit::TouchEventHandler::cacheTextResult):
(TouchEventHandler):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebKitSupport/SelectionHandler.cpp (modified) (1 diff)
• WebKitSupport/TouchEventHandler.h (modified) (2 diffs)

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

@@ -2573 +2573 @@
     if (strategy == RectBased) {
         FatFingersResult result = FatFingers(this, lastFatFingersResult.adjustedPosition(), FatFingers::Text).findBestPoint();
+        // Cache text result for later use.
+        m_touchEventHandler->cacheTextResult(result);
         return result.node(FatFingersResult::ShadowContentNotAllowed);
     }

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-06-17  Tiancheng Jiang  <tijiang@rim.com>
+
+        Cache FatFinger Text Result.
+        https://bugs.webkit.org/show_bug.cgi?id=107403.
+
+        Reviewed by Rob Buis.
+
+        Internally Reviewed by Genevieve Mak.
+        Cache the FatFinger text result for later use in TouchEventHandler.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::contextNode):
+        * WebKitSupport/SelectionHandler.cpp:
+        (BlackBerry::WebKit::SelectionHandler::selectAtPoint):
+        * WebKitSupport/TouchEventHandler.h:
+        (BlackBerry::WebKit::TouchEventHandler::cacheTextResult):
+        (TouchEventHandler):
+
 2013-06-14  Alberto Garcia  <agarcia@igalia.com>
 

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

@@ -669 +669 @@
     if (selectNodeIfFatFingersResultIsLink(fatFingersResult))
         return;
-    if (!fatFingersResult.resultMatches(location, FatFingers::Text) || !fatFingersResult.positionWasAdjusted() || !fatFingersResult.nodeAsElementIfApplicable())
+    if (!fatFingersResult.resultMatches(location, FatFingers::Text) || !fatFingersResult.positionWasAdjusted() || !fatFingersResult.nodeAsElementIfApplicable()) {
+        // Cache text result for later use.
         fatFingersResult = FatFingers(m_webPage, location, FatFingers::Text).findBestPoint();
+        m_webPage->m_touchEventHandler->cacheTextResult(fatFingersResult);
+    }
 
     if (!fatFingersResult.positionWasAdjusted()) {

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

@@ -42 +42 @@
 
     const FatFingersResult& lastFatFingersResult() const { return m_lastFatFingersResult; }
+    void cacheTextResult(FatFingersResult result) { m_lastTextResult = result; }
     void resetLastFatFingersResult() { m_lastFatFingersResult.reset(); }
 
@@ -60 +61 @@
     WebCore::IntPoint m_lastScreenPoint; // Screen Position
     FatFingersResult m_lastFatFingersResult;
+    FatFingersResult m_lastTextResult;
     imf_sp_text_t m_spellCheckOptionRequest;
     bool m_shouldRequestSpellCheckOptions;