Title: [116166] trunk
- Revision
- 116166
- Author
- [email protected]
- Date
- 2012-05-04 14:15:13 -0700 (Fri, 04 May 2012)
Log Message
The computed style of flex-item-align should never be auto.
https://bugs.webkit.org/show_bug.cgi?id=85656
Reviewed by Ojan Vafai.
Source/WebCore:
If the node lacks a parent and flex-item-align is auto, we should
return stretch. This was recently clarified in the spec.
New testcase in css3/flexbox/css-properties.html.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
LayoutTests:
* css3/flexbox/css-properties-expected.txt:
* css3/flexbox/css-properties.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (116165 => 116166)
--- trunk/LayoutTests/ChangeLog 2012-05-04 21:00:37 UTC (rev 116165)
+++ trunk/LayoutTests/ChangeLog 2012-05-04 21:15:13 UTC (rev 116166)
@@ -1,3 +1,13 @@
+2012-05-04 Tony Chang <[email protected]>
+
+ The computed style of flex-item-align should never be auto.
+ https://bugs.webkit.org/show_bug.cgi?id=85656
+
+ Reviewed by Ojan Vafai.
+
+ * css3/flexbox/css-properties-expected.txt:
+ * css3/flexbox/css-properties.html:
+
2012-05-03 Jer Noble <[email protected]>
Full screen will exit during a provisional load of a non-ancestor iframe.
Modified: trunk/LayoutTests/css3/flexbox/css-properties-expected.txt (116165 => 116166)
--- trunk/LayoutTests/css3/flexbox/css-properties-expected.txt 2012-05-04 21:00:37 UTC (rev 116165)
+++ trunk/LayoutTests/css3/flexbox/css-properties-expected.txt 2012-05-04 21:15:13 UTC (rev 116166)
@@ -30,6 +30,7 @@
PASS window.getComputedStyle(flexbox, null).webkitFlexPack is "start"
PASS flexbox.style.webkitFlexItemAlign is ""
PASS window.getComputedStyle(flexbox, null).webkitFlexItemAlign is "stretch"
+PASS window.getComputedStyle(document.documentElement, null).webkitFlexItemAlign is "stretch"
PASS flexbox.style.webkitFlexItemAlign is ""
PASS flexbox.style.webkitFlexItemAlign is "auto"
PASS window.getComputedStyle(flexbox, null).webkitFlexItemAlign is "stretch"
Modified: trunk/LayoutTests/css3/flexbox/css-properties.html (116165 => 116166)
--- trunk/LayoutTests/css3/flexbox/css-properties.html 2012-05-04 21:00:37 UTC (rev 116165)
+++ trunk/LayoutTests/css3/flexbox/css-properties.html 2012-05-04 21:15:13 UTC (rev 116166)
@@ -82,6 +82,7 @@
shouldBeEqualToString('flexbox.style.webkitFlexItemAlign', '');
// The initial value is 'stretch'.
shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexItemAlign', 'stretch');
+shouldBeEqualToString('window.getComputedStyle(document.documentElement, null).webkitFlexItemAlign', 'stretch');
flexbox.style.webkitFlexItemAlign = 'foo';
shouldBeEqualToString('flexbox.style.webkitFlexItemAlign', '');
Modified: trunk/Source/WebCore/ChangeLog (116165 => 116166)
--- trunk/Source/WebCore/ChangeLog 2012-05-04 21:00:37 UTC (rev 116165)
+++ trunk/Source/WebCore/ChangeLog 2012-05-04 21:15:13 UTC (rev 116166)
@@ -1,3 +1,18 @@
+2012-05-04 Tony Chang <[email protected]>
+
+ The computed style of flex-item-align should never be auto.
+ https://bugs.webkit.org/show_bug.cgi?id=85656
+
+ Reviewed by Ojan Vafai.
+
+ If the node lacks a parent and flex-item-align is auto, we should
+ return stretch. This was recently clarified in the spec.
+
+ New testcase in css3/flexbox/css-properties.html.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+
2012-05-04 Christophe Dumez <[email protected]>
[soup] URL of the ResourceResponse passed to willSendRequest is incorrect
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (116165 => 116166)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2012-05-04 21:00:37 UTC (rev 116165)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2012-05-04 21:15:13 UTC (rev 116166)
@@ -1641,8 +1641,11 @@
case CSSPropertyWebkitFlexAlign:
return cssValuePool().createValue(style->flexAlign());
case CSSPropertyWebkitFlexItemAlign:
- if (style->flexItemAlign() == AlignAuto && m_node && m_node->parentNode() && m_node->parentNode()->computedStyle())
- return cssValuePool().createValue(m_node->parentNode()->computedStyle()->flexAlign());
+ if (style->flexItemAlign() == AlignAuto) {
+ if (m_node && m_node->parentNode() && m_node->parentNode()->computedStyle())
+ return cssValuePool().createValue(m_node->parentNode()->computedStyle()->flexAlign());
+ return cssValuePool().createValue(AlignStretch);
+ }
return cssValuePool().createValue(style->flexItemAlign());
case CSSPropertyWebkitFlexDirection:
return cssValuePool().createValue(style->flexDirection());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
