Changeset 121125 in webkit

Timestamp:

Jun 24, 2012, 5:29:03 PM (14 years ago)

Author:

abarth@webkit.org

Message:

Change the type of the second argument of FrameSelection::revealSelection to use RevealExtentOption
​https://bugs.webkit.org/show_bug.cgi?id=89833

Reviewed by Ryosuke Niwa.

As requested by Ryosuke Niwa. Rare boolean parameters are hard to read.

• WebCore.exp.in:
• editing/Editor.cpp:

(WebCore::Editor::revealSelectionAfterEditingOperation):

• editing/Editor.h:

(Editor):

• editing/FrameSelection.cpp:

(WebCore::FrameSelection::setSelection):
(WebCore::FrameSelection::revealSelection):

• editing/FrameSelection.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.exp.in (modified) (1 diff)
• editing/Editor.cpp (modified) (1 diff)
• editing/Editor.h (modified) (1 diff)
• editing/FrameSelection.cpp (modified) (3 diffs)
• editing/FrameSelection.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-24  Adam Barth  <abarth@webkit.org>
+
+        Change the type of the second argument of FrameSelection::revealSelection to use RevealExtentOption
+        https://bugs.webkit.org/show_bug.cgi?id=89833
+
+        Reviewed by Ryosuke Niwa.
+
+        As requested by Ryosuke Niwa.  Rare boolean parameters are hard to read.
+
+        * WebCore.exp.in:
+        * editing/Editor.cpp:
+        (WebCore::Editor::revealSelectionAfterEditingOperation):
+        * editing/Editor.h:
+        (Editor):
+        * editing/FrameSelection.cpp:
+        (WebCore::FrameSelection::setSelection):
+        (WebCore::FrameSelection::revealSelection):
+        * editing/FrameSelection.h:
+
 2012-06-24  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -255 +255 @@
 __ZN7WebCore14FrameSelection10setFocusedEb
 __ZN7WebCore14FrameSelection12setSelectionERKNS_16VisibleSelectionEjNS0_19CursorAlignOnScrollENS_15TextGranularityE
-__ZN7WebCore14FrameSelection15revealSelectionERKNS_15ScrollAlignmentEb
+__ZN7WebCore14FrameSelection15revealSelectionERKNS_15ScrollAlignmentENS_18RevealExtentOptionE
 __ZN7WebCore14FrameSelection16setSelectedRangeEPNS_5RangeENS_9EAffinityEb
 __ZN7WebCore14FrameSelection19absoluteCaretBoundsEv

trunk/Source/WebCore/editing/Editor.cpp

@@ -2302 +2302 @@
         return;
 
-    m_frame->selection()->revealSelection(alignment, revealExtentOption == RevealExtent);
+    m_frame->selection()->revealSelection(alignment, revealExtentOption);
 }
 

trunk/Source/WebCore/editing/Editor.h

@@ -424 +424 @@
     void pasteWithPasteboard(Pasteboard*, bool allowPlainText);
 
-    enum RevealExtentOption {
-        RevealExtent,
-        DoNotRevealExtent
-    };
-
     void revealSelectionAfterEditingOperation(const ScrollAlignment& = ScrollAlignment::alignCenterIfNeeded, RevealExtentOption = DoNotRevealExtent);
     void markMisspellingsOrBadGrammar(const VisibleSelection&, bool checkSpelling, RefPtr<Range>& firstMisspellingRange);

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -304 +304 @@
             alignment = (align == AlignCursorOnScrollAlways) ? ScrollAlignment::alignTopAlways : ScrollAlignment::alignToEdgeIfNeeded;
 
-        revealSelection(alignment, true);
+        revealSelection(alignment, RevealExtent);
     }
 
@@ -1933 +1933 @@
 }
 
-void FrameSelection::revealSelection(const ScrollAlignment& alignment, bool revealExtent)
+void FrameSelection::revealSelection(const ScrollAlignment& alignment, RevealExtentOption revealExtentOption)
 {
     LayoutRect rect;
@@ -1944 +1944 @@
         break;
     case VisibleSelection::RangeSelection:
-        rect = revealExtent ? VisiblePosition(extent()).absoluteCaretBounds() : enclosingIntRect(bounds(false));
+        rect = revealExtentOption == RevealExtent ? VisiblePosition(extent()).absoluteCaretBounds() : enclosingIntRect(bounds(false));
         break;
     }

trunk/Source/WebCore/editing/FrameSelection.h

@@ -50 +50 @@
 enum EUserTriggered { NotUserTriggered = 0, UserTriggered = 1 };
 
+enum RevealExtentOption {
+    RevealExtent,
+    DoNotRevealExtent
+};
+
 class CaretBase {
     WTF_MAKE_NONCOPYABLE(CaretBase);
@@ -248 +253 @@
     HTMLFormElement* currentForm() const;
 
-    void revealSelection(const ScrollAlignment& = ScrollAlignment::alignCenterIfNeeded, bool revealExtent = false);
+    void revealSelection(const ScrollAlignment& = ScrollAlignment::alignCenterIfNeeded, RevealExtentOption = DoNotRevealExtent);
     void setSelectionFromNone();