Changeset 260855 in webkit

Timestamp:

Apr 28, 2020 4:37:20 PM (4 years ago)

Author:

dbates@webkit.org

Message:

Modernize EndPointsAdjustmentMode enumeration and fix misspelled enumerator
​https://bugs.webkit.org/show_bug.cgi?id=211141

Reviewed by Eric Carlson.

Fix the misspelled enumerator DoNotAdjsutEndpoints. While I am here, make
EndPointsAdjustmentMode an enum class sized as a bool and simplify the naming
of its enumerators now that they have to be qualified. I also re-ordered them
so that DoNotAdjust is the first enumerator (it will have value 0). This doesn't
really matter, but I like it because it makes it so that this enumeration behaves
more like an equivalent boolean should casts be involved.

• editing/FrameSelection.cpp:

(WebCore::FrameSelection::setSelectionByMouseIfDifferent):

• editing/FrameSelection.h:
• page/EventHandler.cpp:

(WebCore::EventHandler::updateSelectionForMouseDrag):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-28  Daniel Bates  <dabates@apple.com>
+
+        Modernize EndPointsAdjustmentMode enumeration and fix misspelled enumerator
+        https://bugs.webkit.org/show_bug.cgi?id=211141
+
+        Reviewed by Eric Carlson.
+
+        Fix the misspelled enumerator DoNotAdjsutEndpoints. While I am here, make
+        EndPointsAdjustmentMode an enum class sized as a bool and simplify the naming
+        of its enumerators now that they have to be qualified. I also re-ordered them
+        so that DoNotAdjust is the first enumerator (it will have value 0). This doesn't
+        really matter, but I like it because it makes it so that this enumeration behaves
+        more like an equivalent boolean should casts be involved.
+
+        * editing/FrameSelection.cpp:
+        (WebCore::FrameSelection::setSelectionByMouseIfDifferent):
+        * editing/FrameSelection.h:
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::updateSelectionForMouseDrag):
+
 2020-04-28  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -302 +302 @@
     VisiblePosition extent = newSelection.visibleExtent();
     VisiblePosition newExtent = extent;
-    if (endpointsAdjustmentMode == AdjustEndpointsAtBidiBoundary)
+    if (endpointsAdjustmentMode == EndPointsAdjustmentMode::AdjustAtBidiBoundary)
         adjustEndpointsAtBidiBoundary(newBase, newExtent);
 

trunk/Source/WebCore/editing/FrameSelection.h

@@ -257 +257 @@
     bool shouldChangeSelection(const VisibleSelection&) const;
     bool shouldDeleteSelection(const VisibleSelection&) const;
-    enum EndPointsAdjustmentMode { AdjustEndpointsAtBidiBoundary, DoNotAdjsutEndpoints };
-    void setSelectionByMouseIfDifferent(const VisibleSelection&, TextGranularity, EndPointsAdjustmentMode = DoNotAdjsutEndpoints);
+
+    enum class EndPointsAdjustmentMode : bool { DoNotAdjust, AdjustAtBidiBoundary };
+    void setSelectionByMouseIfDifferent(const VisibleSelection&, TextGranularity, EndPointsAdjustmentMode = EndPointsAdjustmentMode::DoNotAdjust);
 
     EditingStyle* typingStyle() const;

trunk/Source/WebCore/page/EventHandler.cpp

@@ -1036 +1036 @@
 
     m_frame.selection().setSelectionByMouseIfDifferent(newSelection, m_frame.selection().granularity(),
-        FrameSelection::AdjustEndpointsAtBidiBoundary);
+        FrameSelection::EndPointsAdjustmentMode::AdjustAtBidiBoundary);
 }
 #endif // ENABLE(DRAG_SUPPORT)