Changeset 105473 in webkit

Timestamp:

Jan 19, 2012 6:51:04 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Fix inconsistent text selection behavior with option-shift-left/right/up/down.
​https://bugs.webkit.org/show_bug.cgi?id=75652

Patch by Pablo Flouret <​pablof@motorola.com> on 2012-01-19
Reviewed by Enrica Casucci.

On Mac, selecting backwards by word, line or paragraph from the middle
of some text, and then going forward leaves the caret back in the middle
with no selection, instead of directly selecting to the other end of the
word/line/paragraph (Unix/Windows behavior). Fix this by adding a new
editing behavior to control whether the selection should go across the
initial position of the caret directly or not in situations like the one
outlined above.

Source/WebCore:

Test: editing/selection/selection-extend-should-not-move-across-caret-on-mac.html

• editing/EditingBehavior.h:

(WebCore::EditingBehavior::shouldExtendSelectionByWordOrLineAcrossCaret):

• editing/FrameSelection.cpp:

(WebCore::FrameSelection::modify):

LayoutTests:

• editing/selection/selection-extend-should-not-move-across-caret-on-mac-expected.txt: Added.
• editing/selection/selection-extend-should-not-move-across-caret-on-mac.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/selection-extend-should-not-move-across-caret-on-mac-expected.txt (added)
• LayoutTests/editing/selection/selection-extend-should-not-move-across-caret-on-mac.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/EditingBehavior.h (modified) (1 diff)
• Source/WebCore/editing/FrameSelection.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-01-19  Pablo Flouret  <pablof@motorola.com>
+
+        Fix inconsistent text selection behavior with option-shift-left/right/up/down.
+        https://bugs.webkit.org/show_bug.cgi?id=75652
+
+        Reviewed by Enrica Casucci.
+
+        On Mac, selecting backwards by word, line or paragraph from the middle
+        of some text, and then going forward leaves the caret back in the middle
+        with no selection, instead of directly selecting to the other end of the
+        word/line/paragraph (Unix/Windows behavior). Fix this by adding a new
+        editing behavior to control whether the selection should go across the
+        initial position of the caret directly or not in situations like the one
+        outlined above.
+
+        * editing/selection/selection-extend-should-not-move-across-caret-on-mac-expected.txt: Added.
+        * editing/selection/selection-extend-should-not-move-across-caret-on-mac.html: Added.
+
 2012-01-19  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-19  Pablo Flouret  <pablof@motorola.com>
+
+        Fix inconsistent text selection behavior with option-shift-left/right/up/down.
+        https://bugs.webkit.org/show_bug.cgi?id=75652
+
+        Reviewed by Enrica Casucci.
+
+        On Mac, selecting backwards by word, line or paragraph from the middle
+        of some text, and then going forward leaves the caret back in the middle
+        with no selection, instead of directly selecting to the other end of the
+        word/line/paragraph (Unix/Windows behavior). Fix this by adding a new
+        editing behavior to control whether the selection should go across the
+        initial position of the caret directly or not in situations like the one
+        outlined above.
+
+        Test: editing/selection/selection-extend-should-not-move-across-caret-on-mac.html
+
+        * editing/EditingBehavior.h:
+        (WebCore::EditingBehavior::shouldExtendSelectionByWordOrLineAcrossCaret):
+        * editing/FrameSelection.cpp:
+        (WebCore::FrameSelection::modify):
+
 2012-01-19  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/editing/EditingBehavior.h

@@ -68 +68 @@
     bool shouldNavigateBackOnBackspace() const { return m_type != EditingUnixBehavior; }
 
+    // On Mac, selecting backwards by word/line from the middle of a word/line, and then going
+    // forward leaves the caret back in the middle with no selection, instead of directly selecting
+    // to the other end of the line/word (Unix/Windows behavior).
+    bool shouldExtendSelectionByWordOrLineAcrossCaret() const { return m_type != EditingMacBehavior; }
+
 private:
     EditingBehaviorType m_type;

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -937 +937 @@
         break;
     case AlterationExtend:
+        if (!m_selection.isCaret()
+            && (granularity == WordGranularity || granularity == ParagraphGranularity || granularity == LineGranularity)
+            && m_frame && !m_frame->editor()->behavior().shouldExtendSelectionByWordOrLineAcrossCaret()) {
+            // Don't let the selection go across the base position directly. Needed to match mac
+            // behavior when, for instance, word-selecting backwards starting with the caret in
+            // the middle of a word and then word-selecting forward, leaving the caret in the
+            // same place where it was, instead of directly selecting to the end of the word.
+            VisibleSelection newSelection = m_selection;
+            newSelection.setExtent(position);
+            if (m_selection.isBaseFirst() != newSelection.isBaseFirst())
+                position = m_selection.base();
+        }
+
         // Standard Mac behavior when extending to a boundary is grow the selection rather than leaving the
         // base in place and moving the extent. Matches NSTextView.