Changeset 85732 in webkit

Timestamp:

May 4, 2011 4:51:09 AM (13 years ago)

Author:

eric@webkit.org

Message:

2011-05-04 Eric Seidel <​eric@webkit.org>

Reviewed by Ryosuke Niwa.

Split createLineBoxesFromBidiRuns out from layoutRunsAndFloats
​https://bugs.webkit.org/show_bug.cgi?id=60080

No functional change, just moving code.

• rendering/RenderBlock.h:
• rendering/RenderBlockLineLayout.cpp: (WebCore::RenderBlock::createLineBoxesFromBidiRuns): (WebCore::RenderBlock::layoutRunsAndFloats):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-04  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Ryosuke Niwa.
+
+        Split createLineBoxesFromBidiRuns out from layoutRunsAndFloats
+        https://bugs.webkit.org/show_bug.cgi?id=60080
+
+        No functional change, just moving code.
+
+        * rendering/RenderBlock.h:
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::createLineBoxesFromBidiRuns):
+        (WebCore::RenderBlock::layoutRunsAndFloats):
+
 2011-05-04  Andreas Kling  <andreas.kling@nokia.com>
 

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -709 +709 @@
 
     // Helper function for layoutInlineChildren()
+    RootInlineBox* createLineBoxesFromBidiRuns(BidiRunList<BidiRun>&, const InlineIterator& end, LineInfo&, VerticalPositionCache&, BidiRun* trailingSpaceRun);
     void layoutRunsAndFloats(bool fullLayout, bool hasInlineChild, Vector<FloatWithRect>&, int& repaintLogicalTop, int& repaintLogicalBottom);
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -763 +763 @@
 }
 
+// This function constructs line boxes for all of the text runs in the resolver and computes their position.
+RootInlineBox* RenderBlock::createLineBoxesFromBidiRuns(BidiRunList<BidiRun>& bidiRuns, const InlineIterator& end, LineInfo& lineInfo, VerticalPositionCache& verticalPositionCache, BidiRun* trailingSpaceRun)
+{
+    if (!bidiRuns.runCount())
+        return 0;
+
+    // FIXME: Why is this only done when we had runs?
+    lineInfo.setLastLine(!end.m_obj);
+
+    RootInlineBox* lineBox = constructLine(bidiRuns, lineInfo);
+    if (!lineBox)
+        return 0;
+
+    lineBox->setEndsWithBreak(lineInfo.previousLineBrokeCleanly());
+    
+#if ENABLE(SVG)
+    bool isSVGRootInlineBox = lineBox->isSVGRootInlineBox();
+#else
+    bool isSVGRootInlineBox = false;
+#endif
+    
+    GlyphOverflowAndFallbackFontsMap textBoxDataMap;
+    
+    // Now we position all of our text runs horizontally.
+    if (!isSVGRootInlineBox)
+        computeInlineDirectionPositionsForLine(lineBox, lineInfo, bidiRuns.firstRun(), trailingSpaceRun, end.atEnd(), textBoxDataMap, verticalPositionCache);
+    
+    // Now position our text runs vertically.
+    computeBlockDirectionPositionsForLine(lineBox, bidiRuns.firstRun(), textBoxDataMap, verticalPositionCache);
+    
+#if ENABLE(SVG)
+    // SVG text layout code computes vertical & horizontal positions on its own.
+    // Note that we still need to execute computeVerticalPositionsForLine() as
+    // it calls InlineTextBox::positionLineBox(), which tracks whether the box
+    // contains reversed text or not. If we wouldn't do that editing and thus
+    // text selection in RTL boxes would not work as expected.
+    if (isSVGRootInlineBox) {
+        ASSERT(isSVGText());
+        static_cast<SVGRootInlineBox*>(lineBox)->computePerCharacterLayoutInformation();
+    }
+#endif
+    
+    // Compute our overflow now.
+    lineBox->computeOverflow(lineBox->lineTop(), lineBox->lineBottom(), textBoxDataMap);
+    
+#if PLATFORM(MAC)
+    // Highlight acts as an overflow inflation.
+    if (style()->highlight() != nullAtom)
+        lineBox->addHighlightOverflow();
+#endif
+    return lineBox;
+}
+
 void RenderBlock::layoutRunsAndFloats(bool fullLayout, bool hasInlineChild, Vector<FloatWithRect>& floats, int& repaintLogicalTop, int& repaintLogicalBottom)
 {
@@ -872 +925 @@
         ASSERT(end != resolver.position());
 
+        // This is a short-cut for empty lines.
         if (lineInfo.isEmpty()) {
             if (lastRootBox())
@@ -884 +938 @@
             BidiRun* trailingSpaceRun = !lineInfo.previousLineBrokeCleanly() ? handleTrailingSpaces(bidiRuns, resolver.context()) : 0;
 
+            if (bidiRuns.runCount() && hyphenated)
+                bidiRuns.logicallyLastRun()->m_hasHyphen = true;
+
             // Now that the runs have been ordered, we create the line boxes.
             // At the same time we figure out where border/padding/margin should be applied for
             // inline flow boxes.
 
-            RootInlineBox* lineBox = 0;
             int oldLogicalHeight = logicalHeight();
-            if (bidiRuns.runCount()) {
-                if (hyphenated)
-                    bidiRuns.logicallyLastRun()->m_hasHyphen = true;
-                lineInfo.setLastLine(!end.m_obj);
-                lineBox = constructLine(bidiRuns, lineInfo);
-                if (lineBox) {
-                    lineBox->setEndsWithBreak(lineInfo.previousLineBrokeCleanly());
-
-#if ENABLE(SVG)
-                    bool isSVGRootInlineBox = lineBox->isSVGRootInlineBox();
-#else
-                    bool isSVGRootInlineBox = false;
-#endif
-
-                    GlyphOverflowAndFallbackFontsMap textBoxDataMap;
-
-                    // Now we position all of our text runs horizontally.
-                    if (!isSVGRootInlineBox)
-                        computeInlineDirectionPositionsForLine(lineBox, lineInfo, bidiRuns.firstRun(), trailingSpaceRun, end.atEnd(), textBoxDataMap, verticalPositionCache);
-
-                    // Now position our text runs vertically.
-                    computeBlockDirectionPositionsForLine(lineBox, bidiRuns.firstRun(), textBoxDataMap, verticalPositionCache);
-
-#if ENABLE(SVG)
-                    // SVG text layout code computes vertical & horizontal positions on its own.
-                    // Note that we still need to execute computeVerticalPositionsForLine() as
-                    // it calls InlineTextBox::positionLineBox(), which tracks whether the box
-                    // contains reversed text or not. If we wouldn't do that editing and thus
-                    // text selection in RTL boxes would not work as expected.
-                    if (isSVGRootInlineBox) {
-                        ASSERT(isSVGText());
-                        static_cast<SVGRootInlineBox*>(lineBox)->computePerCharacterLayoutInformation();
-                    }
-#endif
-
-                    // Compute our overflow now.
-                    lineBox->computeOverflow(lineBox->lineTop(), lineBox->lineBottom(), textBoxDataMap);
-
-#if PLATFORM(MAC)
-                    // Highlight acts as an overflow inflation.
-                    if (style()->highlight() != nullAtom)
-                        lineBox->addHighlightOverflow();
-#endif
-                }
-            }
+            RootInlineBox* lineBox = createLineBoxesFromBidiRuns(bidiRuns, end, lineInfo, verticalPositionCache, trailingSpaceRun);
 
             bidiRuns.deleteRuns();