Title: [139667] trunk/Source/WebKit/blackberry
- Revision
- 139667
- Author
- [email protected]
- Date
- 2013-01-14 14:41:09 -0800 (Mon, 14 Jan 2013)
Log 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 <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (139666 => 139667)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-01-14 22:40:24 UTC (rev 139666)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-01-14 22:41:09 UTC (rev 139667)
@@ -1,3 +1,27 @@
+2013-01-14 Otto Derek Cheung <[email protected]>
+
+ [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 <[email protected]>
[BlackBerry] Zoom is still possible when user-scalable=no
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (139666 => 139667)
--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp 2013-01-14 22:40:24 UTC (rev 139666)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp 2013-01-14 22:41:09 UTC (rev 139667)
@@ -1028,12 +1028,14 @@
{
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.
if (!m_webPage->m_inputHandler->isInputMode() && m_caretActive) {
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;
}
@@ -1074,7 +1076,7 @@
Platform::IntRect(nodeBoundingBox).toString().c_str(),
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());
}
bool SelectionHandler::selectionContains(const WebCore::IntPoint& point)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
