Changeset 83813 in webkit

Timestamp:

Apr 13, 2011 10:35:54 PM (13 years ago)

Author:

yael.aharon@nokia.com

Message:

2011-04-13 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Eric Seidel.

constructLine should take bidiRuns as a parameter
​https://bugs.webkit.org/show_bug.cgi?id=58458

Pass bidiRuns to constructLine and move reachedEndOfTextRenderer so that it is
declared before constructLine.

No new tests as this is refactoring only.

• rendering/RenderBlock.h:
• rendering/RenderBlockLineLayout.cpp: (WebCore::reachedEndOfTextRenderer): (WebCore::RenderBlock::constructLine): (WebCore::RenderBlock::layoutInlineChildren):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-13  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        constructLine should take bidiRuns as a parameter
+        https://bugs.webkit.org/show_bug.cgi?id=58458
+
+        Pass bidiRuns to constructLine and move reachedEndOfTextRenderer so that it is
+        declared before constructLine.
+
+        No new tests as this is refactoring only.
+
+        * rendering/RenderBlock.h:
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::reachedEndOfTextRenderer):
+        (WebCore::RenderBlock::constructLine):
+        (WebCore::RenderBlock::layoutInlineChildren):
+
 2011-04-13  Oliver Hunt  <oliver@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -501 +501 @@
     InlineIterator findNextLineBreak(InlineBidiResolver&, bool firstLine, bool& isLineEmpty, LineBreakIteratorInfo&, bool& previousLineBrokeCleanly, bool& hyphenated,
                                      EClear*, FloatingObject* lastFloatFromPreviousLine, Vector<RenderBox*>& positionedObjects);
-    RootInlineBox* constructLine(unsigned runCount, BidiRun* firstRun, BidiRun* lastRun, bool firstLine, bool lastLine, bool isLogicallyLastRunWrapped, RenderObject* logicallyLastRunRenderer);
+    RootInlineBox* constructLine(BidiRunList<BidiRun>&, bool firstLine, bool lastLine);
     InlineFlowBox* createLineBoxes(RenderObject*, bool firstLine, InlineBox* childBox);
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -267 +267 @@
 }
 
-RootInlineBox* RenderBlock::constructLine(unsigned runCount, BidiRun* firstRun, BidiRun* lastRun, bool firstLine, bool lastLine, bool isLogicallyLastRunWrapped, RenderObject* logicallyLastRunRenderer)
-{
-    ASSERT(firstRun);
+static bool reachedEndOfTextRenderer(const BidiRunList<BidiRun>& bidiRuns)
+{
+    BidiRun* run = bidiRuns.logicallyLastRun();
+    if (!run)
+        return true;
+    unsigned int pos = run->stop();
+    RenderObject* r = run->m_object;
+    if (!r->isText() || r->isBR())
+        return false;
+    RenderText* renderText = toRenderText(r);
+    if (pos >= renderText->textLength())
+        return true;
+
+    while (isASCIISpace(renderText->characters()[pos])) {
+        pos++;
+        if (pos >= renderText->textLength())
+            return true;
+    }
+    return false;
+}
+
+RootInlineBox* RenderBlock::constructLine(BidiRunList<BidiRun>& bidiRuns, bool firstLine, bool lastLine)
+{
+    ASSERT(bidiRuns.firstRun());
 
     bool rootHasSelectedChildren = false;
     InlineFlowBox* parentBox = 0;
-    for (BidiRun* r = firstRun; r; r = r->next()) {
+    for (BidiRun* r = bidiRuns.firstRun(); r; r = r->next()) {
         // Create a box for our object.
-        bool isOnlyRun = (runCount == 1);
-        if (runCount == 2 && !r->m_object->isListMarker())
-            isOnlyRun = (!style()->isLeftToRightDirection() ? lastRun : firstRun)->m_object->isListMarker();
+        bool isOnlyRun = (bidiRuns.runCount() == 1);
+        if (bidiRuns.runCount() == 2 && !r->m_object->isListMarker())
+            isOnlyRun = (!style()->isLeftToRightDirection() ? bidiRuns.lastRun() : bidiRuns.firstRun())->m_object->isListMarker();
 
         InlineBox* box = createInlineBoxForRenderer(r->m_object, false, isOnlyRun);
@@ -326 +347 @@
     // we determine the horizontal positions and widths of all the inline boxes on
     // the line.
-    lastLineBox()->determineSpacingForFlowBoxes(lastLine, isLogicallyLastRunWrapped, logicallyLastRunRenderer);
+    bool isLogicallyLastRunWrapped = bidiRuns.logicallyLastRun()->m_object && bidiRuns.logicallyLastRun()->m_object->isText() ? !reachedEndOfTextRenderer(bidiRuns) : true;
+    lastLineBox()->determineSpacingForFlowBoxes(lastLine, isLogicallyLastRunWrapped, bidiRuns.logicallyLastRun()->m_object);
 
     // Now mark the line boxes as being constructed.
@@ -640 +662 @@
 }
 
-static bool reachedEndOfTextRenderer(const BidiRunList<BidiRun>& bidiRuns)
-{
-    BidiRun* run = bidiRuns.logicallyLastRun();
-    if (!run)
-        return true;
-    unsigned int pos = run->stop();
-    RenderObject* r = run->m_object;
-    if (!r->isText() || r->isBR())
-        return false;
-    RenderText* renderText = toRenderText(r);
-    if (pos >= renderText->textLength())
-        return true;
-
-    while (isASCIISpace(renderText->characters()[pos])) {
-        pos++;
-        if (pos >= renderText->textLength())
-            return true;
-    }
-    return false;
-}
-    
 inline BidiRun* RenderBlock::handleTrailingSpaces(BidiRunList<BidiRun>& bidiRuns, BidiContext* currentContext)
 {
@@ -903 +904 @@
                     if (hyphenated)
                         bidiRuns.logicallyLastRun()->m_hasHyphen = true;
-                    bool isLogicallyLastRunWrapped = bidiRuns.logicallyLastRun()->m_object && bidiRuns.logicallyLastRun()->m_object->isText() ? !reachedEndOfTextRenderer(bidiRuns) : true;
-                    // FIXME: Clearly constructLine should just take a bidiRuns object.
-                    lineBox = constructLine(bidiRuns.runCount(), bidiRuns.firstRun(), bidiRuns.lastRun(), firstLine, !end.m_obj, isLogicallyLastRunWrapped, bidiRuns.logicallyLastRun()->m_object);
+                    lineBox = constructLine(bidiRuns, firstLine, !end.m_obj);
                     if (lineBox) {
                         lineBox->setEndsWithBreak(previousLineBrokeCleanly);