Title: [145571] trunk/Source/WebKit/blackberry
- Revision
- 145571
- Author
- [email protected]
- Date
- 2013-03-12 11:38:33 -0700 (Tue, 12 Mar 2013)
Log Message
[BlackBerry] Prevent text selection inside Colour and Date/Time input fields
https://bugs.webkit.org/show_bug.cgi?id=111733
Reviewed by Rob Buis.
PR 305194.
Skip rendering of selection if it is in a popup driven
input field. This covers situations where EditorClientBlackBerry::shouldChangeSelectedRange
is either not called or focus is not complete when called.
Informally reviewed by Gen Mak.
* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):
(WebKit):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (145570 => 145571)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-03-12 18:28:32 UTC (rev 145570)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-03-12 18:38:33 UTC (rev 145571)
@@ -1,3 +1,22 @@
+2013-03-12 Mike Fenton <[email protected]>
+
+ [BlackBerry] Prevent text selection inside Colour and Date/Time input fields
+ https://bugs.webkit.org/show_bug.cgi?id=111733
+
+ Reviewed by Rob Buis.
+
+ PR 305194.
+
+ Skip rendering of selection if it is in a popup driven
+ input field. This covers situations where EditorClientBlackBerry::shouldChangeSelectedRange
+ is either not called or focus is not complete when called.
+
+ Informally reviewed by Gen Mak.
+
+ * WebKitSupport/SelectionHandler.cpp:
+ (BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):
+ (WebKit):
+
2013-03-12 Genevieve Mak <[email protected]>
[BlackBerry] Notify client if the selection is in a subframe when started.
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (145570 => 145571)
--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp 2013-03-12 18:28:32 UTC (rev 145570)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp 2013-03-12 18:38:33 UTC (rev 145571)
@@ -1150,6 +1150,13 @@
else if (!m_selectionActive)
return;
+ if (Node* focusedNode = frame->document()->focusedNode()
+ && (focusedNode->hasTagName(HTMLNames::selectTag) || (focusedNode->isElementNode() && DOMSupport::isPopupInputField(toElement(focusedNode))))) {
+ SelectionLog(Platform::LogLevelInfo, "SelectionHandler::selectionPositionChanged selection is on a popup control, skipping rendering.");
+ return;
+ }
+ }
+
SelectionTimingLog(Platform::LogLevelInfo,
"SelectionHandler::selectionPositionChanged starting at %f",
m_timer.elapsed());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes