Title: [145121] trunk/Source/WebKit/blackberry
Revision
145121
Author
mifen...@rim.com
Date
2013-03-07 12:55:29 -0800 (Thu, 07 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.

Prevent selection for popup input fields as they are buttons.

Informally Reviewed Gen Mak.

* WebCoreSupport/EditorClientBlackBerry.cpp:
(WebCore::EditorClientBlackBerry::shouldChangeSelectedRange):

Modified Paths

Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (145120 => 145121)


--- trunk/Source/WebKit/blackberry/ChangeLog	2013-03-07 20:49:23 UTC (rev 145120)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-03-07 20:55:29 UTC (rev 145121)
@@ -1,3 +1,19 @@
+2013-03-07  Mike Fenton  <mifen...@rim.com>
+
+        [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.
+
+        Prevent selection for popup input fields as they are buttons.
+
+        Informally Reviewed Gen Mak.
+
+        * WebCoreSupport/EditorClientBlackBerry.cpp:
+        (WebCore::EditorClientBlackBerry::shouldChangeSelectedRange):
+
 2013-03-06  Nima Ghanavatian  <nghanavat...@rim.com>
 
         [BlackBerry] Selection handles don't drag to expand correctly for RTL languages

Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/EditorClientBlackBerry.cpp (145120 => 145121)


--- trunk/Source/WebKit/blackberry/WebCoreSupport/EditorClientBlackBerry.cpp	2013-03-07 20:49:23 UTC (rev 145120)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/EditorClientBlackBerry.cpp	2013-03-07 20:55:29 UTC (rev 145121)
@@ -185,8 +185,12 @@
 
     Frame* frame = m_webPagePrivate->focusedOrMainFrame();
     if (frame && frame->document()) {
-        if (frame->document()->focusedNode() && frame->document()->focusedNode()->hasTagName(HTMLNames::selectTag))
-            return false;
+        if (Node* focusedNode = frame->document()->focusedNode()) {
+            if (focusedNode->hasTagName(HTMLNames::selectTag))
+                return false;
+            if (focusedNode->isElementNode() && DOMSupport::isPopupInputField(static_cast<Element*>(focusedNode)))
+                return false;
+        }
 
         // Check if this change does not represent a focus change and input is active and if so ensure the keyboard is visible.
         if (m_webPagePrivate->m_inputHandler->isInputMode() && fromRange && toRange && (fromRange->startContainer() == toRange->startContainer()))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to