Title: [97671] trunk/Source/WebCore
- Revision
- 97671
- Author
- [email protected]
- Date
- 2011-10-17 16:41:20 -0700 (Mon, 17 Oct 2011)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (97670 => 97671)
--- trunk/Source/WebCore/ChangeLog 2011-10-17 23:40:17 UTC (rev 97670)
+++ trunk/Source/WebCore/ChangeLog 2011-10-17 23:41:20 UTC (rev 97671)
@@ -1,3 +1,17 @@
+2011-10-17 Dan Bernstein <[email protected]>
+
+ 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 <[email protected]>
Protect against incorrect Element::fast*Attribute() usage.
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (97670 => 97671)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-10-17 23:40:17 UTC (rev 97670)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-10-17 23:41:20 UTC (rev 97671)
@@ -2395,12 +2395,9 @@
LayoutUnit ruleLogicalLeft = style()->isLeftToRightDirection() ? 0 : contentLogicalWidth();
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()) {
ruleLogicalLeft += inlineDirectionSize + colGap / 2;
@@ -4202,9 +4199,8 @@
LayoutUnit currLogicalTopOffset = 0;
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;
else
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
