Changeset 148378 in webkit

Timestamp:

Apr 13, 2013 8:55:35 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Selection direction is not preserved when applying styles
​https://bugs.webkit.org/show_bug.cgi?id=110979

Patch by Sukolsak Sakshuwong <Sukolsak Sakshuwong> on 2013-04-13
Reviewed by Ryosuke Niwa.

Source/WebCore:

The patch is based on the one submitted by Shezan Baig.

If the starting selection was directional and its base was not first,
switch newStart and newEnd when setting the ending direction. Otherwise,
leave the order unchanged.

Test: editing/style/preserve-selection-direction.html

• editing/ApplyStyleCommand.cpp:

(WebCore::ApplyStyleCommand::updateStartEnd):

LayoutTests:

Add a test, based on the work by Shezan Baig

• editing/style/preserve-selection-direction-expected.txt: Added.
• editing/style/preserve-selection-direction.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/style/preserve-selection-direction-expected.txt (added)
• LayoutTests/editing/style/preserve-selection-direction.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/ApplyStyleCommand.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-13  Sukolsak Sakshuwong  <sukolsak@gmail.com>
+
+        Selection direction is not preserved when applying styles
+        https://bugs.webkit.org/show_bug.cgi?id=110979
+
+        Reviewed by Ryosuke Niwa.
+
+        Add a test, based on the work by Shezan Baig
+
+        * editing/style/preserve-selection-direction-expected.txt: Added.
+        * editing/style/preserve-selection-direction.html: Added.
+
 2013-03-04  Robert Hogan  <robert@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-13  Sukolsak Sakshuwong  <sukolsak@gmail.com>
+
+        Selection direction is not preserved when applying styles
+        https://bugs.webkit.org/show_bug.cgi?id=110979
+
+        Reviewed by Ryosuke Niwa.
+
+        The patch is based on the one submitted by Shezan Baig.
+
+        If the starting selection was directional and its base was not first,
+        switch newStart and newEnd when setting the ending direction. Otherwise,
+        leave the order unchanged.
+
+        Test: editing/style/preserve-selection-direction.html
+
+        * editing/ApplyStyleCommand.cpp:
+        (WebCore::ApplyStyleCommand::updateStartEnd):
+
 2013-04-13  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/editing/ApplyStyleCommand.cpp

@@ -185 +185 @@
         m_useEndingSelection = true;
 
-    setEndingSelection(VisibleSelection(newStart, newEnd, VP_DEFAULT_AFFINITY, endingSelection().isDirectional()));
+    bool wasBaseFirst = startingSelection().isBaseFirst() || !startingSelection().isDirectional();
+    setEndingSelection(VisibleSelection(wasBaseFirst ? newStart : newEnd, wasBaseFirst ? newEnd : newStart, VP_DEFAULT_AFFINITY, endingSelection().isDirectional()));
     m_start = newStart;
     m_end = newEnd;