Title: [114394] branches/subpixellayout/Source/WebCore/rendering/RenderTable.cpp
- Revision
- 114394
- Author
- le...@chromium.org
- Date
- 2012-04-17 10:41:41 -0700 (Tue, 17 Apr 2012)
Log Message
Correct where we do our flooring for tables to be in setting the logical width, instead of at paint time. This avoids a bug where a 1 pixel gap would exist following a table that nothing could be placed in.
Modified Paths
Diff
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderTable.cpp (114393 => 114394)
--- branches/subpixellayout/Source/WebCore/rendering/RenderTable.cpp 2012-04-17 17:24:58 UTC (rev 114393)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderTable.cpp 2012-04-17 17:41:41 UTC (rev 114394)
@@ -240,16 +240,16 @@
}
// Ensure we aren't bigger than our available width.
- setLogicalWidth(min(availableContentLogicalWidth, maxPreferredLogicalWidth()));
+ setLogicalWidth(min<int>(availableContentLogicalWidth, maxPreferredLogicalWidth()));
}
// Ensure we aren't smaller than our min preferred width.
- setLogicalWidth(max(logicalWidth(), minPreferredLogicalWidth()));
+ setLogicalWidth(max<int>(logicalWidth(), minPreferredLogicalWidth()));
// Ensure we aren't smaller than our min-width style.
Length styleMinLogicalWidth = style()->logicalMinWidth();
if (styleMinLogicalWidth.isSpecified() && styleMinLogicalWidth.isPositive())
- setLogicalWidth(max(logicalWidth(), convertStyleLogicalWidthToComputedWidth(styleMinLogicalWidth, availableLogicalWidth)));
+ setLogicalWidth(max<int>(logicalWidth(), convertStyleLogicalWidthToComputedWidth(styleMinLogicalWidth, availableLogicalWidth)));
// Finally, with our true width determined, compute our margins for real.
setMarginStart(0);
@@ -631,7 +631,7 @@
if (!paintInfo.shouldPaintWithinRoot(this))
return;
- LayoutRect rect(paintOffset, flooredIntSize(size()));
+ LayoutRect rect(paintOffset, size());
subtractCaptionRect(rect);
if (!boxShadowShouldBeAppliedToBackground(determineBackgroundBleedAvoidance(paintInfo.context)))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
