| Index: third_party/WebKit/Source/core/css/parser/SizesAttributeParser.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/parser/SizesAttributeParser.cpp b/third_party/WebKit/Source/core/css/parser/SizesAttributeParser.cpp
|
| index 97cd6de35d78ef5d681762c23d45f6b656261305..3a2f1f98c6d8bfe79ab7f9677f62dace11be4234 100644
|
| --- a/third_party/WebKit/Source/core/css/parser/SizesAttributeParser.cpp
|
| +++ b/third_party/WebKit/Source/core/css/parser/SizesAttributeParser.cpp
|
| @@ -11,7 +11,7 @@
|
|
|
| namespace blink {
|
|
|
| -SizesAttributeParser::SizesAttributeParser(RawPtr<MediaValues> mediaValues, const String& attribute)
|
| +SizesAttributeParser::SizesAttributeParser(MediaValues* mediaValues, const String& attribute)
|
| : m_mediaValues(mediaValues)
|
| , m_length(0)
|
| , m_lengthWasSet(false)
|
| @@ -53,11 +53,11 @@ bool SizesAttributeParser::calculateLengthInPixels(CSSParserTokenRange range, fl
|
| return false;
|
| }
|
|
|
| -bool SizesAttributeParser::mediaConditionMatches(RawPtr<MediaQuerySet> mediaCondition)
|
| +bool SizesAttributeParser::mediaConditionMatches(MediaQuerySet* mediaCondition)
|
| {
|
| // A Media Condition cannot have a media type other then screen.
|
| MediaQueryEvaluator mediaQueryEvaluator(*m_mediaValues);
|
| - return mediaQueryEvaluator.eval(mediaCondition.get());
|
| + return mediaQueryEvaluator.eval(mediaCondition);
|
| }
|
|
|
| bool SizesAttributeParser::parse(CSSParserTokenRange range)
|
| @@ -79,7 +79,7 @@ bool SizesAttributeParser::parse(CSSParserTokenRange range)
|
| float length;
|
| if (!calculateLengthInPixels(range.makeSubRange(lengthTokenStart, lengthTokenEnd), length))
|
| continue;
|
| - RawPtr<MediaQuerySet> mediaCondition = MediaQueryParser::parseMediaCondition(range.makeSubRange(mediaConditionStart, lengthTokenStart));
|
| + MediaQuerySet* mediaCondition = MediaQueryParser::parseMediaCondition(range.makeSubRange(mediaConditionStart, lengthTokenStart));
|
| if (!mediaCondition || !mediaConditionMatches(mediaCondition))
|
| continue;
|
| m_length = length;
|
|
|