Bug 1408312 - Part 2: Replace nsCSSParser usage in inDOMUtils::IsValidCSSColor. r=xidorn draft
authorCameron McCormack <cam@mcc.id.au>
Mon, 16 Oct 2017 09:02:35 +0800
changeset 681163 decfb82dfa419b5a57edb9e2f1d4cd04ed7d5599
parent 681162 cee890ae943bdd855528522ef774bc95adfd4245
child 681164 0fd4e9a3b62c668ab0a6925e70006646a3273e62
push id84782
push userbmo:cam@mcc.id.au
push dateTue, 17 Oct 2017 03:35:29 +0000
reviewersxidorn
bugs1408312
milestone58.0a1
Bug 1408312 - Part 2: Replace nsCSSParser usage in inDOMUtils::IsValidCSSColor. r=xidorn MozReview-Commit-ID: AGo249i7ATL
layout/inspector/inDOMUtils.cpp
--- a/layout/inspector/inDOMUtils.cpp
+++ b/layout/inspector/inDOMUtils.cpp
@@ -47,16 +47,17 @@
 #include "nsCSSValue.h"
 #include "nsColor.h"
 #include "mozilla/StyleSetHandleInlines.h"
 #include "nsStyleUtil.h"
 #include "nsQueryObject.h"
 #include "mozilla/ServoBindings.h"
 #include "mozilla/ServoStyleRule.h"
 #include "mozilla/ServoStyleRuleMap.h"
+#include "mozilla/ServoCSSParser.h"
 
 using namespace mozilla;
 using namespace mozilla::css;
 using namespace mozilla::dom;
 
 ///////////////////////////////////////////////////////////////////////////////
 
 inDOMUtils::inDOMUtils()
@@ -1031,19 +1032,23 @@ inDOMUtils::ColorToRGBA(const nsAString&
   }
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 inDOMUtils::IsValidCSSColor(const nsAString& aColorString, bool *_retval)
 {
+#ifdef MOZ_STYLO
+  *_retval = ServoCSSParser::IsValidCSSColor(aColorString);
+#else
   nsCSSParser cssParser;
   nsCSSValue cssValue;
   *_retval = cssParser.ParseColorString(aColorString, nullptr, 0, cssValue, true);
+#endif
   return NS_OK;
 }
 
 NS_IMETHODIMP
 inDOMUtils::CssPropertyIsValid(const nsAString& aPropertyName,
                                const nsAString& aPropertyValue,
                                bool *_retval)
 {