Changeset 116166 in webkit
- Timestamp:
- May 4, 2012 2:15:13 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r116165 r116166 1 2012-05-04 Tony Chang <tony@chromium.org> 2 3 The computed style of flex-item-align should never be auto. 4 https://bugs.webkit.org/show_bug.cgi?id=85656 5 6 Reviewed by Ojan Vafai. 7 8 * css3/flexbox/css-properties-expected.txt: 9 * css3/flexbox/css-properties.html: 10 1 11 2012-05-03 Jer Noble <jer.noble@apple.com> 2 12 -
trunk/LayoutTests/css3/flexbox/css-properties-expected.txt
r111342 r116166 31 31 PASS flexbox.style.webkitFlexItemAlign is "" 32 32 PASS window.getComputedStyle(flexbox, null).webkitFlexItemAlign is "stretch" 33 PASS window.getComputedStyle(document.documentElement, null).webkitFlexItemAlign is "stretch" 33 34 PASS flexbox.style.webkitFlexItemAlign is "" 34 35 PASS flexbox.style.webkitFlexItemAlign is "auto" -
trunk/LayoutTests/css3/flexbox/css-properties.html
r114699 r116166 83 83 // The initial value is 'stretch'. 84 84 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexItemAlign', 'stretch'); 85 shouldBeEqualToString('window.getComputedStyle(document.documentElement, null).webkitFlexItemAlign', 'stretch'); 85 86 86 87 flexbox.style.webkitFlexItemAlign = 'foo'; -
trunk/Source/WebCore/ChangeLog
r116160 r116166 1 2012-05-04 Tony Chang <tony@chromium.org> 2 3 The computed style of flex-item-align should never be auto. 4 https://bugs.webkit.org/show_bug.cgi?id=85656 5 6 Reviewed by Ojan Vafai. 7 8 If the node lacks a parent and flex-item-align is auto, we should 9 return stretch. This was recently clarified in the spec. 10 11 New testcase in css3/flexbox/css-properties.html. 12 13 * css/CSSComputedStyleDeclaration.cpp: 14 (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): 15 1 16 2012-05-04 Christophe Dumez <christophe.dumez@intel.com> 2 17 -
trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
r115573 r116166 1642 1642 return cssValuePool().createValue(style->flexAlign()); 1643 1643 case CSSPropertyWebkitFlexItemAlign: 1644 if (style->flexItemAlign() == AlignAuto && m_node && m_node->parentNode() && m_node->parentNode()->computedStyle()) 1645 return cssValuePool().createValue(m_node->parentNode()->computedStyle()->flexAlign()); 1644 if (style->flexItemAlign() == AlignAuto) { 1645 if (m_node && m_node->parentNode() && m_node->parentNode()->computedStyle()) 1646 return cssValuePool().createValue(m_node->parentNode()->computedStyle()->flexAlign()); 1647 return cssValuePool().createValue(AlignStretch); 1648 } 1646 1649 return cssValuePool().createValue(style->flexItemAlign()); 1647 1650 case CSSPropertyWebkitFlexDirection:
Note: See TracChangeset
for help on using the changeset viewer.