Changeset 164194 in webkit

Timestamp:

Feb 16, 2014 2:00:21 PM (10 years ago)

Author:

rniwa@webkit.org

Message:

setSelectionRange shouldn't directly instantiate VisibleSelection
​https://bugs.webkit.org/show_bug.cgi?id=128881

Reviewed by Andreas Kling.

Added a new version of moveTo for setSelectionRange.

• editing/FrameSelection.cpp:

(WebCore::FrameSelection::moveTo): Added.

• editing/FrameSelection.h:
• html/HTMLTextFormControlElement.cpp:

(WebCore::HTMLTextFormControlElement::setSelectionRange): Use the newly added FrameSelection::moveTo
instead of manually instantiating VisibleSelection here.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-02-16  Ryosuke Niwa  <rniwa@webkit.org>
+
+        setSelectionRange shouldn't directly instantiate VisibleSelection
+        https://bugs.webkit.org/show_bug.cgi?id=128881
+
+        Reviewed by Andreas Kling.
+
+        Added a new version of moveTo for setSelectionRange.
+
+        * editing/FrameSelection.cpp:
+        (WebCore::FrameSelection::moveTo): Added.
+        * editing/FrameSelection.h:
+        * html/HTMLTextFormControlElement.cpp:
+        (WebCore::HTMLTextFormControlElement::setSelectionRange): Use the newly added FrameSelection::moveTo
+        instead of manually instantiating VisibleSelection here.
+
 2014-02-16  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -163 +163 @@
     const bool selectionHasDirection = true;
     setSelection(VisibleSelection(base, extent, affinity, selectionHasDirection), defaultSetSelectionOptions(userTriggered));
+}
+
+void FrameSelection::moveTo(const Position& base, const Position& extent, bool selectionHasDirection, bool shouldSetFocus)
+{
+    setSelection(VisibleSelection(base, extent, DOWNSTREAM, selectionHasDirection),
+        defaultSetSelectionOptions() | (shouldSetFocus ? 0 : DoNotSetFocus));
 }
 

trunk/Source/WebCore/editing/FrameSelection.h

@@ -141 +141 @@
     void moveTo(const Position&, EAffinity, EUserTriggered = NotUserTriggered);
     void moveTo(const Position&, const Position&, EAffinity, EUserTriggered = NotUserTriggered);
+    void moveTo(const Position&, const Position&, bool selectionHasDirection, bool shouldSetFocus);
 
     const VisibleSelection& selection() const { return m_selection; }

trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp

@@ -307 +307 @@
     if (start == end)
         endPosition = startPosition;
-    else
-        endPosition = positionForIndex(innerText, end);
-
-    VisibleSelection newSelection;
-    if (direction == SelectionHasBackwardDirection)
-        newSelection = VisibleSelection(endPosition, startPosition);
-    else
-        newSelection = VisibleSelection(startPosition, endPosition);
-    newSelection.setIsDirectional(direction != SelectionHasNoDirection);
-
-    FrameSelection::SetSelectionOptions options = FrameSelection::defaultSetSelectionOptions();
-    if (hasFocus)
-        options |= FrameSelection::DoNotSetFocus;
+    else {
+        if (direction == SelectionHasBackwardDirection) {
+            endPosition = startPosition;
+            startPosition = positionForIndex(innerText, end);
+        } else
+            endPosition = positionForIndex(innerText, end);
+    }
+
     if (Frame* frame = document().frame())
-        frame->selection().setSelection(newSelection, options);
+        frame->selection().moveTo(startPosition, endPosition, direction != SelectionHasNoDirection, !hasFocus);
 }