Changeset 109014 in webkit
- Timestamp:
- Feb 27, 2012 12:33:27 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r109011 r109014 1 2012-02-27 Ojan Vafai <ojan@chromium.org> 2 3 implement display: -webkit-inline-flexbox 4 https://bugs.webkit.org/show_bug.cgi?id=77772 5 6 Reviewed by David Hyatt. 7 8 * css3/flexbox/inline-flexbox-expected.html: Added. 9 * css3/flexbox/inline-flexbox.html: Added. 10 1 11 2012-02-27 Ken Buchanan <kenrb@chromium.org> 2 12 -
trunk/Source/WebCore/ChangeLog
r109011 r109014 1 2012-02-27 Ojan Vafai <ojan@chromium.org> 2 3 implement display: -webkit-inline-flexbox 4 https://bugs.webkit.org/show_bug.cgi?id=77772 5 6 Reviewed by David Hyatt. 7 8 Tests: css3/flexbox/inline-flexbox-expected.html 9 css3/flexbox/inline-flexbox.html 10 11 * rendering/style/RenderStyle.h: 12 -Add INLINE_FLEXBOX to the list of replaced display types. 13 -Restructure the isDisplayInline methods to avoid code duplication. 14 1 15 2012-02-27 Ken Buchanan <kenrb@chromium.org> 2 16 -
trunk/Source/WebCore/rendering/style/RenderStyle.h
r108855 r109014 1451 1451 StyleDifference diff(const RenderStyle*, unsigned& changedContextSensitiveProperties) const; 1452 1452 1453 bool isDisplayReplacedType() const 1454 { 1455 return display() == INLINE_BLOCK || display() == INLINE_BOX || display() == INLINE_TABLE; 1456 } 1457 1458 bool isDisplayInlineType() const 1459 { 1460 return display() == INLINE || isDisplayReplacedType(); 1461 } 1462 1463 bool isOriginalDisplayInlineType() const 1464 { 1465 return originalDisplay() == INLINE || originalDisplay() == INLINE_BLOCK 1466 || originalDisplay() == INLINE_BOX || originalDisplay() == INLINE_TABLE; 1467 } 1453 bool isDisplayReplacedType() const { return isDisplayReplacedType(display()); } 1454 bool isDisplayInlineType() const { return isDisplayInlineType(display()); } 1455 bool isOriginalDisplayInlineType() const { return isDisplayInlineType(originalDisplay()); } 1468 1456 1469 1457 void setWritingMode(WritingMode v) { inherited_flags.m_writingMode = v; } … … 1716 1704 } 1717 1705 1706 bool isDisplayReplacedType(EDisplay display) const 1707 { 1708 return display == INLINE_BLOCK || display == INLINE_BOX || display == INLINE_FLEXBOX || display == INLINE_TABLE; 1709 } 1710 bool isDisplayInlineType(EDisplay display) const { return display == INLINE || isDisplayReplacedType(display); } 1711 1718 1712 // Color accessors are all private to make sure callers use visitedDependentColor instead to access them. 1719 1713 const Color& invalidColor() const { static Color invalid; return invalid; }
Note: See TracChangeset
for help on using the changeset viewer.