Changeset 111237 in webkit
- Timestamp:
- Mar 19, 2012 1:43:13 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r111233 r111237 1 2012-03-19 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r109014. 4 http://trac.webkit.org/changeset/109014 5 https://bugs.webkit.org/show_bug.cgi?id=81551 6 7 Causing crashes (Requested by inferno-sec on #webkit). 8 9 * css3/flexbox/inline-flexbox-expected.html: Removed. 10 * css3/flexbox/inline-flexbox.html: Removed. 11 1 12 2012-03-19 Chris Fleizach <cfleizach@apple.com> 2 13 -
trunk/Source/WebCore/ChangeLog
r111231 r111237 1 2012-03-19 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r109014. 4 http://trac.webkit.org/changeset/109014 5 https://bugs.webkit.org/show_bug.cgi?id=81551 6 7 Causing crashes (Requested by inferno-sec on #webkit). 8 9 * rendering/style/RenderStyle.h: 10 1 11 2012-03-19 Tony Chang <tony@chromium.org> 2 12 -
trunk/Source/WebCore/rendering/style/RenderStyle.h
r111126 r111237 1463 1463 StyleDifference diff(const RenderStyle*, unsigned& changedContextSensitiveProperties) const; 1464 1464 1465 bool isDisplayReplacedType() const { return isDisplayReplacedType(display()); } 1466 bool isDisplayInlineType() const { return isDisplayInlineType(display()); } 1467 bool isOriginalDisplayInlineType() const { return isDisplayInlineType(originalDisplay()); } 1465 bool isDisplayReplacedType() const 1466 { 1467 return display() == INLINE_BLOCK || display() == INLINE_BOX || display() == INLINE_TABLE; 1468 } 1469 1470 bool isDisplayInlineType() const 1471 { 1472 return display() == INLINE || isDisplayReplacedType(); 1473 } 1474 1475 bool isOriginalDisplayInlineType() const 1476 { 1477 return originalDisplay() == INLINE || originalDisplay() == INLINE_BLOCK 1478 || originalDisplay() == INLINE_BOX || originalDisplay() == INLINE_TABLE; 1479 } 1468 1480 1469 1481 void setWritingMode(WritingMode v) { inherited_flags.m_writingMode = v; } … … 1716 1728 } 1717 1729 1718 bool isDisplayReplacedType(EDisplay display) const1719 {1720 return display == INLINE_BLOCK || display == INLINE_BOX || display == INLINE_FLEXBOX || display == INLINE_TABLE;1721 }1722 bool isDisplayInlineType(EDisplay display) const { return display == INLINE || isDisplayReplacedType(display); }1723 1724 1730 // Color accessors are all private to make sure callers use visitedDependentColor instead to access them. 1725 1731 Color invalidColor() const { static Color invalid; return invalid; }
Note: See TracChangeset
for help on using the changeset viewer.