[webkit-changes] [164834] trunk/Source/WebCore

Thu, 27 Feb 2014 15:18:59 -0800

Title: [164834] trunk/Source/WebCore
Revision
164834
Author
[email protected]
Date
2014-02-27 15:24:05 -0800 (Thu, 27 Feb 2014)

Log Message

Avoid calling logicalLeftOffsetForLine 2 times in LineWidth::fitBelowFloats
https://bugs.webkit.org/show_bug.cgi?id=129433

Reviewed by Darin Adler.

This change updates fitBelowFloats and its helpers to call RenderBlock::logicalLeftOffsetForLine only once.

No new tests, no behavior change.

* rendering/line/LineWidth.cpp:
(WebCore::availableWidthAtOffset):
(WebCore::LineWidth::updateLineDimension):
(WebCore::LineWidth::wrapNextToShapeOutside):
(WebCore::LineWidth::fitBelowFloats):
* rendering/line/LineWidth.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (164833 => 164834)


--- trunk/Source/WebCore/ChangeLog	2014-02-27 23:18:26 UTC (rev 164833)
+++ trunk/Source/WebCore/ChangeLog	2014-02-27 23:24:05 UTC (rev 164834)
@@ -1,3 +1,21 @@
+2014-02-27  Zoltan Horvath  <[email protected]>
+
+        Avoid calling logicalLeftOffsetForLine 2 times in LineWidth::fitBelowFloats
+        https://bugs.webkit.org/show_bug.cgi?id=129433
+
+        Reviewed by Darin Adler.
+
+        This change updates fitBelowFloats and its helpers to call RenderBlock::logicalLeftOffsetForLine only once.
+
+        No new tests, no behavior change.
+
+        * rendering/line/LineWidth.cpp:
+        (WebCore::availableWidthAtOffset):
+        (WebCore::LineWidth::updateLineDimension):
+        (WebCore::LineWidth::wrapNextToShapeOutside):
+        (WebCore::LineWidth::fitBelowFloats):
+        * rendering/line/LineWidth.h:
+
 2014-02-27  Andreas Kling  <[email protected]>
 
         Micro-optimize elementAffectsDirectionality().

Modified: trunk/Source/WebCore/rendering/line/LineWidth.cpp (164833 => 164834)


--- trunk/Source/WebCore/rendering/line/LineWidth.cpp	2014-02-27 23:18:26 UTC (rev 164833)
+++ trunk/Source/WebCore/rendering/line/LineWidth.cpp	2014-02-27 23:24:05 UTC (rev 164834)
@@ -158,26 +158,33 @@
     m_overhangWidth += startOverhang + endOverhang;
 }
 
-inline static float availableWidthAtOffset(const RenderBlock& block, const LayoutUnit& offset, bool shouldIndentText)
+inline static float availableWidthAtOffset(const RenderBlockFlow& block, const LayoutUnit& offset, bool shouldIndentText, float& newLineLeft, float& newLineRight)
 {
-    float newLineLeft = block.logicalLeftOffsetForLine(offset, shouldIndentText);
-    float newLineRight = block.logicalRightOffsetForLine(offset, shouldIndentText);
+    newLineLeft = block.logicalLeftOffsetForLine(offset, shouldIndentText);
+    newLineRight = block.logicalRightOffsetForLine(offset, shouldIndentText);
     return std::max(0.0f, newLineRight - newLineLeft);
 }
 
-void LineWidth::updateLineDimension(LayoutUnit newLineTop, LayoutUnit newLineWidth)
+inline static float availableWidthAtOffset(const RenderBlockFlow& block, const LayoutUnit& offset, bool shouldIndentText)
 {
+    float newLineLeft = 0;
+    float newLineRight = 0;
+    return availableWidthAtOffset(block, offset, shouldIndentText, newLineLeft, newLineRight);
+}
+
+void LineWidth::updateLineDimension(LayoutUnit newLineTop, LayoutUnit newLineWidth, float newLineLeft, float newLineRight)
+{
     if (newLineWidth <= m_availableWidth)
         return;
 
     m_block.setLogicalHeight(newLineTop);
     m_availableWidth = newLineWidth + m_overhangWidth;
-    m_left = m_block.logicalLeftOffsetForLine(newLineTop, shouldIndentText());
-    m_right = m_block.logicalRightOffsetForLine(newLineTop, shouldIndentText());
+    m_left = newLineLeft;
+    m_right = newLineRight;
 }
 
 #if ENABLE(CSS_SHAPES)
-inline static bool isWholeLineFit(const RenderBlock& block, const LayoutUnit& lineTop, LayoutUnit lineHeight, float uncommittedWidth, bool shouldIndentText)
+inline static bool isWholeLineFit(const RenderBlockFlow& block, const LayoutUnit& lineTop, LayoutUnit lineHeight, float uncommittedWidth, bool shouldIndentText)
 {
     for (LayoutUnit lineBottom = lineTop; lineBottom <= lineTop + lineHeight; ++lineBottom) {
         LayoutUnit availableWidthAtBottom = availableWidthAtOffset(block, lineBottom, shouldIndentText);
@@ -195,8 +202,10 @@
     LayoutUnit floatLogicalBottom = m_block.nextFloatLogicalBottomBelow(lineLogicalTop);
 
     float newLineWidth;
+    float newLineLeft = m_left;
+    float newLineRight = m_right;
     while (true) {
-        newLineWidth = availableWidthAtOffset(m_block, newLineTop, shouldIndentText());
+        newLineWidth = availableWidthAtOffset(m_block, newLineTop, shouldIndentText(), newLineLeft, newLineRight);
         if (newLineWidth >= m_uncommittedWidth && isWholeLineFit(m_block, newLineTop, lineHeight, m_uncommittedWidth, shouldIndentText()))
             break;
 
@@ -205,7 +214,7 @@
 
         ++newLineTop;
     }
-    updateLineDimension(newLineTop, newLineWidth);
+    updateLineDimension(newLineTop, newLineWidth, newLineLeft, newLineRight);
 }
 #endif
 
@@ -221,6 +230,8 @@
     LayoutUnit floatLogicalBottom;
     LayoutUnit lastFloatLogicalBottom = m_block.logicalHeight();
     float newLineWidth = m_availableWidth;
+    float newLineLeft = m_left;
+    float newLineRight = m_right;
 
 #if ENABLE(CSS_SHAPES)
     FloatingObject* lastFloatFromPreviousLine = (m_block.containsFloats() ? m_block.m_floatingObjects->set().last().get() : 0);
@@ -233,7 +244,7 @@
         if (floatLogicalBottom <= lastFloatLogicalBottom)
             break;
 
-        newLineWidth = availableWidthAtOffset(m_block, floatLogicalBottom, shouldIndentText());
+        newLineWidth = availableWidthAtOffset(m_block, floatLogicalBottom, shouldIndentText(), newLineLeft, newLineRight);
         lastFloatLogicalBottom = floatLogicalBottom;
 
 #if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
@@ -250,7 +261,7 @@
             break;
     }
 
-    updateLineDimension(lastFloatLogicalBottom, newLineWidth);
+    updateLineDimension(lastFloatLogicalBottom, newLineWidth, newLineLeft, newLineRight);
 }
 
 void LineWidth::setTrailingWhitespaceWidth(float collapsedWhitespace, float borderPaddingMargin)

Modified: trunk/Source/WebCore/rendering/line/LineWidth.h (164833 => 164834)


--- trunk/Source/WebCore/rendering/line/LineWidth.h	2014-02-27 23:18:26 UTC (rev 164833)
+++ trunk/Source/WebCore/rendering/line/LineWidth.h	2014-02-27 23:24:05 UTC (rev 164834)
@@ -76,7 +76,7 @@
 private:
     void computeAvailableWidthFromLeftAndRight();
     bool fitsOnLineExcludingTrailingCollapsedWhitespace() const;
-    void updateLineDimension(LayoutUnit newLineTop, LayoutUnit newLineWidth);
+    void updateLineDimension(LayoutUnit newLineTop, LayoutUnit newLineWidth, float newLineLeft, float newLineRight);
 #if ENABLE(CSS_SHAPES)
     void wrapNextToShapeOutside(bool isFirstLine);
 #endif

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to