Commit a97f58bf authored by commit-queue@webkit.org's avatar commit-queue@webkit.org
Browse files

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.

Patch by Joe Thomas <joethomas@motorola.com> on 2012-02-17
Reviewed by Ojan Vafai.

Source/WebCore:

* 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:

LayoutTests:

* 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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108102 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 1a0e7a68
2012-02-17 Joe Thomas <joethomas@motorola.com>
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 <jchaffraix@webkit.org>
 
Table cell's anonymous wrappers are left in the tree, impacting our layout
......@@ -87,25 +87,25 @@ PASS window.getComputedStyle(flexbox, null).webkitFlexDirection is "column"
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 window.getComputedStyle(flexbox, null).webkitFlexFlow is "row wrap-reverse"
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 window.getComputedStyle(flexbox, null).webkitFlexFlow is "row wrap-reverse"
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 window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse wrap-
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 window.getComputedStyle(flexbox, null).webkitFlexFlow is "column wrap-rever
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 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"
......
......@@ -185,15 +185,15 @@ shouldBeEqualToString('flexbox.style.webkitFlexDirection', 'column-reverse');
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 @@ shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexWrap', '
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 @@ function testFlexFlowValue(value, expected, expectedComputed)
}
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 @@ shouldBeEqualToString('flexbox.style.webkitFlexFlow', '');
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');
......
......@@ -147,8 +147,8 @@ zoom: 1;
-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;
......
......@@ -146,8 +146,8 @@ Computed style of an element whose parent's 'display' value is 'none':
-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
......
......@@ -147,8 +147,8 @@ zoom: 1;
-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;
......
......@@ -146,8 +146,8 @@ Computed style of an element whose parent's 'display' value is 'none':
-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
......
......@@ -292,9 +292,9 @@ rect: style.getPropertyValue(-webkit-flex-item-align) : stretch
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.getPropertyValue(-webkit-flex-item-align) : stretch
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]
......
......@@ -147,8 +147,8 @@ zoom: 1;
-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;
......
......@@ -146,8 +146,8 @@ Computed style of an element whose parent's 'display' value is 'none':
-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
......
......@@ -292,9 +292,9 @@ rect: style.getPropertyValue(-webkit-flex-item-align) : stretch
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.getPropertyValue(-webkit-flex-item-align) : stretch
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]
......
......@@ -146,8 +146,8 @@ Computed style of an element whose parent's 'display' value is 'none':
-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
......
......@@ -292,9 +292,9 @@ rect: style.getPropertyValue(-webkit-flex-item-align) : stretch
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.getPropertyValue(-webkit-flex-item-align) : stretch
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]
......
2012-02-17 Joe Thomas <joethomas@motorola.com>
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 <enrica@apple.com>
 
Refactor DragData class to use PlatformStrategies in the Mac implementation.
......@@ -1719,7 +1719,7 @@ bool CSSParser::parseValue(int propId, bool important)
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,
......
......@@ -1288,8 +1288,8 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFlexWrap e)
{
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::CSSPrimitiveValue(EFlexWrap e)
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;
}
}
......
......@@ -501,7 +501,7 @@ row
row-reverse
column
column-reverse
// nowrap
// none
// wrap
wrap-reverse
......
......@@ -1565,7 +1565,7 @@ public:
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); }
......
......@@ -171,7 +171,7 @@ enum EBoxDirection { BNORMAL, BREVERSE };
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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment