Changeset 276202 in webkit

Timestamp:

Apr 17, 2021, 11:22:35 AM (5 years ago)

Author:

Alan Bujtas

Message:

[Cleanup] Modernize TrailingObjects
​https://bugs.webkit.org/show_bug.cgi?id=224712

Reviewed by Antti Koivisto.

Remove redundant c'tor and start using enum class.

• rendering/line/BreakingContext.h:

(WebCore::BreakingContext::handleText):
(WebCore::checkWhitespaceCollapsingTransitions):
(WebCore::BreakingContext::handleEndOfLine):

• rendering/line/TrailingObjects.cpp:

(WebCore::TrailingObjects::updateWhitespaceCollapsingTransitionsForTrailingBoxes):

• rendering/line/TrailingObjects.h:

(WebCore::TrailingObjects::setTrailingWhitespace):
(WebCore::TrailingObjects::clear):
(WebCore::TrailingObjects::TrailingObjects): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/line/BreakingContext.h (modified) (4 diffs)
• rendering/line/TrailingObjects.cpp (modified) (3 diffs)
• rendering/line/TrailingObjects.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-17  Zalan Bujtas  <zalan@apple.com>
+
+        [Cleanup] Modernize TrailingObjects
+        https://bugs.webkit.org/show_bug.cgi?id=224712
+
+        Reviewed by Antti Koivisto.
+
+        Remove redundant c'tor and start using enum class.
+
+        * rendering/line/BreakingContext.h:
+        (WebCore::BreakingContext::handleText):
+        (WebCore::checkWhitespaceCollapsingTransitions):
+        (WebCore::BreakingContext::handleEndOfLine):
+        * rendering/line/TrailingObjects.cpp:
+        (WebCore::TrailingObjects::updateWhitespaceCollapsingTransitionsForTrailingBoxes):
+        * rendering/line/TrailingObjects.h:
+        (WebCore::TrailingObjects::setTrailingWhitespace):
+        (WebCore::TrailingObjects::clear):
+        (WebCore::TrailingObjects::TrailingObjects): Deleted.
+
 2021-04-17  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/rendering/line/BreakingContext.h

@@ -981 +981 @@
                     // before the second space.
                     m_lineWhitespaceCollapsingState.startIgnoringSpaces(m_startOfIgnoredSpaces);
-                    m_trailingObjects.updateWhitespaceCollapsingTransitionsForTrailingBoxes(m_lineWhitespaceCollapsingState, InlineIterator(), TrailingObjects::DoNotCollapseFirstSpace);
+                    m_trailingObjects.updateWhitespaceCollapsingTransitionsForTrailingBoxes(m_lineWhitespaceCollapsingState, InlineIterator(), TrailingObjects::CollapseFirstSpace::No);
                 }
             }
@@ -1186 +1186 @@
 }
 
-inline TrailingObjects::CollapseFirstSpaceOrNot checkWhitespaceCollapsingTransitions(LineWhitespaceCollapsingState& lineWhitespaceCollapsingState, const InlineIterator& lBreak)
+inline TrailingObjects::CollapseFirstSpace checkWhitespaceCollapsingTransitions(LineWhitespaceCollapsingState& lineWhitespaceCollapsingState, const InlineIterator& lBreak)
 {
     // Check to see if our last transition is a start point beyond the line break. If so,
@@ -1203 +1203 @@
             if (endpoint.renderer()->style().collapseWhiteSpace() && endpoint.renderer()->isText()) {
                 lineWhitespaceCollapsingState.decrementTransitionAt(lineWhitespaceCollapsingState.numTransitions() - 1);
-                return TrailingObjects::DoNotCollapseFirstSpace;
+                return TrailingObjects::CollapseFirstSpace::No;
             }
         }
     }
-    return TrailingObjects::CollapseFirstSpace;
+    return TrailingObjects::CollapseFirstSpace::Yes;
 }
 
@@ -1241 +1241 @@
 
     // Sanity check our whitespace collapsing transitions.
-    TrailingObjects::CollapseFirstSpaceOrNot collapsed = checkWhitespaceCollapsingTransitions(m_lineWhitespaceCollapsingState, m_lineBreak);
-
+    auto collapsed = checkWhitespaceCollapsingTransitions(m_lineWhitespaceCollapsingState, m_lineBreak);
     m_trailingObjects.updateWhitespaceCollapsingTransitionsForTrailingBoxes(m_lineWhitespaceCollapsingState, m_lineBreak, collapsed);
 

trunk/Source/WebCore/rendering/line/TrailingObjects.cpp

@@ -30 +30 @@
 namespace WebCore {
 
-void TrailingObjects::updateWhitespaceCollapsingTransitionsForTrailingBoxes(LineWhitespaceCollapsingState& lineWhitespaceCollapsingState, const InlineIterator& lBreak, CollapseFirstSpaceOrNot collapseFirstSpace)
+void TrailingObjects::updateWhitespaceCollapsingTransitionsForTrailingBoxes(LineWhitespaceCollapsingState& lineWhitespaceCollapsingState, const InlineIterator& lBreak, CollapseFirstSpace collapseFirstSpace)
 {
     if (!m_whitespace)
@@ -42 +42 @@
         for ( ; trailingSpaceTransition > 0 && lineWhitespaceCollapsingState.transitions()[trailingSpaceTransition].renderer() != m_whitespace; --trailingSpaceTransition) { }
         ASSERT(trailingSpaceTransition >= 0);
-        if (collapseFirstSpace == CollapseFirstSpace)
+        if (collapseFirstSpace == CollapseFirstSpace::Yes)
             lineWhitespaceCollapsingState.decrementTransitionAt(trailingSpaceTransition);
 
@@ -60 +60 @@
     } else if (!lBreak.renderer()) {
         ASSERT(m_whitespace->isText());
-        ASSERT(collapseFirstSpace == CollapseFirstSpace);
+        ASSERT(collapseFirstSpace == CollapseFirstSpace::Yes);
         // Add a new end transition that stops right at the very end.
         unsigned length = m_whitespace->text().length();

trunk/Source/WebCore/rendering/line/TrailingObjects.h

@@ -44 +44 @@
 class TrailingObjects {
 public:
-    TrailingObjects()
-        : m_whitespace(0)
-    { }
-
-    void setTrailingWhitespace(RenderText& whitespace)
-    {
-        m_whitespace = &whitespace;
-    }
-
+    void setTrailingWhitespace(RenderText& whitespace) { m_whitespace = &whitespace; }
     void clear()
     {
-        m_whitespace = 0;
+        m_whitespace = { };
         m_boxes.shrink(0); // Use shrink(0) instead of clear() to retain our capacity.
     }
@@ -65 +57 @@
     }
 
-    enum CollapseFirstSpaceOrNot { DoNotCollapseFirstSpace, CollapseFirstSpace };
-
-    void updateWhitespaceCollapsingTransitionsForTrailingBoxes(LineWhitespaceCollapsingState&, const InlineIterator& lBreak, CollapseFirstSpaceOrNot);
+    enum class CollapseFirstSpace { No, Yes };
+    void updateWhitespaceCollapsingTransitionsForTrailingBoxes(LineWhitespaceCollapsingState&, const InlineIterator& lBreak, CollapseFirstSpace);
 
 private:
-    RenderText* m_whitespace;
+    RenderText* m_whitespace { nullptr };
     Vector<std::reference_wrapper<RenderBoxModelObject>, 4> m_boxes;
 };