Title: [116153] branches/chromium/1084/Source/WebCore/rendering/RenderBox.cpp
- Revision
- 116153
- Author
- [email protected]
- Date
- 2012-05-04 13:07:34 -0700 (Fri, 04 May 2012)
Log Message
Merge 115668 - Source/WebCore: Remove positioned float code.
BUG=124919
Review URL: https://chromiumcodereview.appspot.com/10368021
Modified Paths
Diff
Modified: branches/chromium/1084/Source/WebCore/rendering/RenderBox.cpp (116152 => 116153)
--- branches/chromium/1084/Source/WebCore/rendering/RenderBox.cpp 2012-05-04 20:06:14 UTC (rev 116152)
+++ branches/chromium/1084/Source/WebCore/rendering/RenderBox.cpp 2012-05-04 20:07:34 UTC (rev 116153)
@@ -419,7 +419,7 @@
setHasBoxDecorations(true);
setPositioned(styleToUse->isPositioned());
- setFloating(styleToUse->isFloating() && (!isPositioned() || styleToUse->floating() == PositionedFloat));
+ setFloating(!isPositioned() && styleToUse->isFloating());
// We also handle <body> and <html>, whose overflow applies to the viewport.
if (styleToUse->overflowX() != OVISIBLE && !isRootObject && (isRenderBlock() || isTableRow() || isTableSection())) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
