Diff
Modified: trunk/LayoutTests/ChangeLog (108101 => 108102)
--- trunk/LayoutTests/ChangeLog 2012-02-17 19:54:20 UTC (rev 108101)
+++ trunk/LayoutTests/ChangeLog 2012-02-17 19:56:43 UTC (rev 108102)
@@ -1,3 +1,25 @@
+2012-02-17 Joe Thomas <[email protected]>
+
+ flex-wrap:nowrap should be flex-wrap:none
+ https://bugs.webkit.org/show_bug.cgi?id=78772
+
+ As per the spec http://dev.w3.org/csswg/css3-flexbox/#flex-wrap0, flex-wrap:nowrap should be changed to flex-wrap:none.
+
+ Reviewed by Ojan Vafai.
+
+ * css3/flexbox/css-properties-expected.txt:
+ * css3/flexbox/script-tests/css-properties.js:
+ * fast/css/getComputedStyle/computed-style-expected.txt:
+ * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+ * platform/chromium-mac-snowleopard/fast/css/getComputedStyle/computed-style-expected.txt:
+ * platform/chromium-mac-snowleopard/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+ * platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt:
+ * platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt:
+ * platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+ * platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt:
+ * platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+ * svg/css/getComputedStyle-basic-expected.txt:
+
2012-02-17 Julien Chaffraix <[email protected]>
Table cell's anonymous wrappers are left in the tree, impacting our layout
Modified: trunk/LayoutTests/css3/flexbox/css-properties-expected.txt (108101 => 108102)
--- trunk/LayoutTests/css3/flexbox/css-properties-expected.txt 2012-02-17 19:54:20 UTC (rev 108101)
+++ trunk/LayoutTests/css3/flexbox/css-properties-expected.txt 2012-02-17 19:56:43 UTC (rev 108102)
@@ -87,25 +87,25 @@
PASS flexbox.style.webkitFlexDirection is "column-reverse"
PASS window.getComputedStyle(flexbox, null).webkitFlexDirection is "column-reverse"
PASS flexbox.style.webkitFlexWrap is ""
-PASS window.getComputedStyle(flexbox, null).webkitFlexWrap is "nowrap"
+PASS window.getComputedStyle(flexbox, null).webkitFlexWrap is "none"
PASS flexbox.style.webkitFlexWrap is ""
-PASS flexbox.style.webkitFlexWrap is "nowrap"
-PASS window.getComputedStyle(flexbox, null).webkitFlexWrap is "nowrap"
+PASS flexbox.style.webkitFlexWrap is "none"
+PASS window.getComputedStyle(flexbox, null).webkitFlexWrap is "none"
PASS flexbox.style.webkitFlexWrap is "wrap"
PASS window.getComputedStyle(flexbox, null).webkitFlexWrap is "wrap"
PASS flexbox.style.webkitFlexWrap is "wrap-reverse"
PASS window.getComputedStyle(flexbox, null).webkitFlexWrap is "wrap-reverse"
PASS flexbox.style.webkitFlexFlow is ""
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
PASS flexbox.style.webkitFlexFlow is ""
PASS flexbox.style.webkitFlexFlow is ""
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
PASS flexbox.style.webkitFlexFlow is ""
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
-PASS flexbox.style.webkitFlexFlow is "nowrap"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
-PASS flexbox.style.webkitFlexFlow is "nowrap"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
+PASS flexbox.style.webkitFlexFlow is "none"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
+PASS flexbox.style.webkitFlexFlow is "none"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
PASS flexbox.style.webkitFlexFlow is "wrap"
PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row wrap"
PASS flexbox.style.webkitFlexFlow is "wrap"
@@ -115,13 +115,13 @@
PASS flexbox.style.webkitFlexFlow is "wrap-reverse"
PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row wrap-reverse"
PASS flexbox.style.webkitFlexFlow is "row"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
PASS flexbox.style.webkitFlexFlow is "row"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
-PASS flexbox.style.webkitFlexFlow is "row nowrap"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
-PASS flexbox.style.webkitFlexFlow is "row nowrap"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
+PASS flexbox.style.webkitFlexFlow is "row none"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
+PASS flexbox.style.webkitFlexFlow is "row none"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
PASS flexbox.style.webkitFlexFlow is "row wrap"
PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row wrap"
PASS flexbox.style.webkitFlexFlow is "row wrap"
@@ -131,13 +131,13 @@
PASS flexbox.style.webkitFlexFlow is "row wrap-reverse"
PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row wrap-reverse"
PASS flexbox.style.webkitFlexFlow is "row-reverse"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse nowrap"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse none"
PASS flexbox.style.webkitFlexFlow is "row-reverse"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse nowrap"
-PASS flexbox.style.webkitFlexFlow is "row-reverse nowrap"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse nowrap"
-PASS flexbox.style.webkitFlexFlow is "row-reverse nowrap"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse nowrap"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse none"
+PASS flexbox.style.webkitFlexFlow is "row-reverse none"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse none"
+PASS flexbox.style.webkitFlexFlow is "row-reverse none"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse none"
PASS flexbox.style.webkitFlexFlow is "row-reverse wrap"
PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse wrap"
PASS flexbox.style.webkitFlexFlow is "row-reverse wrap"
@@ -147,13 +147,13 @@
PASS flexbox.style.webkitFlexFlow is "row-reverse wrap-reverse"
PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse wrap-reverse"
PASS flexbox.style.webkitFlexFlow is "column"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column nowrap"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column none"
PASS flexbox.style.webkitFlexFlow is "column"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column nowrap"
-PASS flexbox.style.webkitFlexFlow is "column nowrap"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column nowrap"
-PASS flexbox.style.webkitFlexFlow is "column nowrap"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column nowrap"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column none"
+PASS flexbox.style.webkitFlexFlow is "column none"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column none"
+PASS flexbox.style.webkitFlexFlow is "column none"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column none"
PASS flexbox.style.webkitFlexFlow is "column wrap"
PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column wrap"
PASS flexbox.style.webkitFlexFlow is "column wrap"
@@ -163,13 +163,13 @@
PASS flexbox.style.webkitFlexFlow is "column wrap-reverse"
PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column wrap-reverse"
PASS flexbox.style.webkitFlexFlow is "column-reverse"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse nowrap"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse none"
PASS flexbox.style.webkitFlexFlow is "column-reverse"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse nowrap"
-PASS flexbox.style.webkitFlexFlow is "column-reverse nowrap"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse nowrap"
-PASS flexbox.style.webkitFlexFlow is "column-reverse nowrap"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse nowrap"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse none"
+PASS flexbox.style.webkitFlexFlow is "column-reverse none"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse none"
+PASS flexbox.style.webkitFlexFlow is "column-reverse none"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse none"
PASS flexbox.style.webkitFlexFlow is "column-reverse wrap"
PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column-reverse wrap"
PASS flexbox.style.webkitFlexFlow is "column-reverse wrap"
@@ -182,9 +182,9 @@
PASS flexbox.style.webkitFlexFlow is ""
PASS flexbox.style.webkitFlexFlow is ""
PASS flexbox.style.webkitFlexFlow is ""
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row nowrap"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row none"
PASS flexbox.style.webkitFlexFlow is "column"
-PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column nowrap"
+PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column none"
PASS flexbox.style.webkitFlexFlow is "column wrap"
PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "column wrap"
PASS flexbox.style.webkitFlexFlow is "row-reverse wrap-reverse"
Modified: trunk/LayoutTests/css3/flexbox/script-tests/css-properties.js (108101 => 108102)
--- trunk/LayoutTests/css3/flexbox/script-tests/css-properties.js 2012-02-17 19:54:20 UTC (rev 108101)
+++ trunk/LayoutTests/css3/flexbox/script-tests/css-properties.js 2012-02-17 19:56:43 UTC (rev 108102)
@@ -185,15 +185,15 @@
shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexDirection', 'column-reverse');
shouldBeEqualToString('flexbox.style.webkitFlexWrap', '');
-// The initial value is 'stretch'.
-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexWrap', 'nowrap');
+// The initial value is 'none'.
+shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexWrap', 'none');
flexbox.style.webkitFlexWrap = 'foo';
shouldBeEqualToString('flexbox.style.webkitFlexWrap', '');
-flexbox.style.webkitFlexWrap = 'nowrap';
-shouldBeEqualToString('flexbox.style.webkitFlexWrap', 'nowrap');
-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexWrap', 'nowrap');
+flexbox.style.webkitFlexWrap = 'none';
+shouldBeEqualToString('flexbox.style.webkitFlexWrap', 'none');
+shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexWrap', 'none');
flexbox.style.webkitFlexWrap = 'wrap';
shouldBeEqualToString('flexbox.style.webkitFlexWrap', 'wrap');
@@ -205,7 +205,7 @@
flexbox.style.webkitFlexFlow = '';
shouldBeEqualToString('flexbox.style.webkitFlexFlow', '');
-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'row nowrap');
+shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'row none');
flexbox.style.webkitFlexFlow = 'foo';
shouldBeEqualToString('flexbox.style.webkitFlexFlow', '');
@@ -218,10 +218,10 @@
}
var directions = ['', 'row', 'row-reverse', 'column', 'column-reverse'];
-var wraps = ['', 'nowrap', 'wrap', 'wrap-reverse'];
+var wraps = ['', 'none', 'wrap', 'wrap-reverse'];
directions.forEach(function(direction) {
wraps.forEach(function(wrap) {
- var expectedComputed = (direction || 'row') + ' ' + (wrap || 'nowrap');
+ var expectedComputed = (direction || 'row') + ' ' + (wrap || 'none');
var expected = direction + ' ' + wrap;
testFlexFlowValue(direction + ' ' + wrap, expected, expectedComputed);
testFlexFlowValue(wrap + ' ' + direction, expected, expectedComputed);
@@ -237,10 +237,10 @@
flexbox.style.webkitFlexFlow = '';
shouldBeEqualToString('flexbox.style.webkitFlexFlow', '');
-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'row nowrap');
+shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'row none');
flexbox.style.webkitFlexDirection = 'column';
shouldBeEqualToString('flexbox.style.webkitFlexFlow', 'column');
-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'column nowrap');
+shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'column none');
flexbox.style.webkitFlexWrap = 'wrap';
shouldBeEqualToString('flexbox.style.webkitFlexFlow', 'column wrap');
shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexFlow', 'column wrap');
Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt (108101 => 108102)
--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2012-02-17 19:54:20 UTC (rev 108101)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2012-02-17 19:56:43 UTC (rev 108102)
@@ -147,8 +147,8 @@
-webkit-flex-align: stretch;
-webkit-flex-item-align: stretch;
-webkit-flex-direction: row;
--webkit-flex-flow: row nowrap;
--webkit-flex-wrap: nowrap;
+-webkit-flex-flow: row none;
+-webkit-flex-wrap: none;
-webkit-font-kerning: auto;
-webkit-font-smoothing: auto;
-webkit-font-variant-ligatures: normal;
Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (108101 => 108102)
--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-02-17 19:54:20 UTC (rev 108101)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-02-17 19:56:43 UTC (rev 108102)
@@ -146,8 +146,8 @@
-webkit-flex-align: stretch
-webkit-flex-item-align: stretch
-webkit-flex-direction: row
- -webkit-flex-flow: row nowrap
- -webkit-flex-wrap: nowrap
+ -webkit-flex-flow: row none
+ -webkit-flex-wrap: none
-webkit-font-kerning: auto
-webkit-font-smoothing: auto
-webkit-font-variant-ligatures: normal
Modified: trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/css/getComputedStyle/computed-style-expected.txt (108101 => 108102)
--- trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/css/getComputedStyle/computed-style-expected.txt 2012-02-17 19:54:20 UTC (rev 108101)
+++ trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/css/getComputedStyle/computed-style-expected.txt 2012-02-17 19:56:43 UTC (rev 108102)
@@ -147,8 +147,8 @@
-webkit-flex-align: stretch;
-webkit-flex-item-align: stretch;
-webkit-flex-direction: row;
--webkit-flex-flow: row nowrap;
--webkit-flex-wrap: nowrap;
+-webkit-flex-flow: row none;
+-webkit-flex-wrap: none;
-webkit-font-kerning: auto;
-webkit-font-smoothing: auto;
-webkit-font-variant-ligatures: normal;
Modified: trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (108101 => 108102)
--- trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-02-17 19:54:20 UTC (rev 108101)
+++ trunk/LayoutTests/platform/chromium-mac-snowleopard/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-02-17 19:56:43 UTC (rev 108102)
@@ -146,8 +146,8 @@
-webkit-flex-align: stretch
-webkit-flex-item-align: stretch
-webkit-flex-direction: row
- -webkit-flex-flow: row nowrap
- -webkit-flex-wrap: nowrap
+ -webkit-flex-flow: row none
+ -webkit-flex-wrap: none
-webkit-font-kerning: auto
-webkit-font-smoothing: auto
-webkit-font-variant-ligatures: normal
Modified: trunk/LayoutTests/platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt (108101 => 108102)
--- trunk/LayoutTests/platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt 2012-02-17 19:54:20 UTC (rev 108101)
+++ trunk/LayoutTests/platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt 2012-02-17 19:56:43 UTC (rev 108102)
@@ -292,9 +292,9 @@
rect: style.getPropertyCSSValue(-webkit-flex-item-align) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-flex-direction) : row
rect: style.getPropertyCSSValue(-webkit-flex-direction) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-flex-flow) : row nowrap
+rect: style.getPropertyValue(-webkit-flex-flow) : row none
rect: style.getPropertyCSSValue(-webkit-flex-flow) : [object CSSValueList]
-rect: style.getPropertyValue(-webkit-flex-wrap) : nowrap
+rect: style.getPropertyValue(-webkit-flex-wrap) : none
rect: style.getPropertyCSSValue(-webkit-flex-wrap) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-font-kerning) : auto
rect: style.getPropertyCSSValue(-webkit-font-kerning) : [object CSSPrimitiveValue]
@@ -808,9 +808,9 @@
g: style.getPropertyCSSValue(-webkit-flex-item-align) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-flex-direction) : row
g: style.getPropertyCSSValue(-webkit-flex-direction) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-flex-flow) : row nowrap
+g: style.getPropertyValue(-webkit-flex-flow) : row none
g: style.getPropertyCSSValue(-webkit-flex-flow) : [object CSSValueList]
-g: style.getPropertyValue(-webkit-flex-wrap) : nowrap
+g: style.getPropertyValue(-webkit-flex-wrap) : none
g: style.getPropertyCSSValue(-webkit-flex-wrap) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-font-kerning) : auto
g: style.getPropertyCSSValue(-webkit-font-kerning) : [object CSSPrimitiveValue]
Modified: trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt (108101 => 108102)
--- trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt 2012-02-17 19:54:20 UTC (rev 108101)
+++ trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt 2012-02-17 19:56:43 UTC (rev 108102)
@@ -147,8 +147,8 @@
-webkit-flex-align: stretch;
-webkit-flex-item-align: stretch;
-webkit-flex-direction: row;
--webkit-flex-flow: row nowrap;
--webkit-flex-wrap: nowrap;
+-webkit-flex-flow: row none;
+-webkit-flex-wrap: none;
-webkit-font-kerning: auto;
-webkit-font-smoothing: auto;
-webkit-font-variant-ligatures: normal;
Modified: trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (108101 => 108102)
--- trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-02-17 19:54:20 UTC (rev 108101)
+++ trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-02-17 19:56:43 UTC (rev 108102)
@@ -146,8 +146,8 @@
-webkit-flex-align: stretch
-webkit-flex-item-align: stretch
-webkit-flex-direction: row
- -webkit-flex-flow: row nowrap
- -webkit-flex-wrap: nowrap
+ -webkit-flex-flow: row none
+ -webkit-flex-wrap: none
-webkit-font-kerning: auto
-webkit-font-smoothing: auto
-webkit-font-variant-ligatures: normal
Modified: trunk/LayoutTests/platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt (108101 => 108102)
--- trunk/LayoutTests/platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt 2012-02-17 19:54:20 UTC (rev 108101)
+++ trunk/LayoutTests/platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt 2012-02-17 19:56:43 UTC (rev 108102)
@@ -292,9 +292,9 @@
rect: style.getPropertyCSSValue(-webkit-flex-item-align) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-flex-direction) : row
rect: style.getPropertyCSSValue(-webkit-flex-direction) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-flex-flow) : row nowrap
+rect: style.getPropertyValue(-webkit-flex-flow) : row none
rect: style.getPropertyCSSValue(-webkit-flex-flow) : [object CSSValueList]
-rect: style.getPropertyValue(-webkit-flex-wrap) : nowrap
+rect: style.getPropertyValue(-webkit-flex-wrap) : none
rect: style.getPropertyCSSValue(-webkit-flex-wrap) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-font-kerning) : auto
rect: style.getPropertyCSSValue(-webkit-font-kerning) : [object CSSPrimitiveValue]
@@ -808,9 +808,9 @@
g: style.getPropertyCSSValue(-webkit-flex-item-align) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-flex-direction) : row
g: style.getPropertyCSSValue(-webkit-flex-direction) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-flex-flow) : row nowrap
+g: style.getPropertyValue(-webkit-flex-flow) : row none
g: style.getPropertyCSSValue(-webkit-flex-flow) : [object CSSValueList]
-g: style.getPropertyValue(-webkit-flex-wrap) : nowrap
+g: style.getPropertyValue(-webkit-flex-wrap) : none
g: style.getPropertyCSSValue(-webkit-flex-wrap) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-font-kerning) : auto
g: style.getPropertyCSSValue(-webkit-font-kerning) : [object CSSPrimitiveValue]
Modified: trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (108101 => 108102)
--- trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-02-17 19:54:20 UTC (rev 108101)
+++ trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2012-02-17 19:56:43 UTC (rev 108102)
@@ -146,8 +146,8 @@
-webkit-flex-align: stretch
-webkit-flex-item-align: stretch
-webkit-flex-direction: row
- -webkit-flex-flow: row nowrap
- -webkit-flex-wrap: nowrap
+ -webkit-flex-flow: row none
+ -webkit-flex-wrap: none
-webkit-font-kerning: auto
-webkit-font-smoothing: auto
-webkit-font-variant-ligatures: normal
Modified: trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt (108101 => 108102)
--- trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt 2012-02-17 19:54:20 UTC (rev 108101)
+++ trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt 2012-02-17 19:56:43 UTC (rev 108102)
@@ -292,9 +292,9 @@
rect: style.getPropertyCSSValue(-webkit-flex-item-align) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-flex-direction) : row
rect: style.getPropertyCSSValue(-webkit-flex-direction) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-flex-flow) : row nowrap
+rect: style.getPropertyValue(-webkit-flex-flow) : row none
rect: style.getPropertyCSSValue(-webkit-flex-flow) : [object CSSValueList]
-rect: style.getPropertyValue(-webkit-flex-wrap) : nowrap
+rect: style.getPropertyValue(-webkit-flex-wrap) : none
rect: style.getPropertyCSSValue(-webkit-flex-wrap) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-font-kerning) : auto
rect: style.getPropertyCSSValue(-webkit-font-kerning) : [object CSSPrimitiveValue]
@@ -806,9 +806,9 @@
g: style.getPropertyCSSValue(-webkit-flex-item-align) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-flex-direction) : row
g: style.getPropertyCSSValue(-webkit-flex-direction) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-flex-flow) : row nowrap
+g: style.getPropertyValue(-webkit-flex-flow) : row none
g: style.getPropertyCSSValue(-webkit-flex-flow) : [object CSSValueList]
-g: style.getPropertyValue(-webkit-flex-wrap) : nowrap
+g: style.getPropertyValue(-webkit-flex-wrap) : none
g: style.getPropertyCSSValue(-webkit-flex-wrap) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-font-kerning) : auto
g: style.getPropertyCSSValue(-webkit-font-kerning) : [object CSSPrimitiveValue]
Modified: trunk/Source/WebCore/ChangeLog (108101 => 108102)
--- trunk/Source/WebCore/ChangeLog 2012-02-17 19:54:20 UTC (rev 108101)
+++ trunk/Source/WebCore/ChangeLog 2012-02-17 19:56:43 UTC (rev 108102)
@@ -1,3 +1,21 @@
+2012-02-17 Joe Thomas <[email protected]>
+
+ flex-wrap:nowrap should be flex-wrap:none
+ https://bugs.webkit.org/show_bug.cgi?id=78772
+
+ As per the spec http://dev.w3.org/csswg/css3-flexbox/#flex-wrap0, flex-wrap:nowrap should be changed to flex-wrap:none.
+
+ Reviewed by Ojan Vafai.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator EFlexWrap):
+ * css/CSSValueKeywords.in:
+ * rendering/style/RenderStyle.h:
+ * rendering/style/RenderStyleConstants.h:
+
2012-02-17 Enrica Casucci <[email protected]>
Refactor DragData class to use PlatformStrategies in the Mac implementation.
Modified: trunk/Source/WebCore/css/CSSParser.cpp (108101 => 108102)
--- trunk/Source/WebCore/css/CSSParser.cpp 2012-02-17 19:54:20 UTC (rev 108101)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2012-02-17 19:56:43 UTC (rev 108102)
@@ -1719,7 +1719,7 @@
validPrimitive = id == CSSValueRow || id == CSSValueRowReverse || id == CSSValueColumn || id == CSSValueColumnReverse;
break;
case CSSPropertyWebkitFlexWrap:
- validPrimitive = id == CSSValueNowrap || id == CSSValueWrap || id == CSSValueWrapReverse;
+ validPrimitive = id == CSSValueNone || id == CSSValueWrap || id == CSSValueWrapReverse;
break;
case CSSPropertyWebkitMarquee: {
const int properties[5] = { CSSPropertyWebkitMarqueeDirection, CSSPropertyWebkitMarqueeIncrement,
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (108101 => 108102)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2012-02-17 19:54:20 UTC (rev 108101)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2012-02-17 19:56:43 UTC (rev 108102)
@@ -1288,8 +1288,8 @@
{
m_primitiveUnitType = CSS_IDENT;
switch (e) {
- case FlexNoWrap:
- m_value.ident = CSSValueNowrap;
+ case FlexWrapNone:
+ m_value.ident = CSSValueNone;
break;
case FlexWrap:
m_value.ident = CSSValueWrap;
@@ -1303,15 +1303,15 @@
template<> inline CSSPrimitiveValue::operator EFlexWrap() const
{
switch (m_value.ident) {
- case CSSValueNowrap:
- return FlexNoWrap;
+ case CSSValueNone:
+ return FlexWrapNone;
case CSSValueWrap:
return FlexWrap;
case CSSValueWrapReverse:
return FlexWrapReverse;
default:
ASSERT_NOT_REACHED();
- return FlexNoWrap;
+ return FlexWrapNone;
}
}
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (108101 => 108102)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2012-02-17 19:54:20 UTC (rev 108101)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2012-02-17 19:56:43 UTC (rev 108102)
@@ -501,7 +501,7 @@
row-reverse
column
column-reverse
-// nowrap
+// none
// wrap
wrap-reverse
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (108101 => 108102)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2012-02-17 19:54:20 UTC (rev 108101)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2012-02-17 19:56:43 UTC (rev 108102)
@@ -1565,7 +1565,7 @@
static EFlexAlign initialFlexAlign() { return AlignStretch; }
static EFlexAlign initialFlexItemAlign() { return AlignAuto; }
static EFlexDirection initialFlexDirection() { return FlowRow; }
- static EFlexWrap initialFlexWrap() { return FlexNoWrap; }
+ static EFlexWrap initialFlexWrap() { return FlexWrapNone; }
static int initialMarqueeLoopCount() { return -1; }
static int initialMarqueeSpeed() { return 85; }
static Length initialMarqueeIncrement() { return Length(6, Fixed); }
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (108101 => 108102)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2012-02-17 19:54:20 UTC (rev 108101)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2012-02-17 19:56:43 UTC (rev 108102)
@@ -171,7 +171,7 @@
enum EFlexPack { PackStart, PackEnd, PackCenter, PackJustify, PackDistribute };
enum EFlexAlign { AlignAuto, AlignStart, AlignEnd, AlignCenter, AlignStretch, AlignBaseline };
enum EFlexDirection { FlowRow, FlowRowReverse, FlowColumn, FlowColumnReverse };
-enum EFlexWrap { FlexNoWrap, FlexWrap, FlexWrapReverse };
+enum EFlexWrap { FlexWrapNone, FlexWrap, FlexWrapReverse };
enum ETextSecurity {
TSNONE, TSDISC, TSCIRCLE, TSSQUARE
