Changeset 97671 in webkit

Timestamp:

Oct 17, 2011, 4:41:20 PM (14 years ago)

Author:

mitz@apple.com

Message:

Remove unnecessary calls to columnRectAt()
​https://bugs.webkit.org/show_bug.cgi?id=70283

Reviewed by Darin Adler.

These call sites only needed one of the column dimensions, which are independent of the column
index, and can be retrieved directly from the ColumnInfo.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::paintColumnRules):
(WebCore::RenderBlock::hitTestColumns):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-17  Dan Bernstein  <mitz@apple.com>
+
+        Remove unnecessary calls to columnRectAt()
+        https://bugs.webkit.org/show_bug.cgi?id=70283
+
+        Reviewed by Darin Adler.
+
+        These call sites only needed one of the column dimensions, which are independent of the column
+        index, and can be retrieved directly from the ColumnInfo.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintColumnRules):
+        (WebCore::RenderBlock::hitTestColumns):
+
 2011-10-17  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2396 +2396 @@
 
     bool antialias = shouldAntialiasLines(paintInfo.context);
+    LayoutUnit inlineDirectionSize = colInfo->desiredColumnWidth();
 
     for (unsigned i = 0; i < colCount; i++) {
-        LayoutRect colRect = columnRectAt(colInfo, i);
-
-        LayoutUnit inlineDirectionSize = isHorizontalWritingMode() ? colRect.width() : colRect.height();
-        
         // Move to the next position.
         if (style()->isLeftToRightDirection()) {
@@ -4203 +4200 @@
     int i;
     bool isHorizontal = isHorizontalWritingMode();
+    LayoutUnit blockDelta =  colInfo->columnHeight();
     for (i = 0; i < colCount; i++) {
-        LayoutRect colRect = columnRectAt(colInfo, i);
-        LayoutUnit blockDelta =  (isHorizontal ? colRect.height() : colRect.width());
         if (style()->isFlippedBlocksWritingMode())
             currLogicalTopOffset += blockDelta;