Changeset 93531 in webkit

Timestamp:

Aug 22, 2011 1:05:51 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

FrameSelection::setNonDirectionalSelectionIfNeeded should not have a FrameSelection passed to it
​https://bugs.webkit.org/show_bug.cgi?id=66636

Patch by Wyatt Carss <​wcarss@chromium.org> on 2011-08-22
Reviewed by Darin Adler.

setNonDirectionalSelection was moved into FrameSelection in r93134 for
bug 60529, and still took a FrameSelection as an argument, which has been removed.

• editing/FrameSelection.cpp:

(WebCore::FrameSelection::setNonDirectionalSelectionIfNeeded):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (2 diffs)
• editing/FrameSelection.cpp (modified) (2 diffs)
• editing/FrameSelection.h (modified) (1 diff)
• page/EventHandler.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-22  Wyatt Carss  <wcarss@chromium.org>
+
+        FrameSelection::setNonDirectionalSelectionIfNeeded should not have a FrameSelection passed to it
+        https://bugs.webkit.org/show_bug.cgi?id=66636
+
+        Reviewed by Darin Adler.
+
+        setNonDirectionalSelection was moved into FrameSelection in r93134 for 
+        bug 60529, and still took a FrameSelection as an argument, which has been removed.
+
+        * editing/FrameSelection.cpp:
+        (WebCore::FrameSelection::setNonDirectionalSelectionIfNeeded):
+
 2011-08-22  Tony Chang  <tony@chromium.org>
 
@@ -262 +275 @@
         all elements should be available on DOMWindow.
 
-         * bindings/generic/RuntimeEnabledFeatures.cpp:
+        * bindings/generic/RuntimeEnabledFeatures.cpp:
         (WebCore::RuntimeEnabledFeatures::htmlSourceElementEnabled):
         * bindings/generic/RuntimeEnabledFeatures.h:

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -164 +164 @@
 }
 
-void FrameSelection::setNonDirectionalSelectionIfNeeded(FrameSelection* selection, const VisibleSelection& passedNewSelection, TextGranularity granularity)
-{
-    ASSERT(selection);
+void FrameSelection::setNonDirectionalSelectionIfNeeded(const VisibleSelection& passedNewSelection, TextGranularity granularity)
+{
     VisibleSelection newSelection = passedNewSelection;
 
@@ -172 +171 @@
         newSelection.setIsDirectional(true);
 
-    if (selection->selection() == newSelection || !selection->shouldChangeSelection(newSelection))
+    if (m_selection == newSelection || !shouldChangeSelection(newSelection))
         return;
 

trunk/Source/WebCore/editing/FrameSelection.h

@@ -224 +224 @@
     bool shouldChangeSelection(const VisibleSelection&) const;
     bool shouldDeleteSelection(const VisibleSelection&) const;
-    void setNonDirectionalSelectionIfNeeded(FrameSelection*, const VisibleSelection&, TextGranularity);
+    void setNonDirectionalSelectionIfNeeded(const VisibleSelection&, TextGranularity);
     void setFocusedNodeIfNeeded();
     void notifyRendererOfSelectionChange(EUserTriggered);

trunk/Source/WebCore/page/EventHandler.cpp

@@ -288 +288 @@
     }
 
-    m_frame->selection()->setNonDirectionalSelectionIfNeeded(m_frame->selection(), newSelection, granularity);
+    m_frame->selection()->setNonDirectionalSelectionIfNeeded(newSelection, granularity);
 
     return true;
@@ -691 +691 @@
         newSelection.expandUsingGranularity(m_frame->selection()->granularity());
 
-    m_frame->selection()->setNonDirectionalSelectionIfNeeded(m_frame->selection(), newSelection, m_frame->selection()->granularity());
+    m_frame->selection()->setNonDirectionalSelectionIfNeeded(newSelection, m_frame->selection()->granularity());
 }
 #endif // ENABLE(DRAG_SUPPORT)