| Index: Source/core/css/parser/CSSParser.cpp
|
| diff --git a/Source/core/css/parser/CSSParser.cpp b/Source/core/css/parser/CSSParser.cpp
|
| index a67f8ab8dedb352a7717278a1b68fa0746a61876..4d82c9f8ccf1c9a72e7ccfce0ea5760045a87849 100644
|
| --- a/Source/core/css/parser/CSSParser.cpp
|
| +++ b/Source/core/css/parser/CSSParser.cpp
|
| @@ -20,15 +20,16 @@
|
|
|
| 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);
|
| @@ -40,13 +41,16 @@ PassRefPtrWillBeRawPtr<StyleRuleBase> CSSParser::parseRule(const CSSParserContex
|
| 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())
|
|
|