Changeset 86093 in webkit

Timestamp:

May 9, 2011 3:27:27 PM (13 years ago)

Author:

eric@webkit.org

Message:

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

Reviewed by Ryosuke Niwa.

Abstract line deletion code into a function
​https://bugs.webkit.org/show_bug.cgi?id=60501

No change in behavior, thus no testing.

• rendering/RenderBlockLineLayout.cpp: (WebCore::deleteLineRange): (WebCore::RenderBlock::layoutRunsAndFloats): (WebCore::RenderBlock::determineStartPosition): (WebCore::RenderBlock::matchedEndLine):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-09  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Ryosuke Niwa.
+
+        Abstract line deletion code into a function
+        https://bugs.webkit.org/show_bug.cgi?id=60501
+
+        No change in behavior, thus no testing.
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::deleteLineRange):
+        (WebCore::RenderBlock::layoutRunsAndFloats):
+        (WebCore::RenderBlock::determineStartPosition):
+        (WebCore::RenderBlock::matchedEndLine):
+
 2011-05-09  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -817 +817 @@
 }
 
+static void deleteLineRange(RenderArena* arena, RootInlineBox* startLine, int& repaintLogicalTop, int& repaintLogicalBottom, RootInlineBox* stopLine = 0)
+{
+    RootInlineBox* boxToDelete = startLine;
+    while (boxToDelete && boxToDelete != stopLine) {
+        repaintLogicalTop = min(repaintLogicalTop, boxToDelete->logicalTopVisualOverflow());
+        repaintLogicalBottom = max(repaintLogicalBottom, boxToDelete->logicalBottomVisualOverflow());
+        RootInlineBox* next = boxToDelete->nextRootBox();
+        boxToDelete->deleteLine(arena);
+        boxToDelete = next;
+    }
+}
+
 void RenderBlock::layoutRunsAndFloats(bool fullLayout, bool hasInlineChild, Vector<FloatWithRect>& floats, int& repaintLogicalTop, int& repaintLogicalBottom)
 {
@@ -862 +874 @@
             repaintLogicalBottom = logicalHeight();
         }
-        RenderArena* arena = renderArena();
-        RootInlineBox* box = startLine;
-        while (box) {
-            repaintLogicalTop = min(repaintLogicalTop, box->logicalTopVisualOverflow());
-            repaintLogicalBottom = max(repaintLogicalBottom, box->logicalBottomVisualOverflow());
-            RootInlineBox* next = box->nextRootBox();
-            box->deleteLine(arena);
-            box = next;
-        }
+        deleteLineRange(renderArena(), startLine, repaintLogicalTop, repaintLogicalBottom);
     }
 
@@ -1043 +1047 @@
         } else {
             // Delete all the remaining lines.
-            RootInlineBox* line = endLine;
-            RenderArena* arena = renderArena();
-            while (line) {
-                repaintLogicalTop = min(repaintLogicalTop, line->logicalTopVisualOverflow());
-                repaintLogicalBottom = max(repaintLogicalBottom, line->logicalBottomVisualOverflow());
-                RootInlineBox* next = line->nextRootBox();
-                line->deleteLine(arena);
-                line = next;
-            }
+            deleteLineRange(renderArena(), endLine, repaintLogicalTop, repaintLogicalBottom);
         }
     }
@@ -1431 +1427 @@
 
             // Now delete the lines that we failed to sync.
-            RootInlineBox* boxToDelete = endLine;
-            RenderArena* arena = renderArena();
-            while (boxToDelete && boxToDelete != result) {
-                repaintLogicalTop = min(repaintLogicalTop, boxToDelete->logicalTopVisualOverflow());
-                repaintLogicalBottom = max(repaintLogicalBottom, boxToDelete->logicalBottomVisualOverflow());
-                RootInlineBox* next = boxToDelete->nextRootBox();
-                boxToDelete->deleteLine(arena);
-                boxToDelete = next;
-            }
-
+            deleteLineRange(renderArena(), endLine, repaintLogicalTop, repaintLogicalBottom, result);
             endLine = result;
             return result;