Changeset 156635 in webkit

Timestamp:

Sep 30, 2013 12:12:44 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

user-select: none cursor turns to I-beam on mouse dragging
​https://bugs.webkit.org/show_bug.cgi?id=90159

Patch by Vani Hegde <​vani.hegde@samsung.com> on 2013-09-30
Reviewed by Ryosuke Niwa.

Source/WebCore:

When tried to select some text in an area that has style
cursor:default set, cursor type changes to text cursor ignoring
the cursor style that is explicitly set.

When the cursor style is explicitly set as default (or something else),
we should not change it to text cursor no matter what we are over
or what operation we are performing (be it hovering over the text
or selecting the text).

During text selection, changing the cursor type to text only when
there is no explicit cursor type set fixes the issue.

Test: editing/caret/selection-with-caret-type-progress.html

• page/EventHandler.cpp:

(WebCore::EventHandler::selectCursor):
During selection, set the cursor style to text only if there is no
explicit cursor style set.

LayoutTests:

Test case added to verify that explicitly set cursor style
is retained on performing text selection.

• editing/caret/selection-with-caret-type-progress-expected.txt: Added.
• editing/caret/selection-with-caret-type-progress.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/caret/selection-with-caret-type-progress-expected.txt (added)
• LayoutTests/editing/caret/selection-with-caret-type-progress.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-09-30  Vani Hegde  <vani.hegde@samsung.com>
+
+        user-select: none cursor turns to I-beam on mouse dragging
+        https://bugs.webkit.org/show_bug.cgi?id=90159
+
+        Reviewed by Ryosuke Niwa.
+
+        Test case added to verify that explicitly set cursor style
+        is retained on performing text selection.
+
+        * editing/caret/selection-with-caret-type-progress-expected.txt: Added.
+        * editing/caret/selection-with-caret-type-progress.html: Added.
+
 2013-09-29  Philip Rogers  <pdr@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-30  Vani Hegde  <vani.hegde@samsung.com>
+
+        user-select: none cursor turns to I-beam on mouse dragging
+        https://bugs.webkit.org/show_bug.cgi?id=90159
+
+        Reviewed by Ryosuke Niwa.
+
+        When tried to select some text in an area that has style
+        cursor:default set, cursor type changes to text cursor ignoring
+        the cursor style that is explicitly set.
+
+        When the cursor style is explicitly set as default (or something else),
+        we should not change it to text cursor no matter what we are over
+        or what operation we are performing (be it hovering over the text
+        or selecting the text).
+
+        During text selection, changing the cursor type to text only when
+        there is no explicit cursor type set fixes the issue.
+
+        Test: editing/caret/selection-with-caret-type-progress.html
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::selectCursor):
+        During selection, set the cursor style to text only if there is no
+        explicit cursor style set.
+
 2013-09-29  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -1304 +1304 @@
 #endif
 
-    // During selection, use an I-beam no matter what we're over.
-    // If a drag may be starting or we're capturing mouse events for a particular node, don't treat this as a selection.
-    if (m_mousePressed && m_mouseDownMayStartSelect
-#if ENABLE(DRAG_SUPPORT)
-        && !m_mouseDownMayStartDrag
-#endif
-        && m_frame.selection().isCaretOrRange() && !m_capturingMouseEventsNode)
-        return iBeam;
-
     if (renderer) {
         Cursor overrideCursor;
@@ -1374 +1365 @@
             }
         }
+
+        // During selection, use an I-beam regardless of the content beneath the cursor when cursor style is not explicitly specified.
+        // If a drag may be starting or we're capturing mouse events for a particular node, don't treat this as a selection.
+        if (m_mousePressed && m_mouseDownMayStartSelect
+#if ENABLE(DRAG_SUPPORT)
+            && !m_mouseDownMayStartDrag
+#endif
+            && m_frame.selection().isCaretOrRange()
+            && !m_capturingMouseEventsNode) {
+            return iBeam;
+        }
+
         if ((editable || (renderer && renderer->isText() && node->canStartSelection())) && !inResizer && !result.scrollbar())
             return iBeam;