Changeset 109014 in webkit

Timestamp:

Feb 27, 2012 12:33:27 PM (12 years ago)

Author:

ojan@chromium.org

Message:

implement display: -webkit-inline-flexbox
​https://bugs.webkit.org/show_bug.cgi?id=77772

Reviewed by David Hyatt.

Source/WebCore:

Tests: css3/flexbox/inline-flexbox-expected.html

css3/flexbox/inline-flexbox.html

• rendering/style/RenderStyle.h:

-Add INLINE_FLEXBOX to the list of replaced display types.
-Restructure the isDisplayInline methods to avoid code duplication.

LayoutTests:

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

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-27  Ojan Vafai  <ojan@chromium.org>
+
+        implement display: -webkit-inline-flexbox
+        https://bugs.webkit.org/show_bug.cgi?id=77772
+
+        Reviewed by David Hyatt.
+
+        * css3/flexbox/inline-flexbox-expected.html: Added.
+        * css3/flexbox/inline-flexbox.html: Added.
+
 2012-02-27  Ken Buchanan  <kenrb@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-27  Ojan Vafai  <ojan@chromium.org>
+
+        implement display: -webkit-inline-flexbox
+        https://bugs.webkit.org/show_bug.cgi?id=77772
+
+        Reviewed by David Hyatt.
+
+        Tests: css3/flexbox/inline-flexbox-expected.html
+               css3/flexbox/inline-flexbox.html
+
+        * rendering/style/RenderStyle.h:
+        -Add INLINE_FLEXBOX to the list of replaced display types.
+        -Restructure the isDisplayInline methods to avoid code duplication.
+
 2012-02-27  Ken Buchanan  <kenrb@chromium.org>
 

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

@@ -1451 +1451 @@
     StyleDifference diff(const RenderStyle*, unsigned& changedContextSensitiveProperties) const;
 
-    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;
-    }
+    bool isDisplayReplacedType() const { return isDisplayReplacedType(display()); }
+    bool isDisplayInlineType() const { return isDisplayInlineType(display()); }
+    bool isOriginalDisplayInlineType() const { return isDisplayInlineType(originalDisplay()); }
 
     void setWritingMode(WritingMode v) { inherited_flags.m_writingMode = v; }
@@ -1716 +1704 @@
     }
 
+    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.
     const Color& invalidColor() const { static Color invalid; return invalid; }