[webkit-changes] [119565] trunk
Title: [119565] trunk Revision 119565 Author commit-qu...@webkit.org Date 2012-06-05 23:53:11 -0700 (Tue, 05 Jun 2012) Log Message ASSERTION FAILED: ASSERT(!isPercentageIntrinsicSize) in RenderReplaced::computeIntrinsicRatioInformationForRenderBox https://bugs.webkit.org/show_bug.cgi?id=88197 Patch by Joe Thomas on 2012-06-05 Reviewed by Daniel Bates. RenderSVGRoot extends RenderReplaced and it overrides the computeIntrinsicRatioInformation() method of RenderReplaced. RenderSVGRoot::computeIntrinsicRatioInformation sets isPercentageIntrinsicSize to true while it handles width and height of percentage types. So this assertion should be fired only if intrinsicRatio is non-zero. Source/WebCore: Test: svg/in-html/svg-assert-failure-percentage.html * rendering/RenderReplaced.cpp: (WebCore::RenderReplaced::computeIntrinsicRatioInformationForRenderBox): LayoutTests: * svg/in-html/svg-assert-failure-percentage-expected.txt: Added. * svg/in-html/svg-assert-failure-percentage.html: Added. Modified Paths trunk/LayoutTests/ChangeLog trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/rendering/RenderReplaced.cpp Added Paths trunk/LayoutTests/svg/in-html/svg-assert-failure-percentage-expected.txt trunk/LayoutTests/svg/in-html/svg-assert-failure-percentage.html Diff Modified: trunk/LayoutTests/ChangeLog (119564 => 119565) --- trunk/LayoutTests/ChangeLog 2012-06-06 06:45:22 UTC (rev 119564) +++ trunk/LayoutTests/ChangeLog 2012-06-06 06:53:11 UTC (rev 119565) @@ -1,3 +1,18 @@ +2012-06-05 Joe Thomas + +ASSERTION FAILED: ASSERT(!isPercentageIntrinsicSize) in RenderReplaced::computeIntrinsicRatioInformationForRenderBox +https://bugs.webkit.org/show_bug.cgi?id=88197 + +Reviewed by Daniel Bates. + +RenderSVGRoot extends RenderReplaced and it overrides the computeIntrinsicRatioInformation() +method of RenderReplaced. RenderSVGRoot::computeIntrinsicRatioInformation +sets isPercentageIntrinsicSize to true while it handles width and height of percentage types. +So this assertion should be fired only if intrinsicRatio is non-zero. + +* svg/in-html/svg-assert-failure-percentage-expected.txt: Added. +* svg/in-html/svg-assert-failure-percentage.html: Added. + 2012-06-05 Tony Chang Changing flexbox justify/alignment doesn't update their positioning Added: trunk/LayoutTests/svg/in-html/svg-assert-failure-percentage-expected.txt (0 => 119565) --- trunk/LayoutTests/svg/in-html/svg-assert-failure-percentage-expected.txt (rev 0) +++ trunk/LayoutTests/svg/in-html/svg-assert-failure-percentage-expected.txt 2012-06-06 06:53:11 UTC (rev 119565) @@ -0,0 +1 @@ +This test PASSED if it doesn't cause an assertion failure. Added: trunk/LayoutTests/svg/in-html/svg-assert-failure-percentage.html (0 => 119565) --- trunk/LayoutTests/svg/in-html/svg-assert-failure-percentage.html (rev 0) +++ trunk/LayoutTests/svg/in-html/svg-assert-failure-percentage.html 2012-06-06 06:53:11 UTC (rev 119565) @@ -0,0 +1,9 @@ + + + +if (window.layoutTestController) +layoutTestController.dumpAsText(); + + +This test PASSED if it doesn't cause an assertion failure. + Modified: trunk/Source/WebCore/ChangeLog (119564 => 119565) --- trunk/Source/WebCore/ChangeLog 2012-06-06 06:45:22 UTC (rev 119564) +++ trunk/Source/WebCore/ChangeLog 2012-06-06 06:53:11 UTC (rev 119565) @@ -1,3 +1,20 @@ +2012-06-05 Joe Thomas + +ASSERTION FAILED: ASSERT(!isPercentageIntrinsicSize) in RenderReplaced::computeIntrinsicRatioInformationForRenderBox +https://bugs.webkit.org/show_bug.cgi?id=88197 + +Reviewed by Daniel Bates. + +RenderSVGRoot extends RenderReplaced and it overrides the computeIntrinsicRatioInformation() +method of RenderReplaced. RenderSVGRoot::computeIntrinsicRatioInformation +sets isPercentageIntrinsicSize to true while it handles width and height of percentage types. +So this assertion should be fired only if intrinsicRatio is non-zero. + +Test: svg/in-html/svg-assert-failure-percentage.html + +* rendering/RenderReplaced.cpp: +(WebCore::RenderReplaced::computeIntrinsicRatioInformationForRenderBox): + 2012-06-05 Tony Chang Changing flexbox justify/alignment doesn't update their positioning Modified: trunk/Source/WebCore/rendering/RenderReplaced.cpp (119564 => 119565) --- trunk/Source/WebCore/rendering/RenderReplaced.cpp 2012-06-06 06:45:22 UTC (rev 119564) +++ trunk/Source/WebCore/rendering/RenderReplaced.cpp 2012-06-06 06:53:11 UTC (rev 119565) @@ -287,10 +287,9 @@ intrinsicRatio = 1; return; } - -// This code path can't yield percentage intrinsic sizes, assert that. computeIntrinsicRatioInformation(intrinsicSize, intrinsicRatio, isPercentageIntrinsicSize); -ASSERT(!isPercentageIntrinsicSize); +if (intrinsicRatio) +ASSERT(!isPercentageIntrinsicSize); }
[webkit-changes] [119564] trunk
Title: [119564] trunk
Revision 119564
Author t...@chromium.org
Date 2012-06-05 23:45:22 -0700 (Tue, 05 Jun 2012)
Log Message
Changing flexbox justify/alignment doesn't update their positioning
https://bugs.webkit.org/show_bug.cgi?id=88366
Reviewed by Ojan Vafai.
Source/WebCore:
Test: css3/flexbox/style-change.html
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::diff): Since these member variables were moved
out of StyleFlexibleBoxData, we have to compare them in RenderStyle::diff.
LayoutTests:
* css3/flexbox/style-change-expected.txt: Added.
* css3/flexbox/style-change.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/style/RenderStyle.cpp
Added Paths
trunk/LayoutTests/css3/flexbox/style-change-expected.txt
trunk/LayoutTests/css3/flexbox/style-change.html
Diff
Modified: trunk/LayoutTests/ChangeLog (119563 => 119564)
--- trunk/LayoutTests/ChangeLog 2012-06-06 05:51:34 UTC (rev 119563)
+++ trunk/LayoutTests/ChangeLog 2012-06-06 06:45:22 UTC (rev 119564)
@@ -1,3 +1,13 @@
+2012-06-05 Tony Chang
+
+Changing flexbox justify/alignment doesn't update their positioning
+https://bugs.webkit.org/show_bug.cgi?id=88366
+
+Reviewed by Ojan Vafai.
+
+* css3/flexbox/style-change-expected.txt: Added.
+* css3/flexbox/style-change.html: Added.
+
2012-06-05 Ojan Vafai
Nested CSS flexbox renders incorrectly
Added: trunk/LayoutTests/css3/flexbox/style-change-expected.txt (0 => 119564)
--- trunk/LayoutTests/css3/flexbox/style-change-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/flexbox/style-change-expected.txt 2012-06-06 06:45:22 UTC (rev 119564)
@@ -0,0 +1,8 @@
+This test verifies that changing order, align-content, align-items, align-self, or justify-content will relayout.
+
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
Added: trunk/LayoutTests/css3/flexbox/style-change.html (0 => 119564)
--- trunk/LayoutTests/css3/flexbox/style-change.html (rev 0)
+++ trunk/LayoutTests/css3/flexbox/style-change.html 2012-06-06 06:45:22 UTC (rev 119564)
@@ -0,0 +1,77 @@
+
+
+
+body {
+margin: 0;
+}
+.flexbox {
+display: -webkit-flex;
+background-color: #aaa;
+position: relative;
+}
+
+.flexbox > :nth-child(1) {
+background-color: blue;
+}
+.flexbox > :nth-child(2) {
+background-color: green;
+}
+
+.absolute {
+ position: absolute;
+ width: 50px;
+ height: 50px;
+ background-color: yellow !important;
+}
+
+
+if (window.layoutTestController)
+layoutTestController.dumpAsText();
+
+
+
+This test verifies that changing order, align-content, align-items, align-self, or justify-content will relayout.
+
+
+
+
+
+