Title: [120080] trunk/Source/WebCore
- Revision
- 120080
- Author
- commit-qu...@webkit.org
- Date
- 2012-06-12 08:29:33 -0700 (Tue, 12 Jun 2012)
Log Message
Generate -webkit-box-decoration-break property only when the feature is enabled
https://bugs.webkit.org/show_bug.cgi?id=88861
Patch by Thiago Marcos P. Santos <thiago.san...@intel.com> on 2012-06-12
Reviewed by Alexis Menard.
Otherwise it will hit an assertion if the property is present on the
style but the feature disabled. Also fixes a compilation warning when
the feature is disabled.
* css/CSSPropertyNames.in:
* css/StyleResolver.cpp:
(WebCore::StyleResolver::collectMatchingRulesForList):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (120079 => 120080)
--- trunk/Source/WebCore/ChangeLog 2012-06-12 15:11:35 UTC (rev 120079)
+++ trunk/Source/WebCore/ChangeLog 2012-06-12 15:29:33 UTC (rev 120080)
@@ -1,3 +1,18 @@
+2012-06-12 Thiago Marcos P. Santos <thiago.san...@intel.com>
+
+ Generate -webkit-box-decoration-break property only when the feature is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=88861
+
+ Reviewed by Alexis Menard.
+
+ Otherwise it will hit an assertion if the property is present on the
+ style but the feature disabled. Also fixes a compilation warning when
+ the feature is disabled.
+
+ * css/CSSPropertyNames.in:
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::collectMatchingRulesForList):
+
2012-06-12 Darin Adler <da...@apple.com>
Tweaked the Mac export file a bit more, adding more-correct iOS cases.
Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (120079 => 120080)
--- trunk/Source/WebCore/css/CSSPropertyNames.in 2012-06-12 15:11:35 UTC (rev 120079)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2012-06-12 15:29:33 UTC (rev 120080)
@@ -256,7 +256,9 @@
-webkit-column-span
-webkit-column-width
-webkit-columns
+#if defined(ENABLE_CSS_BOX_DECORATION_BREAK) && ENABLE_CSS_BOX_DECORATION_BREAK
-webkit-box-decoration-break
+#endif
#if defined(ENABLE_CSS_FILTERS) && ENABLE_CSS_FILTERS
-webkit-filter
#endif
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (120079 => 120080)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2012-06-12 15:11:35 UTC (rev 120079)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2012-06-12 15:29:33 UTC (rev 120080)
@@ -4098,7 +4098,9 @@
case CSSPropertyWebkitBorderRadius:
case CSSPropertyWebkitBorderVerticalSpacing:
case CSSPropertyWebkitBoxAlign:
+#if ENABLE(CSS_BOX_DECORATION_BREAK)
case CSSPropertyWebkitBoxDecorationBreak:
+#endif
case CSSPropertyWebkitBoxDirection:
case CSSPropertyWebkitBoxFlex:
case CSSPropertyWebkitBoxFlexGroup:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
