Changeset 31127 in webkit

Timestamp:

Mar 18, 2008, 9:13:31 AM (17 years ago)

Author:

mitz@apple.com

Message:

2008-03-18 Dan Bernstein <​mitz@apple.com>

Reviewed by Darin Adler.

• eliminate RenderFlow::m_clear

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::layoutBlock): Removed code to set m_clear. (WebCore::RenderBlock::newLine): Added a 'clear' parameter.
• rendering/RenderBlock.h:
• rendering/RenderFlow.h: (WebCore::RenderFlow::RenderFlow): Removed initialization of m_clear.
• rendering/bidi.cpp: (WebCore::RenderBlock::layoutInlineChildren): Added a local 'clear' variable, passing a pointer to it to findNextLineBreak() and its value to newLine(). (WebCore::RenderBlock::findNextLineBreak): Added a 'clear' parameter, which this method adjusts when it encounters a <br>.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (3 diffs)
• rendering/RenderBlock.h (modified) (2 diffs)
• rendering/RenderFlow.h (modified) (2 diffs)
• rendering/bidi.cpp (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-18  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - eliminate RenderFlow::m_clear
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::layoutBlock): Removed code to set m_clear.
+        (WebCore::RenderBlock::newLine): Added a 'clear' parameter.
+        * rendering/RenderBlock.h:
+        * rendering/RenderFlow.h:
+        (WebCore::RenderFlow::RenderFlow): Removed initialization of m_clear.
+        * rendering/bidi.cpp:
+        (WebCore::RenderBlock::layoutInlineChildren): Added a local 'clear'
+        variable, passing a pointer to it to findNextLineBreak() and its value
+        to newLine(). 
+        (WebCore::RenderBlock::findNextLineBreak): Added a 'clear' parameter,
+        which this method adjusts when it encounters a <br>.
+
 2008-03-18  Simon Hausmann  <hausmann@webkit.org>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -542 +542 @@
     m_height = 0;
     m_overflowHeight = 0;
-    m_clearStatus = CNONE;
 
     // We use four values, maxTopPos, maxPosNeg, maxBottomPos, and maxBottomNeg, to track
@@ -2249 +2248 @@
 }
 
-void RenderBlock::newLine()
+void RenderBlock::newLine(EClear clear)
 {
     positionNewFloats();
     // set y position
     int newY = 0;
-    switch(m_clearStatus)
+    switch(clear)
     {
         case CLEFT:
@@ -2269 +2268 @@
     if (m_height < newY)
         m_height = newY;
-    m_clearStatus = CNONE;
 }
 

trunk/WebCore/rendering/RenderBlock.h

@@ -149 +149 @@
     int skipWhitespace(BidiState&);
     void fitBelowFloats(int widthToFit, int& availableWidth);
-    BidiIterator findNextLineBreak(BidiState&);
+    BidiIterator findNextLineBreak(BidiState&, EClear* clear = 0);
     RootInlineBox* constructLine(unsigned runCount, BidiRun* firstRun, BidiRun* lastRun, bool lastLine, RenderObject* endObject);
     InlineFlowBox* createLineBoxes(RenderObject*);
@@ -311 +311 @@
 
 protected:
-    void newLine();
+    void newLine(EClear);
     virtual bool hasLineIfEmpty() const;
     bool layoutOnlyPositionedObjects();

trunk/WebCore/rendering/RenderFlow.h

@@ -47 +47 @@
         , m_childrenInline(true)
         , m_firstLine(false)
-        , m_clearStatus(CNONE)
         , m_topMarginQuirk(false) 
         , m_bottomMarginQuirk(false)
@@ -127 +126 @@
     bool m_childrenInline : 1;
     bool m_firstLine : 1;
-    unsigned m_clearStatus  : 2; // EClear
     bool m_topMarginQuirk : 1;
     bool m_bottomMarginQuirk : 1;

trunk/WebCore/rendering/bidi.cpp

@@ -867 +867 @@
         BidiIterator end = start.position();
 
-        if (!fullLayout && end.atEnd() && lastRootBox() && lastRootBox()->firstChild()->object()->isBR() && lastRootBox()->object()->firstChild()->style()->clear() != CNONE) {
-            m_clearStatus = lastRootBox()->object()->firstChild()->style()->clear();
-            newLine();
-        }
+        if (!fullLayout && end.atEnd() && lastRootBox() && lastRootBox()->firstChild()->object()->isBR() && lastRootBox()->object()->firstChild()->style()->clear() != CNONE)
+            newLine(lastRootBox()->object()->firstChild()->style()->clear());
 
         bool endLineMatched = false;
@@ -885 +883 @@
                 start.setPosition(BidiIterator(this, firstChild()->nextSibling(), 0));
             }
-            end = findNextLineBreak(start);
+            EClear clear = CNONE;
+            end = findNextLineBreak(start, &clear);
             if (start.position().atEnd()) {
                 start.deleteRuns();
@@ -935 +934 @@
 
                 m_firstLine = false;
-                newLine();
+                newLine(clear);
             }
 
@@ -1450 +1449 @@
 }
 
-BidiIterator RenderBlock::findNextLineBreak(BidiState& start)
+BidiIterator RenderBlock::findNextLineBreak(BidiState& start, EClear* clear)
 {
     ASSERT(start.position().block == this);
@@ -1527 +1526 @@
                 previousLineBrokeCleanly = true;
 
-                if (!isLineEmpty) {
-                    // only check the clear status for non-empty lines.
-                    EClear clear = o->style()->clear();
-                    if (clear != CNONE)
-                        m_clearStatus = (EClear) (m_clearStatus | clear);
-                }
+                if (!isLineEmpty && clear)
+                    *clear = o->style()->clear();
             }
             goto end;