Title: [125301] trunk/Source/WebCore
- Revision
- 125301
- Author
- [email protected]
- Date
- 2012-08-10 11:21:06 -0700 (Fri, 10 Aug 2012)
Log Message
Wrap INLINE_FLEX in a #if ENABLE(CSS3_FLEXBOX).
Unreviewed build fix.
* rendering/style/RenderStyle.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (125300 => 125301)
--- trunk/Source/WebCore/ChangeLog 2012-08-10 17:57:03 UTC (rev 125300)
+++ trunk/Source/WebCore/ChangeLog 2012-08-10 18:21:06 UTC (rev 125301)
@@ -1,3 +1,10 @@
+2012-08-10 Ojan Vafai <[email protected]>
+
+ Wrap INLINE_FLEX in a #if ENABLE(CSS3_FLEXBOX).
+ Unreviewed build fix.
+
+ * rendering/style/RenderStyle.h:
+
2012-08-10 Dan Bernstein <[email protected]>
Renamed the “Modules/webaudio” group in the Xcode project to “webaudio” and moved it into
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (125300 => 125301)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2012-08-10 17:57:03 UTC (rev 125300)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2012-08-10 18:21:06 UTC (rev 125301)
@@ -1740,7 +1740,11 @@
bool isDisplayReplacedType(EDisplay display) const
{
- return display == INLINE_BLOCK || display == INLINE_BOX || display == INLINE_FLEX || display == INLINE_TABLE || display == INLINE_GRID;
+ return display == INLINE_BLOCK || display == INLINE_BOX
+#if ENABLE(CSS3_FLEXBOX)
+ || display == INLINE_FLEX
+#endif
+ || display == INLINE_TABLE || display == INLINE_GRID;
}
bool isDisplayInlineType(EDisplay display) const
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
