Title: [151648] trunk/Source/WebKit/blackberry
- Revision
- 151648
- Author
- [email protected]
- Date
- 2013-06-17 11:06:27 -0700 (Mon, 17 Jun 2013)
Log Message
Cache FatFinger Text Result.
https://bugs.webkit.org/show_bug.cgi?id=107403.
Patch by Tiancheng Jiang <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (151647 => 151648)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-06-17 18:05:19 UTC (rev 151647)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-06-17 18:06:27 UTC (rev 151648)
@@ -2572,6 +2572,8 @@
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);
}
if (strategy == FocusBased)
Modified: trunk/Source/WebKit/blackberry/ChangeLog (151647 => 151648)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-06-17 18:05:19 UTC (rev 151647)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-06-17 18:06:27 UTC (rev 151648)
@@ -1,3 +1,21 @@
+2013-06-17 Tiancheng Jiang <[email protected]>
+
+ 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 <[email protected]>
[BlackBerry] Remove implementation of ContextMenu classes
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (151647 => 151648)
--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp 2013-06-17 18:05:19 UTC (rev 151647)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp 2013-06-17 18:06:27 UTC (rev 151648)
@@ -668,8 +668,11 @@
FatFingersResult fatFingersResult = m_webPage->m_touchEventHandler->lastFatFingersResult();
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()) {
if (isSelectionActive())
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.h (151647 => 151648)
--- trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.h 2013-06-17 18:05:19 UTC (rev 151647)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.h 2013-06-17 18:06:27 UTC (rev 151648)
@@ -41,6 +41,7 @@
void sendClickAtFatFingersPoint(unsigned modifiers = 0);
const FatFingersResult& lastFatFingersResult() const { return m_lastFatFingersResult; }
+ void cacheTextResult(FatFingersResult result) { m_lastTextResult = result; }
void resetLastFatFingersResult() { m_lastFatFingersResult.reset(); }
void playSoundIfAnchorIsTarget() const;
@@ -59,6 +60,7 @@
WebCore::TouchEventMode m_existingTouchMode;
WebCore::IntPoint m_lastScreenPoint; // Screen Position
FatFingersResult m_lastFatFingersResult;
+ FatFingersResult m_lastTextResult;
imf_sp_text_t m_spellCheckOptionRequest;
bool m_shouldRequestSpellCheckOptions;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
