Changeset 139667 in webkit

Timestamp:

Jan 14, 2013 2:41:09 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] FCC appears when switching search engine providers
​https://bugs.webkit.org/show_bug.cgi?id=106824

Magnifying glass appears when switching search engine providers

PR 279178

Patch by Otto Derek Cheung <​otcheung@rim.com> on 2013-01-14
Reviewed by Rob Buis.
Internal Reviewed by Mike Fenton.

We need to make sure fatfinger is touching a textfield when we tell notifyCaretChanged
to show the FCC.

This behaviour is accidentally regressed in the fix in PR 267177, causing the FCC to show
when the user touches an element that is not a textfield and changes the caret in the inputbar..

Tested that the behaviour in 267177 isn't reproducible and the FCC isn't invoked when we switch
search engine providers.

• WebKitSupport/SelectionHandler.cpp:

(BlackBerry::WebKit::SelectionHandler::caretPositionChanged):

Location:

trunk/Source/WebKit/blackberry

Files:

• ChangeLog (modified) (1 diff)
• WebKitSupport/SelectionHandler.cpp (modified) (3 diffs)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-01-14  Otto Derek Cheung  <otcheung@rim.com>
+
+        [BlackBerry] FCC appears when switching search engine providers
+        https://bugs.webkit.org/show_bug.cgi?id=106824
+
+        Magnifying glass appears when switching search engine providers
+
+        PR 279178
+
+        Reviewed by Rob Buis.
+        Internal Reviewed by Mike Fenton.
+
+        We need to make sure fatfinger is touching a textfield when we tell notifyCaretChanged
+        to show the FCC.
+
+        This behaviour is accidentally regressed in the fix in PR 267177, causing the FCC to show
+        when the user touches an element that is not a textfield and changes the caret in the inputbar..
+
+        Tested that the behaviour in 267177 isn't reproducible and the FCC isn't invoked when we switch
+        search engine providers.
+
+        * WebKitSupport/SelectionHandler.cpp:
+        (BlackBerry::WebKit::SelectionHandler::caretPositionChanged):
+
 2013-01-14  Jacky Jiang  <zhajiang@rim.com>
 

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

@@ -1029 +1029 @@
     SelectionLog(Platform::LogLevelInfo, "SelectionHandler::caretPositionChanged");
 
+    bool isFatFingerOnTextField = userTouchTriggered && m_webPage->m_touchEventHandler->lastFatFingersResult().isTextInput();
+
     WebCore::IntRect caretLocation;
     // If the input field is not active, we must be turning off the caret.
@@ -1034 +1036 @@
         m_caretActive = false;
         // Send an empty caret change to turn off the caret.
-        m_webPage->m_client->notifyCaretChanged(caretLocation, userTouchTriggered);
+        m_webPage->m_client->notifyCaretChanged(caretLocation, isFatFingerOnTextField);
         return;
     }
@@ -1075 +1077 @@
         m_webPage->m_inputHandler->elementText().isEmpty() ? ", empty text field" : "");
 
-    m_webPage->m_client->notifyCaretChanged(caretLocation, userTouchTriggered, isSingleLineInput, nodeBoundingBox, m_webPage->m_inputHandler->elementText().isEmpty());
+    m_webPage->m_client->notifyCaretChanged(caretLocation, isFatFingerOnTextField, isSingleLineInput, nodeBoundingBox, m_webPage->m_inputHandler->elementText().isEmpty());
 }