Split up inspector interfaces to CSSParser::parse(Sheet/DeclarationList)

Source/core/css/parser/CSSParser.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/css/parser/CSSParser.h"
 
 #include "core/css/CSSKeyframeRule.h"
 #include "core/css/StyleColor.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/StyleRule.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/css/parser/CSSParserFastPaths.h"
 #include "core/css/parser/CSSParserImpl.h"
 #include "core/css/parser/CSSPropertyParser.h"
 #include "core/css/parser/CSSSelectorParser.h"
 #include "core/css/parser/CSSSupportsParser.h"
 #include "core/css/parser/CSSTokenizer.h"
 #include "core/layout/LayoutTheme.h"
 
 namespace blink {
 
-bool CSSParser::parseDeclarationList(const CSSParserContext& context, MutableStylePropertySet* propertySet, const String& declaration, CSSParserObserver* observer)
+bool CSSParser::parseDeclarationList(const CSSParserContext& context, MutableStylePropertySet* propertySet, const String& declaration)
 {
-    if (observer) {
-        CSSParserImpl::parseDeclarationListForInspector(declaration, context, *observer);
-        return true;
-    }
     return CSSParserImpl::parseDeclarationList(propertySet, declaration, context);
 }
 
+void CSSParser::parseDeclarationListForInspector(const CSSParserContext& context, const String& declaration, CSSParserObserver& observer)
+{
+    CSSParserImpl::parseDeclarationListForInspector(declaration, context, observer);
+}
+
 void CSSParser::parseSelector(const CSSParserContext& context, const String& selector, CSSSelectorList& selectorList)
 {
     CSSTokenizer::Scope scope(selector);
     CSSSelectorParser::parseSelector(scope.tokenRange(), context, starAtom, nullptr, selectorList);
 }
 
 PassRefPtrWillBeRawPtr<StyleRuleBase> CSSParser::parseRule(const CSSParserContext& context, const String& rule)
 {
     return CSSParserImpl::parseRule(rule, context, CSSParserImpl::AllowImportRules);
 }
 
-void CSSParser::parseSheet(const CSSParserContext& context, StyleSheetContents* styleSheet, const String& text, CSSParserObserver* observer)
+void CSSParser::parseSheet(const CSSParserContext& context, StyleSheetContents* styleSheet, const String& text)
 {
-    if (observer)
-        return CSSParserImpl::parseStyleSheetForInspector(text, context, *observer);
     return CSSParserImpl::parseStyleSheet(text, context, styleSheet);
 }
 
+void CSSParser::parseSheetForInspector(const CSSParserContext& context, const String& text, CSSParserObserver& observer)
+{
+    return CSSParserImpl::parseStyleSheetForInspector(text, context, observer);
+}
+
 bool CSSParser::parseValue(MutableStylePropertySet* declaration, CSSPropertyID unresolvedProperty, const String& string, bool important, CSSParserMode parserMode, StyleSheetContents* styleSheet)
 {
     if (string.isEmpty())
         return false;
     CSSPropertyID resolvedProperty = resolveCSSPropertyID(unresolvedProperty);
     RefPtrWillBeRawPtr<CSSValue> value = CSSParserFastPaths::maybeParseValue(resolvedProperty, string, parserMode);
     if (value)
         return declaration->setProperty(CSSProperty(resolvedProperty, value.release(), important));
     CSSParserContext context(parserMode, 0);
     if (styleSheet) {
@@ skipping 102 matching lines @@
     builder.appendLiteral(" : ");
     builder.append(propertyValue);
     builder.appendLiteral("; }");
     RefPtrWillBeRawPtr<StyleRuleBase> rule = parseRule(context, builder.toString());
     if (!rule || !rule->isFontFaceRule())
         return nullptr;
     return toStyleRuleFontFace(rule.get())->properties().getPropertyCSSValue(propertyID);
 }
 
 } // namespace blink