Changeset 111237 in webkit

Timestamp:

Mar 19, 2012 1:43:13 PM (12 years ago)

Author:

commit-queue@webkit.org

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 <​webkit.review.bot@gmail.com> on 2012-03-19

Source/WebCore:

• rendering/style/RenderStyle.h:

LayoutTests:

• css3/flexbox/inline-flexbox-expected.html: Removed.
• css3/flexbox/inline-flexbox.html: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/inline-flexbox-expected.html (deleted)
• LayoutTests/css3/flexbox/inline-flexbox.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-19  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <cfleizach@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-19  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <tony@chromium.org>
 

trunk/Source/WebCore/rendering/style/RenderStyle.h

@@ -1463 +1463 @@
     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; }
@@ -1716 +1728 @@
     }
 
-    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; }