Diff
Modified: trunk/LayoutTests/ChangeLog (93920 => 93921)
--- trunk/LayoutTests/ChangeLog 2011-08-26 22:32:53 UTC (rev 93920)
+++ trunk/LayoutTests/ChangeLog 2011-08-26 22:40:28 UTC (rev 93921)
@@ -1,3 +1,15 @@
+2011-08-26 Ojan Vafai <[email protected]>
+
+ change the default preferred width of the flex() function to 0px per the new spec
+ https://bugs.webkit.org/show_bug.cgi?id=67067
+
+ Reviewed by Tony Chang.
+
+ * css3/flexbox/001.html:
+ * css3/flexbox/002.html:
+ * css3/flexbox/flex-parsing-expected.txt:
+ * css3/flexbox/script-tests/flex-parsing.js:
+
2011-08-26 Aaron Colwell <[email protected]>
Rebasing media/video-layer-crash & media/video-transformed images.
Modified: trunk/LayoutTests/css3/flexbox/001.html (93920 => 93921)
--- trunk/LayoutTests/css3/flexbox/001.html 2011-08-26 22:32:53 UTC (rev 93920)
+++ trunk/LayoutTests/css3/flexbox/001.html 2011-08-26 22:40:28 UTC (rev 93921)
@@ -126,11 +126,11 @@
<!-- Test items with an intrinsic size. -->
<div style="display: -webkit-flexbox" class="horizontal-box">
- <div data-expected-width="200" style="width: -webkit-flex(1)">
+ <div data-expected-width="120" style="width: -webkit-flex(1)">
<div style="width: 100px; height: 100%;"></div>
</div>
- <div data-expected-width="200" style="width: -webkit-flex(2)"></div>
- <div data-expected-width="200" style="width: -webkit-flex(2)"></div>
+ <div data-expected-width="240" style="width: -webkit-flex(2)"></div>
+ <div data-expected-width="240" style="width: -webkit-flex(2)"></div>
</div>
<div style="display: -webkit-flexbox" class="horizontal-box">
Modified: trunk/LayoutTests/css3/flexbox/002.html (93920 => 93921)
--- trunk/LayoutTests/css3/flexbox/002.html 2011-08-26 22:32:53 UTC (rev 93920)
+++ trunk/LayoutTests/css3/flexbox/002.html 2011-08-26 22:40:28 UTC (rev 93921)
@@ -67,7 +67,7 @@
</div>
<div class="horizontal-box">
- <div data-expected-width="400" data-offset-x="100" style="width: -webkit-flex(3); margin: 0 auto;">
+ <div data-expected-width="400" data-offset-x="100" style="width: -webkit-flex(4); margin: 0 auto;">
<div style="width: 100px; height: 100%;"></div>
</div>
</div>
Modified: trunk/LayoutTests/css3/flexbox/flex-parsing-expected.txt (93920 => 93921)
--- trunk/LayoutTests/css3/flexbox/flex-parsing-expected.txt 2011-08-26 22:32:53 UTC (rev 93920)
+++ trunk/LayoutTests/css3/flexbox/flex-parsing-expected.txt 2011-08-26 22:40:28 UTC (rev 93921)
@@ -6,18 +6,18 @@
PASS testFlex("100px", "width") is "100px"
PASS testFlex("junk", "width") is ""
PASS testFlex("-webkit-flex()", "width") is ""
-PASS testFlex("-webkit-flex(1)", "width") is "-webkit-flex(1 0 auto)"
-PASS testFlex("-webkit-flex(0)", "width") is "-webkit-flex(0 0 auto)"
-PASS testFlex("-webkit-flex(2.4)", "width") is "-webkit-flex(2.4 0 auto)"
+PASS testFlex("-webkit-flex(1)", "width") is "-webkit-flex(1 0 0px)"
+PASS testFlex("-webkit-flex(0)", "width") is "-webkit-flex(0 0 0px)"
+PASS testFlex("-webkit-flex(2.4)", "width") is "-webkit-flex(2.4 0 0px)"
PASS testFlex("-webkit-flex(auto)", "width") is "-webkit-flex(1 0 auto)"
PASS testFlex("-webkit-flex(1px)", "width") is "-webkit-flex(1 0 1px)"
PASS testFlex("-webkit-flex(2em)", "width") is "-webkit-flex(1 0 2em)"
PASS testFlex("-webkit-flex(0px)", "width") is "-webkit-flex(1 0 0px)"
PASS testFlex("-webkit-flex(-2)", "width") is ""
PASS testFlex("-webkit-flex(foo)", "width") is ""
-PASS testFlex("-webkit-flex(0 0)", "width") is "-webkit-flex(0 0 auto)"
-PASS testFlex("-webkit-flex(0 1)", "width") is "-webkit-flex(0 1 auto)"
-PASS testFlex("-webkit-flex(1 0)", "width") is "-webkit-flex(1 0 auto)"
+PASS testFlex("-webkit-flex(0 0)", "width") is "-webkit-flex(0 0 0px)"
+PASS testFlex("-webkit-flex(0 1)", "width") is "-webkit-flex(0 1 0px)"
+PASS testFlex("-webkit-flex(1 0)", "width") is "-webkit-flex(1 0 0px)"
PASS testFlex("-webkit-flex(2 auto)", "width") is "-webkit-flex(2 0 auto)"
PASS testFlex("-webkit-flex(3 4px)", "width") is "-webkit-flex(3 0 4px)"
PASS testFlex("-webkit-flex(auto 5.2)", "width") is "-webkit-flex(5.2 0 auto)"
@@ -56,18 +56,18 @@
PASS testFlex("100px", "height") is "100px"
PASS testFlex("junk", "height") is ""
PASS testFlex("-webkit-flex()", "height") is ""
-PASS testFlex("-webkit-flex(1)", "height") is "-webkit-flex(1 0 auto)"
-PASS testFlex("-webkit-flex(0)", "height") is "-webkit-flex(0 0 auto)"
-PASS testFlex("-webkit-flex(2.4)", "height") is "-webkit-flex(2.4 0 auto)"
+PASS testFlex("-webkit-flex(1)", "height") is "-webkit-flex(1 0 0px)"
+PASS testFlex("-webkit-flex(0)", "height") is "-webkit-flex(0 0 0px)"
+PASS testFlex("-webkit-flex(2.4)", "height") is "-webkit-flex(2.4 0 0px)"
PASS testFlex("-webkit-flex(auto)", "height") is "-webkit-flex(1 0 auto)"
PASS testFlex("-webkit-flex(1px)", "height") is "-webkit-flex(1 0 1px)"
PASS testFlex("-webkit-flex(2em)", "height") is "-webkit-flex(1 0 2em)"
PASS testFlex("-webkit-flex(0px)", "height") is "-webkit-flex(1 0 0px)"
PASS testFlex("-webkit-flex(-2)", "height") is ""
PASS testFlex("-webkit-flex(foo)", "height") is ""
-PASS testFlex("-webkit-flex(0 0)", "height") is "-webkit-flex(0 0 auto)"
-PASS testFlex("-webkit-flex(0 1)", "height") is "-webkit-flex(0 1 auto)"
-PASS testFlex("-webkit-flex(1 0)", "height") is "-webkit-flex(1 0 auto)"
+PASS testFlex("-webkit-flex(0 0)", "height") is "-webkit-flex(0 0 0px)"
+PASS testFlex("-webkit-flex(0 1)", "height") is "-webkit-flex(0 1 0px)"
+PASS testFlex("-webkit-flex(1 0)", "height") is "-webkit-flex(1 0 0px)"
PASS testFlex("-webkit-flex(2 auto)", "height") is "-webkit-flex(2 0 auto)"
PASS testFlex("-webkit-flex(3 4px)", "height") is "-webkit-flex(3 0 4px)"
PASS testFlex("-webkit-flex(auto 5.2)", "height") is "-webkit-flex(5.2 0 auto)"
Modified: trunk/LayoutTests/css3/flexbox/script-tests/flex-parsing.js (93920 => 93921)
--- trunk/LayoutTests/css3/flexbox/script-tests/flex-parsing.js 2011-08-26 22:32:53 UTC (rev 93920)
+++ trunk/LayoutTests/css3/flexbox/script-tests/flex-parsing.js 2011-08-26 22:40:28 UTC (rev 93921)
@@ -15,9 +15,9 @@
shouldBeEqualToString('testFlex("100px", "' + attribute + '")', '100px');
shouldBeEqualToString('testFlex("junk", "' + attribute + '")', '');
shouldBeEqualToString('testFlex("-webkit-flex()", "' + attribute + '")', '');
- shouldBeEqualToString('testFlex("-webkit-flex(1)", "' + attribute + '")', '-webkit-flex(1 0 auto)');
- shouldBeEqualToString('testFlex("-webkit-flex(0)", "' + attribute + '")', '-webkit-flex(0 0 auto)');
- shouldBeEqualToString('testFlex("-webkit-flex(2.4)", "' + attribute + '")', '-webkit-flex(2.4 0 auto)');
+ shouldBeEqualToString('testFlex("-webkit-flex(1)", "' + attribute + '")', '-webkit-flex(1 0 0px)');
+ shouldBeEqualToString('testFlex("-webkit-flex(0)", "' + attribute + '")', '-webkit-flex(0 0 0px)');
+ shouldBeEqualToString('testFlex("-webkit-flex(2.4)", "' + attribute + '")', '-webkit-flex(2.4 0 0px)');
shouldBeEqualToString('testFlex("-webkit-flex(auto)", "' + attribute + '")', '-webkit-flex(1 0 auto)');
shouldBeEqualToString('testFlex("-webkit-flex(1px)", "' + attribute + '")', '-webkit-flex(1 0 1px)');
shouldBeEqualToString('testFlex("-webkit-flex(2em)", "' + attribute + '")', '-webkit-flex(1 0 2em)');
@@ -25,9 +25,9 @@
shouldBeEqualToString('testFlex("-webkit-flex(-2)", "' + attribute + '")', '');
shouldBeEqualToString('testFlex("-webkit-flex(foo)", "' + attribute + '")', '');
- shouldBeEqualToString('testFlex("-webkit-flex(0 0)", "' + attribute + '")', '-webkit-flex(0 0 auto)');
- shouldBeEqualToString('testFlex("-webkit-flex(0 1)", "' + attribute + '")', '-webkit-flex(0 1 auto)');
- shouldBeEqualToString('testFlex("-webkit-flex(1 0)", "' + attribute + '")', '-webkit-flex(1 0 auto)');
+ shouldBeEqualToString('testFlex("-webkit-flex(0 0)", "' + attribute + '")', '-webkit-flex(0 0 0px)');
+ shouldBeEqualToString('testFlex("-webkit-flex(0 1)", "' + attribute + '")', '-webkit-flex(0 1 0px)');
+ shouldBeEqualToString('testFlex("-webkit-flex(1 0)", "' + attribute + '")', '-webkit-flex(1 0 0px)');
shouldBeEqualToString('testFlex("-webkit-flex(2 auto)", "' + attribute + '")', '-webkit-flex(2 0 auto)');
shouldBeEqualToString('testFlex("-webkit-flex(3 4px)", "' + attribute + '")', '-webkit-flex(3 0 4px)');
shouldBeEqualToString('testFlex("-webkit-flex(auto 5.2)", "' + attribute + '")', '-webkit-flex(5.2 0 auto)');
Modified: trunk/Source/WebCore/ChangeLog (93920 => 93921)
--- trunk/Source/WebCore/ChangeLog 2011-08-26 22:32:53 UTC (rev 93920)
+++ trunk/Source/WebCore/ChangeLog 2011-08-26 22:40:28 UTC (rev 93921)
@@ -1,3 +1,13 @@
+2011-08-26 Ojan Vafai <[email protected]>
+
+ change the default preferred width of the flex() function to 0px per the new spec
+ https://bugs.webkit.org/show_bug.cgi?id=67067
+
+ Reviewed by Tony Chang.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseFlex):
+
2011-08-26 Matthew Delaney <[email protected]>
Remove offset hack from GraphicsContextCG setShadow code
Modified: trunk/Source/WebCore/css/CSSParser.cpp (93920 => 93921)
--- trunk/Source/WebCore/css/CSSParser.cpp 2011-08-26 22:32:53 UTC (rev 93920)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2011-08-26 22:40:28 UTC (rev 93921)
@@ -5077,7 +5077,7 @@
else if (negativeFlex == unsetValue)
negativeFlex = arg->fValue;
else if (!arg->fValue) {
- // flex() only allows a size of 0 if the positive and negative flex values have already been set.
+ // flex() only allows a preferred size of 0 (sans units) if the positive and negative flex values have already been set.
preferredSize = primitiveValueCache()->createValue(0, CSSPrimitiveValue::CSS_PX);
} else {
// We only allow 3 numbers without units if the last value is 0. E.g., flex(1 1 1) is invalid.
@@ -5097,7 +5097,7 @@
if (negativeFlex == unsetValue)
negativeFlex = 0;
if (!preferredSize)
- preferredSize = primitiveValueCache()->createIdentifierValue(CSSValueAuto);
+ preferredSize = primitiveValueCache()->createValue(0, CSSPrimitiveValue::CSS_PX);
RefPtr<CSSFlexValue> flex = CSSFlexValue::create(clampToFloat(positiveFlex), clampToFloat(negativeFlex), preferredSize);
addProperty(propId, flex.release(), important);
