Changeset 164188 in webkit

Timestamp:

Feb 15, 2014 7:33:57 PM (10 years ago)

Author:

rniwa@webkit.org

Message:

DOMSelection shouldn't instantiate VisibleSelection everywhere
​https://bugs.webkit.org/show_bug.cgi?id=128879

Reviewed by Antti Koivisto.

Removed explicit instantiation of VisibleSelection from various member functions of VisibleSelection.

• page/DOMSelection.cpp:

(WebCore::DOMSelection::collapse):
(WebCore::DOMSelection::collapseToEnd):
(WebCore::DOMSelection::collapseToStart):
(WebCore::DOMSelection::setBaseAndExtent):
(WebCore::DOMSelection::setPosition):
(WebCore::DOMSelection::extend):
(WebCore::DOMSelection::getRangeAt):
(WebCore::DOMSelection::addRange):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/DOMSelection.cpp (modified) (10 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-02-15  Ryosuke Niwa  <rniwa@webkit.org>
+
+        DOMSelection shouldn't instantiate VisibleSelection everywhere
+        https://bugs.webkit.org/show_bug.cgi?id=128879
+
+        Reviewed by Antti Koivisto.
+
+        Removed explicit instantiation of VisibleSelection from various member functions of VisibleSelection.
+
+        * page/DOMSelection.cpp:
+        (WebCore::DOMSelection::collapse):
+        (WebCore::DOMSelection::collapseToEnd):
+        (WebCore::DOMSelection::collapseToStart):
+        (WebCore::DOMSelection::setBaseAndExtent):
+        (WebCore::DOMSelection::setPosition):
+        (WebCore::DOMSelection::extend):
+        (WebCore::DOMSelection::getRangeAt):
+        (WebCore::DOMSelection::addRange):
+
 2014-02-15  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/page/DOMSelection.cpp

@@ -205 +205 @@
 
     // FIXME: Eliminate legacy editing positions
-    m_frame->selection().moveTo(VisiblePosition(createLegacyEditingPosition(node, offset), DOWNSTREAM));
+    m_frame->selection().moveTo(createLegacyEditingPosition(node, offset), DOWNSTREAM);
 }
 
@@ -220 +220 @@
     }
 
-    m_frame->selection().moveTo(VisiblePosition(selection.end(), DOWNSTREAM));
+    m_frame->selection().moveTo(selection.end(), DOWNSTREAM);
 }
 
@@ -235 +235 @@
     }
 
-    m_frame->selection().moveTo(VisiblePosition(selection.start(), DOWNSTREAM));
+    m_frame->selection().moveTo(selection.start(), DOWNSTREAM);
 }
 
@@ -259 +259 @@
 
     // FIXME: Eliminate legacy editing positions
-    VisiblePosition visibleBase = VisiblePosition(createLegacyEditingPosition(baseNode, baseOffset), DOWNSTREAM);
-    VisiblePosition visibleExtent = VisiblePosition(createLegacyEditingPosition(extentNode, extentOffset), DOWNSTREAM);
-
-    m_frame->selection().moveTo(visibleBase, visibleExtent);
+    m_frame->selection().moveTo(createLegacyEditingPosition(baseNode, baseOffset), createLegacyEditingPosition(extentNode, extentOffset), DOWNSTREAM);
 }
 
@@ -278 +275 @@
 
     // FIXME: Eliminate legacy editing positions
-    m_frame->selection().moveTo(VisiblePosition(createLegacyEditingPosition(node, offset), DOWNSTREAM));
+    m_frame->selection().moveTo(createLegacyEditingPosition(node, offset), DOWNSTREAM);
 }
 
@@ -350 +347 @@
 
     // FIXME: Eliminate legacy editing positions
-    m_frame->selection().setExtent(VisiblePosition(createLegacyEditingPosition(node, offset), DOWNSTREAM));
+    m_frame->selection().setExtent(createLegacyEditingPosition(node, offset), DOWNSTREAM);
 }
 
@@ -372 +369 @@
     }
 
-    const VisibleSelection& selection = m_frame->selection().selection();
-    return selection.firstRange();
+    return m_frame->selection().selection().firstRange();
 }
 
@@ -393 +389 @@
 
     if (selection.isNone()) {
-        selection.setSelection(VisibleSelection(r));
+        selection.moveTo(r);
         return;
     }
@@ -401 +397 @@
         // We don't support discontiguous selection. We don't do anything if r and range don't intersect.
         if (r->compareBoundaryPoints(Range::START_TO_END, range.get(), IGNORE_EXCEPTION) > -1) {
-            if (r->compareBoundaryPoints(Range::END_TO_END, range.get(), IGNORE_EXCEPTION) == -1)
+            if (r->compareBoundaryPoints(Range::END_TO_END, range.get(), IGNORE_EXCEPTION) == -1) {
                 // The original range and r intersect.
-                selection.setSelection(VisibleSelection(r->startPosition(), range->endPosition(), DOWNSTREAM));
-            else
+                selection.moveTo(r->startPosition(), range->endPosition(), DOWNSTREAM);
+            } else {
                 // r contains the original range.
-                selection.setSelection(VisibleSelection(r));
+                selection.moveTo(r);
+            }
         }
     } else {
@@ -412 +409 @@
         ExceptionCode ec = 0;
         if (r->compareBoundaryPoints(Range::END_TO_START, range.get(), ec) < 1 && !ec) {
-            if (r->compareBoundaryPoints(Range::END_TO_END, range.get(), IGNORE_EXCEPTION) == -1)
+            if (r->compareBoundaryPoints(Range::END_TO_END, range.get(), IGNORE_EXCEPTION) == -1) {
                 // The original range contains r.
-                selection.setSelection(VisibleSelection(range.get()));
-            else
+                selection.moveTo(range.get());
+            } else {
                 // The original range and r intersect.
-                selection.setSelection(VisibleSelection(range->startPosition(), r->endPosition(), DOWNSTREAM));
+                selection.moveTo(range->startPosition(), r->endPosition(), DOWNSTREAM);
+            }
         }
     }