Changeset 276201 in webkit

Timestamp:

Apr 17, 2021, 8:38:31 AM (5 years ago)

Author:

Alan Bujtas

Message:

[Cleanup] BreakingContext::handleText should consistently use the cached renderer
​https://bugs.webkit.org/show_bug.cgi?id=224711

Reviewed by Antti Koivisto.

Since this function is not supposed to increment the renderer, let's replace m_current.renderer() with "renderer".

• rendering/line/BreakingContext.h:

(WebCore::BreakingContext::handleText):

• rendering/line/TrailingObjects.h:

(WebCore::TrailingObjects::setTrailingWhitespace):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/line/BreakingContext.h (modified) (12 diffs)
• rendering/line/TrailingObjects.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-17  Zalan Bujtas  <zalan@apple.com>
+
+        [Cleanup] BreakingContext::handleText should consistently use the cached renderer
+        https://bugs.webkit.org/show_bug.cgi?id=224711
+
+        Reviewed by Antti Koivisto.
+
+        Since this function is not supposed to increment the renderer, let's replace m_current.renderer() with "renderer".
+
+        * rendering/line/BreakingContext.h:
+        (WebCore::BreakingContext::handleText):
+        * rendering/line/TrailingObjects.h:
+        (WebCore::TrailingObjects::setTrailingWhitespace):
+
 2021-04-17  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -679 +679 @@
         commitLineBreakAtCurrentWidth(renderer);
 
-    if (renderer.style().hasTextCombine() && is<RenderCombineText>(*m_current.renderer())) {
-        auto& combineRenderer = downcast<RenderCombineText>(*m_current.renderer());
+    if (renderer.style().hasTextCombine() && is<RenderCombineText>(renderer)) {
+        auto& combineRenderer = downcast<RenderCombineText>(renderer);
         combineRenderer.combineTextIfNeeded();
         // The length of the renderer's text may have changed. Increment stale iterator positions
@@ -703 +703 @@
     float wordSpacingForWordMeasurement = 0;
 
-    float wrapWidthOffset = m_width.uncommittedWidth() + inlineLogicalWidth(*m_current.renderer(), !m_appliedStartWidth, true);
+    float wrapWidthOffset = m_width.uncommittedWidth() + inlineLogicalWidth(renderer, !m_appliedStartWidth, true);
     float wrapW = wrapWidthOffset;
     float charWidth = 0;
@@ -746 +746 @@
     WordTrailingSpace wordTrailingSpace(style, !textLayout);
     for (; m_current.offset() < renderer.text().length(); m_current.fastIncrementInTextNode()) {
+        ASSERT(&renderer == m_current.renderer());
         bool previousCharacterIsSpace = m_currentCharacterIsSpace;
         bool previousCharacterIsWS = m_currentCharacterIsWS;
@@ -759 +760 @@
         }
 
-        if (canHangPunctuationAtStart && m_width.isFirstLine() && !m_width.committedWidth() && !wrapW && !inlineLogicalWidth(*m_current.renderer(), true, false)) {
+        if (canHangPunctuationAtStart && m_width.isFirstLine() && !m_width.committedWidth() && !wrapW && !inlineLogicalWidth(renderer, true, false)) {
             m_width.addUncommittedWidth(-renderer.hangablePunctuationStartWidth(m_current.offset()));
             canHangPunctuationAtStart = false;
         }
         
-        if (canHangPunctuationAtEnd && !m_nextObject && (int)m_current.offset() == endPunctuationIndex && !inlineLogicalWidth(*m_current.renderer(), false, true)) {
+        if (canHangPunctuationAtEnd && !m_nextObject && (int)m_current.offset() == endPunctuationIndex && !inlineLogicalWidth(renderer, false, true)) {
             m_width.addUncommittedWidth(-renderer.hangablePunctuationEndWidth(endPunctuationIndex));
             canHangPunctuationAtEnd = false;
@@ -797 +798 @@
             // the stop/comma at the end. First measure including the comma.
             m_hangsAtEnd = false;
-            float inlineStartWidth = !m_appliedStartWidth ? inlineLogicalWidth(*m_current.renderer(), true, false) : 0_lu;
+            float inlineStartWidth = !m_appliedStartWidth ? inlineLogicalWidth(renderer, true, false) : 0_lu;
             float widthIncludingComma = computeAdditionalBetweenWordsWidth(renderer, textLayout, c, wordTrailingSpace, fallbackFonts, wordMeasurements, font, isFixedPitch, lastSpace, lastSpaceWordSpacing, wordSpacingForWordMeasurement, m_current.offset() + 1) + inlineStartWidth;
             m_width.addUncommittedWidth(widthIncludingComma);
@@ -819 +820 @@
                     wordSpacingForWordMeasurement = 0;
                     lastSpace = m_current.offset(); // e.g., "Foo    goo", don't add in any of the ignored spaces.
-                    m_lineWhitespaceCollapsingState.stopIgnoringSpaces(InlineIterator(0, m_current.renderer(), m_current.offset()));
+                    m_lineWhitespaceCollapsingState.stopIgnoringSpaces(InlineIterator(0, &renderer, m_current.offset()));
                     stoppedIgnoringSpaces = true;
                 } else {
@@ -837 +838 @@
 
             if (!m_appliedStartWidth) {
-                float inlineStartWidth = inlineLogicalWidth(*m_current.renderer(), true, false);
+                float inlineStartWidth = inlineLogicalWidth(renderer, true, false);
                 m_width.addUncommittedWidth(inlineStartWidth);
                 m_appliedStartWidth = true;
@@ -898 +899 @@
                             // We might just be right after the soft-hyphen
                             lastBreakingPosition = m_current.nextBreakablePosition().value();
-                            rendererAtBreakingPosition = m_current.renderer();
+                            rendererAtBreakingPosition = &renderer;
                         }
                         if (lastBreakingPosition) {
@@ -997 +998 @@
                 wordSpacingForWordMeasurement = (applyWordSpacing && wordMeasurements.last().width) ? wordSpacing : 0;
                 lastSpace = m_current.offset(); // e.g., "Foo    goo", don't add in any of the ignored spaces.
-                m_lineWhitespaceCollapsingState.stopIgnoringSpaces(InlineIterator(nullptr, m_current.renderer(), m_current.offset()));
+                m_lineWhitespaceCollapsingState.stopIgnoringSpaces(InlineIterator(nullptr, &renderer, m_current.offset()));
             }
             if (m_hangsAtEnd && !renderer.isHangableStopOrComma(c))
@@ -1010 +1011 @@
 
         if (m_currentCharacterIsSpace && !previousCharacterIsSpace) {
-            m_startOfIgnoredSpaces.setRenderer(m_current.renderer());
+            m_startOfIgnoredSpaces.setRenderer(&renderer);
             m_startOfIgnoredSpaces.setOffset(m_current.offset());
             // Spaces after right-aligned text and before a line-break get collapsed away completely so that the trailing
@@ -1029 +1030 @@
 
         if (m_collapseWhiteSpace && m_currentCharacterIsSpace && !m_ignoringSpaces)
-            m_trailingObjects.setTrailingWhitespace(downcast<RenderText>(m_current.renderer()));
+            m_trailingObjects.setTrailingWhitespace(renderer);
         else if (!m_currentStyle->collapseWhiteSpace() || !m_currentCharacterIsSpace)
             m_trailingObjects.clear();
@@ -1050 +1051 @@
     additionalTempWidth += lastSpaceWordSpacing;
 
-    float inlineLogicalTempWidth = inlineLogicalWidth(*m_current.renderer(), !m_appliedStartWidth, m_includeEndWidth);
+    float inlineLogicalTempWidth = inlineLogicalWidth(renderer, !m_appliedStartWidth, m_includeEndWidth);
     m_width.addUncommittedWidth(additionalTempWidth + inlineLogicalTempWidth);
     if (m_hangsAtEnd && inlineLogicalTempWidth)

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

@@ -48 +48 @@
     { }
 
-    void setTrailingWhitespace(RenderText* whitespace)
+    void setTrailingWhitespace(RenderText& whitespace)
     {
-        ASSERT(whitespace);
-        m_whitespace = whitespace;
+        m_whitespace = &whitespace;
     }