Changeset 83165 in webkit

Timestamp:

Apr 7, 2011 6:05:35 AM (13 years ago)

Author:

rniwa@webkit.org

Message:

2011-04-07 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Eric Seidel.

Add functions to update left and right offsets to LineOffsets
​https://bugs.webkit.org/show_bug.cgi?id=58028

Added update() and shrinkWidthForNewFloatIfNeeded(FloatingObject*) to LineOffsets,
which are used to update m_left and m_right. Also added m_block and m_isFirstLine
member variables to LineOffsets so that users of LineOffsets don't have to pass them around.

• rendering/RenderBlock.h:
• rendering/RenderBlockLineLayout.cpp: (WebCore::RenderBlock::skipLeadingWhitespace): No longer passes firstLine to positionNewFloatOnLine. (WebCore::LineOffsets::LineOffsets): Takes RenderBlock* and isFirstLine instead of left and right offsets. (WebCore::LineOffsets::update): Extracted from findNextLineBreak and positionNewFloatOnLine. (WebCore::LineOffsets::shrinkWidthForNewFloatIfNeeded): Extracted from positionNewFloatOnLine. (WebCore::RenderBlock::findNextLineBreak): Calls skipLeadingWhitespace and positionNewFloatOnLine. (WebCore::RenderBlock::positionNewFloatOnLine): Calls shrinkWidthForNewFloatIfNeeded and update and no longer passes firstLine around.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.h (modified) (3 diffs)
• rendering/RenderBlockLineLayout.cpp (modified) (8 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-07  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Add functions to update left and right offsets to LineOffsets
+        https://bugs.webkit.org/show_bug.cgi?id=58028
+
+        Added update() and shrinkWidthForNewFloatIfNeeded(FloatingObject*) to LineOffsets,
+        which are used to update m_left and m_right. Also added m_block and m_isFirstLine
+        member variables to LineOffsets so that users of LineOffsets don't have to pass them around.
+
+        * rendering/RenderBlock.h:
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::skipLeadingWhitespace): No longer passes firstLine to positionNewFloatOnLine.
+        (WebCore::LineOffsets::LineOffsets): Takes RenderBlock* and isFirstLine instead of left and right offsets.
+        (WebCore::LineOffsets::update): Extracted from findNextLineBreak and positionNewFloatOnLine.
+        (WebCore::LineOffsets::shrinkWidthForNewFloatIfNeeded): Extracted from positionNewFloatOnLine.
+        (WebCore::RenderBlock::findNextLineBreak): Calls skipLeadingWhitespace and positionNewFloatOnLine.
+        (WebCore::RenderBlock::positionNewFloatOnLine): Calls shrinkWidthForNewFloatIfNeeded and update and
+        no longer passes firstLine around.
+
 2011-04-06  Pavel Feldman  <pfeldman@google.com>
 

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -495 +495 @@
 
     void skipTrailingWhitespace(InlineIterator&, bool isLineEmpty, bool previousLineBrokeCleanly);
-    void skipLeadingWhitespace(InlineBidiResolver&, bool firstLine, bool isLineEmpty, bool previousLineBrokeCleanly, FloatingObject* lastFloatFromPreviousLine, LineOffsets&);
+    void skipLeadingWhitespace(InlineBidiResolver&, bool isLineEmpty, bool previousLineBrokeCleanly, FloatingObject* lastFloatFromPreviousLine, LineOffsets&);
     void fitBelowFloats(float widthToFit, float totalOverhangWidth, bool firstLine, float& availableWidth);
     typedef std::pair<RenderText*, LazyLineBreakIterator> LineBreakIteratorInfo;
@@ -510 +510 @@
     // Positions new floats and also adjust all floats encountered on the line if any of them
     // have to move to the next page/column.
-    bool positionNewFloatOnLine(FloatingObject* newFloat, FloatingObject* lastFloatFromPreviousLine, bool firstLine, LineOffsets&);
+    bool positionNewFloatOnLine(FloatingObject* newFloat, FloatingObject* lastFloatFromPreviousLine, LineOffsets&);
 
     // End of functions defined in RenderBlockLineLayout.cpp.
@@ -785 +785 @@
     // (calling moveChildTo, moveAllChildrenTo, and makeChildrenNonInline).
     friend class RenderRubyBase;
+    friend class LineOffsets; // Needs to know FloatingObject
 };
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1454 +1454 @@
 }
 
-void RenderBlock::skipLeadingWhitespace(InlineBidiResolver& resolver, bool firstLine, bool isLineEmpty, bool previousLineBrokeCleanly,
+void RenderBlock::skipLeadingWhitespace(InlineBidiResolver& resolver, bool isLineEmpty, bool previousLineBrokeCleanly,
     FloatingObject* lastFloatFromPreviousLine, LineOffsets& lineOffsets)
 {
@@ -1460 +1460 @@
         RenderObject* object = resolver.position().m_obj;
         if (object->isFloating())
-            positionNewFloatOnLine(insertFloatingObject(toRenderBox(object)), lastFloatFromPreviousLine, firstLine, lineOffsets);
+            positionNewFloatOnLine(insertFloatingObject(toRenderBox(object)), lastFloatFromPreviousLine, lineOffsets);
         else if (object->isPositioned())
             setStaticPositions(this, toRenderBox(object));
@@ -1563 +1563 @@
 class LineOffsets {
 public:
-    LineOffsets(int leftOffset, int rightOffset)
-    : m_left(leftOffset)
-    , m_right(rightOffset)
-    {
-    }
+    LineOffsets(RenderBlock*, bool isFirstLine);
     int width() const { return max(0, m_right - m_left); }
-    void setLeft(int left) { m_left = left; }
-    void setRight(int right) { m_right = right; }
+    void update();
+    void shrinkWidthForNewFloatIfNeeded(RenderBlock::FloatingObject*);
+
 private:
+    RenderBlock* m_block;
     int m_left;
     int m_right;
+    bool m_isFirstLine;
 };
+
+inline LineOffsets::LineOffsets(RenderBlock* block, bool isFirstLine)
+    : m_block(block)
+    , m_left(0)
+    , m_right(0)
+    , m_isFirstLine(isFirstLine)
+{
+    ASSERT(block);
+    update();
+}
+
+inline void LineOffsets::update()
+{
+    int height = m_block->logicalHeight();
+    m_left = m_block->logicalLeftOffsetForLine(height, m_isFirstLine);
+    m_right = m_block->logicalRightOffsetForLine(height, m_isFirstLine);
+}
+
+inline void LineOffsets::shrinkWidthForNewFloatIfNeeded(RenderBlock::FloatingObject* newFloat)
+{
+    int height = m_block->logicalHeight();
+    if (height < m_block->logicalTopForFloat(newFloat) || height >= m_block->logicalBottomForFloat(newFloat))
+        return;
+
+    if (newFloat->type() == RenderBlock::FloatingObject::FloatLeft)
+        m_left = m_block->logicalRightForFloat(newFloat);
+    else
+        m_right = m_block->logicalLeftForFloat(newFloat);
+}
 
 InlineIterator RenderBlock::findNextLineBreak(InlineBidiResolver& resolver, bool firstLine, bool& isLineEmpty, LineBreakIteratorInfo& lineBreakIteratorInfo, bool& previousLineBrokeCleanly, 
@@ -1583 +1611 @@
     bool appliedStartWidth = resolver.position().m_pos > 0;
     LineMidpointState& lineMidpointState = resolver.midpointState();
-    
-    int blockOffset = logicalHeight();
-    LineOffsets lineOffsets(logicalLeftOffsetForLine(blockOffset, firstLine), logicalRightOffsetForLine(blockOffset, firstLine));
-
-    skipLeadingWhitespace(resolver, firstLine, isLineEmpty, previousLineBrokeCleanly, lastFloatFromPreviousLine, lineOffsets);
+
+    LineOffsets lineOffsets(this, firstLine);
+
+    skipLeadingWhitespace(resolver, isLineEmpty, previousLineBrokeCleanly, lastFloatFromPreviousLine, lineOffsets);
 
     float width = lineOffsets.width();
@@ -1683 +1710 @@
                 // it after moving to next line (in newLine() func)
                 if (floatsFitOnLine && logicalWidthForFloat(f) + w + tmpW <= width) {
-                    positionNewFloatOnLine(f, lastFloatFromPreviousLine, firstLine, lineOffsets);
+                    positionNewFloatOnLine(f, lastFloatFromPreviousLine, lineOffsets);
                     width = lineOffsets.width() + totalOverhangWidth;
                     if (lBreak.m_obj == o) {
@@ -2270 +2297 @@
 }
 
-bool RenderBlock::positionNewFloatOnLine(FloatingObject* newFloat, FloatingObject* lastFloatFromPreviousLine, bool firstLine, LineOffsets& lineOffsets)
-{
-    bool didPosition = positionNewFloats();
-    if (!didPosition)
-        return didPosition;
-
-    int blockOffset = logicalHeight();
-    if (blockOffset >= logicalTopForFloat(newFloat) && blockOffset < logicalBottomForFloat(newFloat)) {
-        if (newFloat->type() == FloatingObject::FloatLeft)
-            lineOffsets.setLeft(logicalRightForFloat(newFloat));
-        else
-            lineOffsets.setRight(logicalLeftForFloat(newFloat));
-    }
+bool RenderBlock::positionNewFloatOnLine(FloatingObject* newFloat, FloatingObject* lastFloatFromPreviousLine, LineOffsets& lineOffsets)
+{
+    if (!positionNewFloats())
+        return false;
+
+    lineOffsets.shrinkWidthForNewFloatIfNeeded(newFloat);
 
     if (!newFloat->m_paginationStrut)
-        return didPosition;
+        return true;
 
     FloatingObjectSet& floatingObjectSet = m_floatingObjects->set();
@@ -2294 +2314 @@
 
     if (floatLogicalTop - paginationStrut != logicalHeight())
-        return didPosition;
+        return true;
 
     FloatingObjectSetIterator it = floatingObjectSet.end();
@@ -2316 +2336 @@
     }
 
-    setLogicalHeight(blockOffset + paginationStrut);
-    lineOffsets.setLeft(logicalLeftOffsetForLine(logicalHeight(), firstLine));
-    lineOffsets.setRight(logicalRightOffsetForLine(logicalHeight(), firstLine));
-
-    return didPosition;
-}
-
-}
+    setLogicalHeight(logicalHeight() + paginationStrut);
+    lineOffsets.update();
+
+    return true;
+}
+
+}