Title: [111237] trunk
- Revision
- 111237
- Author
- [email protected]
- Date
- 2012-03-19 13:43:13 -0700 (Mon, 19 Mar 2012)
Log Message
Unreviewed, rolling out r109014.
http://trac.webkit.org/changeset/109014
https://bugs.webkit.org/show_bug.cgi?id=81551
Causing crashes (Requested by inferno-sec on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-03-19
Source/WebCore:
* rendering/style/RenderStyle.h:
LayoutTests:
* css3/flexbox/inline-flexbox-expected.html: Removed.
* css3/flexbox/inline-flexbox.html: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (111236 => 111237)
--- trunk/LayoutTests/ChangeLog 2012-03-19 20:43:11 UTC (rev 111236)
+++ trunk/LayoutTests/ChangeLog 2012-03-19 20:43:13 UTC (rev 111237)
@@ -1,3 +1,14 @@
+2012-03-19 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r109014.
+ http://trac.webkit.org/changeset/109014
+ https://bugs.webkit.org/show_bug.cgi?id=81551
+
+ Causing crashes (Requested by inferno-sec on #webkit).
+
+ * css3/flexbox/inline-flexbox-expected.html: Removed.
+ * css3/flexbox/inline-flexbox.html: Removed.
+
2012-03-19 Chris Fleizach <[email protected]>
platform/mac/accessibility/selected-rows-table.html failing on Lion Intel Debug WebKit2 testers
Deleted: trunk/LayoutTests/css3/flexbox/inline-flexbox-expected.html (111236 => 111237)
--- trunk/LayoutTests/css3/flexbox/inline-flexbox-expected.html 2012-03-19 20:43:11 UTC (rev 111236)
+++ trunk/LayoutTests/css3/flexbox/inline-flexbox-expected.html 2012-03-19 20:43:13 UTC (rev 111237)
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<span>foo</span>
-<span>flex item 1</span><span>flex item 2</span>
-<span>baz</span>
\ No newline at end of file
Deleted: trunk/LayoutTests/css3/flexbox/inline-flexbox.html (111236 => 111237)
--- trunk/LayoutTests/css3/flexbox/inline-flexbox.html 2012-03-19 20:43:11 UTC (rev 111236)
+++ trunk/LayoutTests/css3/flexbox/inline-flexbox.html 2012-03-19 20:43:13 UTC (rev 111237)
@@ -1,7 +0,0 @@
-<!DOCTYPE html>
-<span>foo</span>
-<div style="display:-webkit-inline-flexbox">
- <div>flex item 1</div>
- <div>flex item 2</div>
-</div>
-<span>baz</span>
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (111236 => 111237)
--- trunk/Source/WebCore/ChangeLog 2012-03-19 20:43:11 UTC (rev 111236)
+++ trunk/Source/WebCore/ChangeLog 2012-03-19 20:43:13 UTC (rev 111237)
@@ -1,3 +1,13 @@
+2012-03-19 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r109014.
+ http://trac.webkit.org/changeset/109014
+ https://bugs.webkit.org/show_bug.cgi?id=81551
+
+ Causing crashes (Requested by inferno-sec on #webkit).
+
+ * rendering/style/RenderStyle.h:
+
2012-03-19 Tony Chang <[email protected]>
Unreviewed, remove headers that no longer exist or moved in WebCore.gypi.
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (111236 => 111237)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2012-03-19 20:43:11 UTC (rev 111236)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2012-03-19 20:43:13 UTC (rev 111237)
@@ -1462,10 +1462,22 @@
StyleDifference diff(const RenderStyle*, unsigned& changedContextSensitiveProperties) const;
- bool isDisplayReplacedType() const { return isDisplayReplacedType(display()); }
- bool isDisplayInlineType() const { return isDisplayInlineType(display()); }
- bool isOriginalDisplayInlineType() const { return isDisplayInlineType(originalDisplay()); }
+ bool isDisplayReplacedType() const
+ {
+ return display() == INLINE_BLOCK || display() == INLINE_BOX || display() == INLINE_TABLE;
+ }
+ bool isDisplayInlineType() const
+ {
+ return display() == INLINE || isDisplayReplacedType();
+ }
+
+ bool isOriginalDisplayInlineType() const
+ {
+ return originalDisplay() == INLINE || originalDisplay() == INLINE_BLOCK
+ || originalDisplay() == INLINE_BOX || originalDisplay() == INLINE_TABLE;
+ }
+
void setWritingMode(WritingMode v) { inherited_flags.m_writingMode = v; }
// To tell if this style matched attribute selectors. This makes it impossible to share.
@@ -1715,12 +1727,6 @@
return isHorizontalWritingMode() ? getImageVerticalOutsets(image, logicalTop, logicalBottom) : getImageHorizontalOutsets(image, logicalTop, logicalBottom);
}
- bool isDisplayReplacedType(EDisplay display) const
- {
- return display == INLINE_BLOCK || display == INLINE_BOX || display == INLINE_FLEXBOX || display == INLINE_TABLE;
- }
- bool isDisplayInlineType(EDisplay display) const { return display == INLINE || isDisplayReplacedType(display); }
-
// Color accessors are all private to make sure callers use visitedDependentColor instead to access them.
Color invalidColor() const { static Color invalid; return invalid; }
Color borderLeftColor() const { return surround->border.left().color(); }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
