git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2a805c8)
Unreviewed, rolling out r109014.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 19 Mar 2012 20:43:13 +0000 (20:43 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 19 Mar 2012 20:43:13 +0000 (20:43 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111237 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog patch | blob | history
LayoutTests/css3/flexbox/inline-flexbox-expected.html [deleted file] patch | blob | history
LayoutTests/css3/flexbox/inline-flexbox.html [deleted file] patch | blob | history
Source/WebCore/ChangeLog patch | blob | history
Source/WebCore/rendering/style/RenderStyle.h patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index fa8ba513775e128e951d131874e42033572d6382..dc27d11f24cc71fc093a6a0da682af8809819005 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+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>
 
         platform/mac/accessibility/selected-rows-table.html failing on Lion Intel Debug WebKit2 testers
diff --git a/LayoutTests/css3/flexbox/inline-flexbox-expected.html b/LayoutTests/css3/flexbox/inline-flexbox-expected.html
deleted file mode 100644 (file)
index f2044f9..0000000
--- a/LayoutTests/css3/flexbox/inline-flexbox-expected.html
+++ /dev/null
@@ -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
diff --git a/LayoutTests/css3/flexbox/inline-flexbox.html b/LayoutTests/css3/flexbox/inline-flexbox.html
deleted file mode 100644 (file)
index 6e15e2f..0000000
--- a/LayoutTests/css3/flexbox/inline-flexbox.html
+++ /dev/null
@@ -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
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 13c7d47cd49ed0b9ad7eb7e2997fe8973a5f99e6..0e33026dff36d0194d1c1817df65700a7f36d854 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+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>
 
         Unreviewed, remove headers that no longer exist or moved in WebCore.gypi.
diff --git a/Source/WebCore/rendering/style/RenderStyle.h b/Source/WebCore/rendering/style/RenderStyle.h
index 335d4d7b411a1407cbbb111842a735d7552f5287..15d5ebccc56c3a6ddbbf8517fc20c88fd7eec595 100644 (file)
--- a/Source/WebCore/rendering/style/RenderStyle.h
+++ b/Source/WebCore/rendering/style/RenderStyle.h
@@ -1462,9 +1462,21 @@ public:
 
     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; }
 
@@ -1715,12 +1727,6 @@ private:
         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(); }
Mirror of the WebKit open source project from svn.webkit.org.