Changeset 198904 in webkit

Timestamp:

Mar 31, 2016 11:50:55 AM (8 years ago)

Author:

tonikitoo@webkit.org

Message:

SelectionController::positionForPlatform should ask EditingBehavior for platform specific behavior
​https://bugs.webkit.org/show_bug.cgi?id=41976

Reviewed by Darin Adler.

SSIA.

No new tests needed.

• editing/EditingBehavior.h:

(WebCore::EditingBehavior::shouldAlwaysExtendSelectionFromExtentEndpoint):

• editing/FrameSelection.cpp:

(WebCore::FrameSelection::positionForPlatform):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/EditingBehavior.h (modified) (1 diff)
• editing/FrameSelection.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-03-31  Antonio Gomes  <tonikitoo@webkit.org>
+
+        SelectionController::positionForPlatform should ask EditingBehavior for platform specific behavior
+        https://bugs.webkit.org/show_bug.cgi?id=41976
+
+        Reviewed by Darin Adler.
+
+        SSIA.
+
+        No new tests needed.
+
+        * editing/EditingBehavior.h:
+        (WebCore::EditingBehavior::shouldAlwaysExtendSelectionFromExtentEndpoint):
+        * editing/FrameSelection.cpp:
+        (WebCore::FrameSelection::positionForPlatform):
+
 2016-03-31  Jeremy Jones  <jeremyj@apple.com>
 

trunk/Source/WebCore/editing/EditingBehavior.h

@@ -92 +92 @@
     bool shouldSelectBasedOnDictionaryLookup() const { return m_type == EditingMacBehavior; }
 
+    // Linux and Windows always extend selections from the extent endpoint.
+    bool shouldAlwaysExtendSelectionFromExtentEndpoint() const { return m_type != EditingMacBehavior && m_type != EditingIOSBehavior; }
+
 private:
     EditingBehaviorType m_type;

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -621 +621 @@
 VisiblePosition FrameSelection::positionForPlatform(bool isGetStart) const
 {
-    if (m_frame && (m_frame->settings().editingBehaviorType() == EditingMacBehavior || m_frame->settings().editingBehaviorType() == EditingIOSBehavior))
-        return isGetStart ? m_selection.visibleStart() : m_selection.visibleEnd();
-    // Linux and Windows always extend selections from the extent endpoint.
     // FIXME: VisibleSelection should be fixed to ensure as an invariant that
     // base/extent always point to the same nodes as start/end, but which points
     // to which depends on the value of isBaseFirst. Then this can be changed
     // to just return m_sel.extent().
-    return m_selection.isBaseFirst() ? m_selection.visibleEnd() : m_selection.visibleStart();
+    if (m_frame && m_frame->editor().behavior().shouldAlwaysExtendSelectionFromExtentEndpoint())
+        return m_selection.isBaseFirst() ? m_selection.visibleEnd() : m_selection.visibleStart();
+
+    return isGetStart ? m_selection.visibleStart() : m_selection.visibleEnd();
 }