Title: [122700] trunk/Source/WebCore
- Revision
- 122700
- Author
- [email protected]
- Date
- 2012-07-16 00:11:03 -0700 (Mon, 16 Jul 2012)
Log Message
Compilation failure in StyleResolver.cpp (clang)
https://bugs.webkit.org/show_bug.cgi?id=89892
Reviewed by Ryosuke Niwa.
Patch adds assertions that unreachable code is in fact not reached.
Covered by fast/css/variables tests.
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::collectMatchingRulesForList):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (122699 => 122700)
--- trunk/Source/WebCore/ChangeLog 2012-07-16 06:50:28 UTC (rev 122699)
+++ trunk/Source/WebCore/ChangeLog 2012-07-16 07:11:03 UTC (rev 122700)
@@ -1,3 +1,19 @@
+2012-07-16 Luke Macpherson <[email protected]>
+
+ Compilation failure in StyleResolver.cpp (clang)
+ https://bugs.webkit.org/show_bug.cgi?id=89892
+
+ Reviewed by Ryosuke Niwa.
+
+ Patch adds assertions that unreachable code is in fact not reached.
+
+ Covered by fast/css/variables tests.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::collectMatchingRulesForList):
+
2012-07-15 Mike Lawther <[email protected]>
Fix calculation of rgba's alpha in CSS custom text
Modified: trunk/Source/WebCore/css/CSSParser.cpp (122699 => 122700)
--- trunk/Source/WebCore/css/CSSParser.cpp 2012-07-16 06:50:28 UTC (rev 122699)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2012-07-16 07:11:03 UTC (rev 122700)
@@ -1682,6 +1682,7 @@
m_valueList->next();
return true;
}
+ ASSERT(propId != CSSPropertyVariable);
#endif
if (isKeywordPropertyID(propId)) {
@@ -2694,11 +2695,6 @@
m_valueList->next();
break;
#endif
-#if ENABLE(CSS_VARIABLES)
- case CSSPropertyVariable:
- // FIXME: This should have an actual implementation.
- return false;
-#endif
case CSSPropertyBorderBottomStyle:
case CSSPropertyBorderCollapse:
case CSSPropertyBorderLeftStyle:
@@ -2735,6 +2731,9 @@
case CSSPropertyTextTransform:
case CSSPropertyTextUnderlineMode:
case CSSPropertyTextUnderlineStyle:
+#if ENABLE(CSS_VARIABLES)
+ case CSSPropertyVariable:
+#endif
case CSSPropertyVisibility:
case CSSPropertyWebkitAppearance:
case CSSPropertyWebkitBackfaceVisibility:
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (122699 => 122700)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2012-07-16 06:50:28 UTC (rev 122699)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2012-07-16 07:11:03 UTC (rev 122700)
@@ -4105,11 +4105,6 @@
m_style->setGridItemRow(row);
return;
}
-#if ENABLE(CSS_VARIABLES)
- case CSSPropertyVariable:
- // FIXME: This should have an actual implementation.
- return;
-#endif
// These properties are implemented in the StyleBuilder lookup table.
case CSSPropertyBackgroundAttachment:
case CSSPropertyBackgroundClip:
@@ -4226,6 +4221,9 @@
case CSSPropertyTextTransform:
case CSSPropertyTop:
case CSSPropertyUnicodeBidi:
+#if ENABLE(CSS_VARIABLES)
+ case CSSPropertyVariable:
+#endif
case CSSPropertyVerticalAlign:
case CSSPropertyVisibility:
case CSSPropertyWebkitAnimationDelay:
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
