Diff
Modified: trunk/LayoutTests/ChangeLog (171606 => 171607)
--- trunk/LayoutTests/ChangeLog 2014-07-25 19:04:50 UTC (rev 171606)
+++ trunk/LayoutTests/ChangeLog 2014-07-25 19:07:35 UTC (rev 171607)
@@ -1,5 +1,20 @@
2014-07-25 Commit Queue <[email protected]>
+ Unreviewed, rolling out r171480.
+ https://bugs.webkit.org/show_bug.cgi?id=135300
+
+ it broke replaced elements in pagination (Requested by dhyatt_
+ on #webkit).
+
+ Reverted changeset:
+
+ "Ensure we compute the min and max height of replaced elements
+ to 'none' or 0 when appropriate."
+ https://bugs.webkit.org/show_bug.cgi?id=135181
+ http://trac.webkit.org/changeset/171480
+
+2014-07-25 Commit Queue <[email protected]>
+
Unreviewed, rolling out r171587.
https://bugs.webkit.org/show_bug.cgi?id=135294
Deleted: trunk/LayoutTests/css2.1/20110323/max-height-percentage-003-expected.html (171606 => 171607)
--- trunk/LayoutTests/css2.1/20110323/max-height-percentage-003-expected.html 2014-07-25 19:04:50 UTC (rev 171606)
+++ trunk/LayoutTests/css2.1/20110323/max-height-percentage-003-expected.html 2014-07-25 19:07:35 UTC (rev 171607)
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
- <p>Test passes if there is a filled black square.</p>
-
- <div id="parent">
- <img src="" alt="Image download support must be enabled">
- </div>
Deleted: trunk/LayoutTests/css2.1/20110323/max-height-percentage-003.html (171606 => 171607)
--- trunk/LayoutTests/css2.1/20110323/max-height-percentage-003.html 2014-07-25 19:04:50 UTC (rev 171606)
+++ trunk/LayoutTests/css2.1/20110323/max-height-percentage-003.html 2014-07-25 19:07:35 UTC (rev 171607)
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-
- <head>
-
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
- <title>CSS Test: max-height percentage - inline replaced element inside an auto-height container</title>
-
- <link rel="author" title="Gérard Talbot" href=""
-
- <!--
- Original post:
- Image % sizing interoperability
- from Bogdan Brinza who deserves credit for reporting this
- http://lists.w3.org/Archives/Public/www-style/2014Jun/0079.html
- -->
-
- <link rel="help" href="" title="10.7 Minimum and maximum heights: 'min-height' and 'max-height'">
- <link rel="bookmark" href="" title="Image % sizing interoperability">
- <link rel="match" href=""
-
- <meta content="image" name="flags">
- <meta content="This test checks that a max-height percentage is calculated with respect to the height of the generated box's containing block only if and only when such containing block's height is specified explicitly (i.e., it depends on content height; its specified height is not 'auto'). In this test, the div#child has an 'auto' height; therefore the max-height percentage is treated as 'none' and so the image should be rendered (entirely visible) inside that div#child. Note that div#parent's initial overflow value is 'visible'." name="assert">
-
- <style type="text/css">
- div#parent {height: 0px;}
-
- img {max-height: 100%;}
- </style>
-
- </head>
-
- <body>
-
- <p>Test passes if there is a filled black square.</p>
-
- <div id="parent">
- <div id="child"><img src="" alt="Image download support must be enabled"></div>
- </div>
-
- </body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/fast/replaced/max-height-percentage-quirks-expected.html (171606 => 171607)
--- trunk/LayoutTests/fast/replaced/max-height-percentage-quirks-expected.html 2014-07-25 19:04:50 UTC (rev 171606)
+++ trunk/LayoutTests/fast/replaced/max-height-percentage-quirks-expected.html 2014-07-25 19:07:35 UTC (rev 171607)
@@ -1,4 +0,0 @@
-<p>Test passes if there is a filled blue square.</p>
-<div id="parent">
- <div id="child"><img src=""
-</div>
Deleted: trunk/LayoutTests/fast/replaced/max-height-percentage-quirks.html (171606 => 171607)
--- trunk/LayoutTests/fast/replaced/max-height-percentage-quirks.html 2014-07-25 19:04:50 UTC (rev 171606)
+++ trunk/LayoutTests/fast/replaced/max-height-percentage-quirks.html 2014-07-25 19:07:35 UTC (rev 171607)
@@ -1,8 +0,0 @@
-<style>
- div#parent {height: 0px;}
- img {max-height: 100%;}
-</style>
-<p>Test passes if there is a filled blue square.</p>
-<div id="parent">
- <div id="child"><img src=""
-</div>
Deleted: trunk/LayoutTests/fast/replaced/min-height-percentage-expected.html (171606 => 171607)
--- trunk/LayoutTests/fast/replaced/min-height-percentage-expected.html 2014-07-25 19:04:50 UTC (rev 171606)
+++ trunk/LayoutTests/fast/replaced/min-height-percentage-expected.html 2014-07-25 19:07:35 UTC (rev 171607)
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
- <style>
- img { height: 50px;}
- </style>
- <p> The blue square should be 50px by 50px. This is because http://www.w3.org/TR/CSS21/visudet.html#min-max-heights says: "If the height of the containing block is not specified explicitly
- (i.e., it depends on content height), and this element is not absolutely positioned, the percentage value is treated as '0' (for 'min-height')." </p>
- <div>
- <img id="image" src=""
- </div>
Deleted: trunk/LayoutTests/fast/replaced/min-height-percentage-quirks-expected.html (171606 => 171607)
--- trunk/LayoutTests/fast/replaced/min-height-percentage-quirks-expected.html 2014-07-25 19:04:50 UTC (rev 171606)
+++ trunk/LayoutTests/fast/replaced/min-height-percentage-quirks-expected.html 2014-07-25 19:07:35 UTC (rev 171607)
@@ -1,8 +0,0 @@
-<style>
- img {height: 50px;}
-</style>
-<p> The blue square should be 50px by 50px. This is because http://www.w3.org/TR/CSS21/visudet.html#min-max-heights says: "If the height of the containing block is not specified explicitly
-(i.e., it depends on content height), and this element is not absolutely positioned, the percentage value is treated as '0' (for 'min-height')." </p>
-<div>
- <div id="child"><img id="image" src=""
-</div>
Deleted: trunk/LayoutTests/fast/replaced/min-height-percentage-quirks.html (171606 => 171607)
--- trunk/LayoutTests/fast/replaced/min-height-percentage-quirks.html 2014-07-25 19:04:50 UTC (rev 171606)
+++ trunk/LayoutTests/fast/replaced/min-height-percentage-quirks.html 2014-07-25 19:07:35 UTC (rev 171607)
@@ -1,8 +0,0 @@
-<style>
- img {min-height: 100%; max-height: 50px;}
-</style>
-<p> The blue square should be 50px by 50px. This is because http://www.w3.org/TR/CSS21/visudet.html#min-max-heights says: "If the height of the containing block is not specified explicitly
-(i.e., it depends on content height), and this element is not absolutely positioned, the percentage value is treated as '0' (for 'min-height')." </p>
-<div>
- <div id="child"><img id="image" src=""
-</div>
Deleted: trunk/LayoutTests/fast/replaced/min-height-percentage.html (171606 => 171607)
--- trunk/LayoutTests/fast/replaced/min-height-percentage.html 2014-07-25 19:04:50 UTC (rev 171606)
+++ trunk/LayoutTests/fast/replaced/min-height-percentage.html 2014-07-25 19:07:35 UTC (rev 171607)
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
- <style>
- img {min-height: 100%; max-height: 50px;}
- </style>
- <p> The blue square should be 50px by 50px. This is because http://www.w3.org/TR/CSS21/visudet.html#min-max-heights says: "If the height of the containing block is not specified explicitly
- (i.e., it depends on content height), and this element is not absolutely positioned, the percentage value is treated as '0' (for 'min-height')." </p>
- <div>
- <div id="child"><img id="image" src=""
- </div>
Modified: trunk/Source/WebCore/ChangeLog (171606 => 171607)
--- trunk/Source/WebCore/ChangeLog 2014-07-25 19:04:50 UTC (rev 171606)
+++ trunk/Source/WebCore/ChangeLog 2014-07-25 19:07:35 UTC (rev 171607)
@@ -1,5 +1,20 @@
2014-07-25 Commit Queue <[email protected]>
+ Unreviewed, rolling out r171480.
+ https://bugs.webkit.org/show_bug.cgi?id=135300
+
+ it broke replaced elements in pagination (Requested by dhyatt_
+ on #webkit).
+
+ Reverted changeset:
+
+ "Ensure we compute the min and max height of replaced elements
+ to 'none' or 0 when appropriate."
+ https://bugs.webkit.org/show_bug.cgi?id=135181
+ http://trac.webkit.org/changeset/171480
+
+2014-07-25 Commit Queue <[email protected]>
+
Unreviewed, rolling out r171587.
https://bugs.webkit.org/show_bug.cgi?id=135294
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (171606 => 171607)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-07-25 19:04:50 UTC (rev 171606)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-07-25 19:07:35 UTC (rev 171607)
@@ -2929,37 +2929,10 @@
return computeReplacedLogicalHeightRespectingMinMaxHeight(computeReplacedLogicalHeightUsing(style().logicalHeight()));
}
-bool RenderBox::logicalHeightComputesAsNone(SizeType sizeType) const
-{
- ASSERT(sizeType == MinSize || sizeType == MaxSize);
- Length logicalHeight = sizeType == MinSize ? style().logicalMinHeight() : style().logicalMaxHeight();
- Length initialLogicalHeight = sizeType == MinSize ? RenderStyle::initialMinSize() : RenderStyle::initialMaxSize();
-
- if (logicalHeight == initialLogicalHeight)
- return true;
-
- if (!logicalHeight.isPercent() || isOutOfFlowPositioned())
- return false;
-
- // Anonymous block boxes are ignored when resolving percentage values that would refer to it:
- // the closest non-anonymous ancestor box is used instead.
- RenderBlock* containingBlock = this->containingBlock();
- while (containingBlock->isAnonymous())
- containingBlock = containingBlock->containingBlock();
-
- return containingBlock->hasAutoHeightOrContainingBlockWithAutoHeight();
-}
-
LayoutUnit RenderBox::computeReplacedLogicalHeightRespectingMinMaxHeight(LayoutUnit logicalHeight) const
{
- // If the height of the containing block is not specified explicitly (i.e., it depends on content height), and this element is not absolutely positioned,
- // the percentage value is treated as '0' (for 'min-height') or 'none' (for 'max-height').
- LayoutUnit minLogicalHeight;
- if (!logicalHeightComputesAsNone(MinSize))
- minLogicalHeight = computeReplacedLogicalHeightUsing(style().logicalMinHeight());
- LayoutUnit maxLogicalHeight = logicalHeight;
- if (!logicalHeightComputesAsNone(MaxSize))
- maxLogicalHeight = computeReplacedLogicalHeightUsing(style().logicalMaxHeight());
+ LayoutUnit minLogicalHeight = computeReplacedLogicalHeightUsing(style().logicalMinHeight());
+ LayoutUnit maxLogicalHeight = style().logicalMaxHeight().isUndefined() ? logicalHeight : computeReplacedLogicalHeightUsing(style().logicalMaxHeight());
return std::max(minLogicalHeight, std::min(logicalHeight, maxLogicalHeight));
}
Modified: trunk/Source/WebCore/rendering/RenderBox.h (171606 => 171607)
--- trunk/Source/WebCore/rendering/RenderBox.h 2014-07-25 19:04:50 UTC (rev 171606)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2014-07-25 19:07:35 UTC (rev 171607)
@@ -702,8 +702,6 @@
virtual LayoutRect frameRectForStickyPositioning() const override final { return frameRect(); }
- bool logicalHeightComputesAsNone(SizeType) const;
-
private:
// The width/height of the contents + borders + padding. The x/y location is relative to our container (which is not always our parent).
LayoutRect m_frameRect;
