[CherryPick] WebKit does not support 'flex-wrap: nowrap'
authortony@chromium.org <tony@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 22 Oct 2012 21:32:01 +0000 (21:32 +0000)
committerGerrit Code Review <gerrit2@kim11>
Thu, 4 Apr 2013 07:40:53 +0000 (16:40 +0900)
commite6539d822d45b3a188a76ad6918aa08e7ca211b1
tree78d6f01d832715e9b43a6a4e4be9c3b858f6bd58
parent4d4c83c8df2da88fc5430a80ca562f1376c26406
[CherryPick] WebKit does not support 'flex-wrap: nowrap'

[Title] [CherryPick] WebKit does not support 'flex-wrap: nowrap'
[Issue] TWEB-969, TWEB-1006
[Problem] The flex-wrap attribute value expected "nowrap" but got "none".
[Cause] The spec was changed from "none" to "nowrap",
        and the Webkit code for that modified in 2012.10,
        but it didn't come in to Tizen.
[Solution] Cherry-pick the opensource patch.
[Cherry-Picker] KyungTae Kim <ktf.kim@samsung.com>

WebKit does not support 'flex-wrap: nowrap'
https://bugs.webkit.org/show_bug.cgi?id=99924

Reviewed by Ojan Vafai.

Source/WebCore:

The spec changed back from using none to nowrap for the single-line
flexbox case.
http://dev.w3.org/csswg/css3-flexbox/#flex-wrap-property

No new tests, covered by css3/flexbox/css-properties.html and others.

* css/CSSParser.cpp:
(WebCore::isValidKeywordPropertyAndValue):
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator EFlexWrap):
* css/CSSValueKeywords.in:
* rendering/RenderBox.cpp:
(WebCore::isStretchingColumnFlexItem):
(WebCore::RenderBox::sizesLogicalWidthToFitContent):
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::isMultiline):
* rendering/style/RenderStyle.h:
* rendering/style/RenderStyleConstants.h:

LayoutTests:

Update expectations (find and replace none with nowrap).

* css3/flexbox/css-properties-expected.txt:
* css3/flexbox/css-properties.html:
* fast/css/getComputedStyle/computed-style-expected.txt:
* 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@132136 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Conflicts:

LayoutTests/ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/css/CSSPrimitiveValueMappings.h
Source/WebCore/rendering/RenderBox.cpp

Change-Id: Ia3124cfc785c722276c324f396e26ab1596d2392
12 files changed:
LayoutTests/css3/flexbox/css-properties-expected.txt
LayoutTests/css3/flexbox/css-properties.html
LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
LayoutTests/svg/css/getComputedStyle-basic-expected.txt
Source/WebCore/css/CSSParser.cpp
Source/WebCore/css/CSSPrimitiveValueMappings.h
Source/WebCore/css/CSSValueKeywords.in
Source/WebCore/rendering/RenderBox.cpp
Source/WebCore/rendering/RenderFlexibleBox.cpp
Source/WebCore/rendering/style/RenderStyle.h
Source/WebCore/rendering/style/RenderStyleConstants.h