| Index: third_party/WebKit/Source/core/css/parser/CSSParser.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/parser/CSSParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSParser.cpp
|
| index 413bbf7eb1e3a0fcc67b193d840e51f3255527e7..8b476f32fc8834e2d69d852ccc92919ce69136eb 100644
|
| --- a/third_party/WebKit/Source/core/css/parser/CSSParser.cpp
|
| +++ b/third_party/WebKit/Source/core/css/parser/CSSParser.cpp
|
| @@ -43,7 +43,7 @@ CSSSelectorList CSSParser::parsePageSelector(const CSSParserContext& context, St
|
| return CSSParserImpl::parsePageSelector(scope.tokenRange(), styleSheetContents);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<StyleRuleBase> CSSParser::parseRule(const CSSParserContext& context, StyleSheetContents* styleSheet, const String& rule)
|
| +RawPtr<StyleRuleBase> CSSParser::parseRule(const CSSParserContext& context, StyleSheetContents* styleSheet, const String& rule)
|
| {
|
| return CSSParserImpl::parseRule(rule, context, styleSheet, CSSParserImpl::AllowImportRules);
|
| }
|
| @@ -64,7 +64,7 @@ bool CSSParser::parseValue(MutableStylePropertySet* declaration, CSSPropertyID u
|
| return false;
|
| CSSPropertyID resolvedProperty = resolveCSSPropertyID(unresolvedProperty);
|
| CSSParserMode parserMode = declaration->cssParserMode();
|
| - RefPtrWillBeRawPtr<CSSValue> value = CSSParserFastPaths::maybeParseValue(resolvedProperty, string, parserMode);
|
| + RawPtr<CSSValue> value = CSSParserFastPaths::maybeParseValue(resolvedProperty, string, parserMode);
|
| if (value)
|
| return declaration->setProperty(CSSProperty(resolvedProperty, value.release(), important));
|
| CSSParserContext context(parserMode, 0);
|
| @@ -94,19 +94,19 @@ bool CSSParser::parseValue(MutableStylePropertySet* declaration, CSSPropertyID u
|
| return CSSParserImpl::parseValue(declaration, unresolvedProperty, string, important, context);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValue> CSSParser::parseSingleValue(CSSPropertyID propertyID, const String& string, const CSSParserContext& context)
|
| +RawPtr<CSSValue> CSSParser::parseSingleValue(CSSPropertyID propertyID, const String& string, const CSSParserContext& context)
|
| {
|
| if (string.isEmpty())
|
| return nullptr;
|
| - if (RefPtrWillBeRawPtr<CSSValue> value = CSSParserFastPaths::maybeParseValue(propertyID, string, context.mode()))
|
| + if (RawPtr<CSSValue> value = CSSParserFastPaths::maybeParseValue(propertyID, string, context.mode()))
|
| return value;
|
| - RefPtrWillBeRawPtr<MutableStylePropertySet> stylePropertySet = MutableStylePropertySet::create(HTMLQuirksMode);
|
| + RawPtr<MutableStylePropertySet> stylePropertySet = MutableStylePropertySet::create(HTMLQuirksMode);
|
| bool changed = parseValue(stylePropertySet.get(), propertyID, string, false, context);
|
| ASSERT_UNUSED(changed, changed == stylePropertySet->hasProperty(propertyID));
|
| return stylePropertySet->getPropertyCSSValue(propertyID);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<ImmutableStylePropertySet> CSSParser::parseInlineStyleDeclaration(const String& styleString, Element* element)
|
| +RawPtr<ImmutableStylePropertySet> CSSParser::parseInlineStyleDeclaration(const String& styleString, Element* element)
|
| {
|
| return CSSParserImpl::parseInlineStyleDeclaration(styleString, element);
|
| }
|
| @@ -116,9 +116,9 @@ PassOwnPtr<Vector<double>> CSSParser::parseKeyframeKeyList(const String& keyList
|
| return CSSParserImpl::parseKeyframeKeyList(keyList);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<StyleRuleKeyframe> CSSParser::parseKeyframeRule(const CSSParserContext& context, const String& rule)
|
| +RawPtr<StyleRuleKeyframe> CSSParser::parseKeyframeRule(const CSSParserContext& context, const String& rule)
|
| {
|
| - RefPtrWillBeRawPtr<StyleRuleBase> keyframe = CSSParserImpl::parseRule(rule, context, nullptr, CSSParserImpl::KeyframeRules);
|
| + RawPtr<StyleRuleBase> keyframe = CSSParserImpl::parseRule(rule, context, nullptr, CSSParserImpl::KeyframeRules);
|
| return toStyleRuleKeyframe(keyframe.get());
|
| }
|
|
|
| @@ -142,7 +142,7 @@ bool CSSParser::parseColor(Color& color, const String& string, bool strict)
|
| return true;
|
| }
|
|
|
| - RefPtrWillBeRawPtr<CSSValue> value = CSSParserFastPaths::parseColor(string, strict ? HTMLStandardMode : HTMLQuirksMode);
|
| + RawPtr<CSSValue> value = CSSParserFastPaths::parseColor(string, strict ? HTMLStandardMode : HTMLQuirksMode);
|
| // TODO(timloh): Why is this always strict mode?
|
| if (!value)
|
| value = parseSingleValue(CSSPropertyColor, string, strictCSSParserContext());
|
| @@ -165,7 +165,7 @@ bool CSSParser::parseSystemColor(Color& color, const String& colorString)
|
| return true;
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValue> CSSParser::parseFontFaceDescriptor(CSSPropertyID propertyID, const String& propertyValue, const CSSParserContext& context)
|
| +RawPtr<CSSValue> CSSParser::parseFontFaceDescriptor(CSSPropertyID propertyID, const String& propertyValue, const CSSParserContext& context)
|
| {
|
| StringBuilder builder;
|
| builder.appendLiteral("@font-face { ");
|
| @@ -173,7 +173,7 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSParser::parseFontFaceDescriptor(CSSPropertyI
|
| builder.appendLiteral(" : ");
|
| builder.append(propertyValue);
|
| builder.appendLiteral("; }");
|
| - RefPtrWillBeRawPtr<StyleRuleBase> rule = parseRule(context, nullptr, builder.toString());
|
| + RawPtr<StyleRuleBase> rule = parseRule(context, nullptr, builder.toString());
|
| if (!rule || !rule->isFontFaceRule())
|
| return nullptr;
|
| return toStyleRuleFontFace(rule.get())->properties().getPropertyCSSValue(propertyID);
|
|
|