Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(484)

Unified Diff: Source/core/css/parser/SizesAttributeParser.cpp

Issue 236713005: Use SizesAttributeParser to get the right srcset resource (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@sizes_parser8
Patch Set: Fixed nits Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/parser/MediaQueryTokenizer.cpp ('k') | Source/core/css/parser/SizesAttributeParserTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/parser/SizesAttributeParser.cpp
diff --git a/Source/core/css/parser/SizesAttributeParser.cpp b/Source/core/css/parser/SizesAttributeParser.cpp
index 4fd32365b7f52f793a534c9e60553c2585ab4ed0..d71d20f2bd7dac74dbf64ea26ea921d34436b79f 100644
--- a/Source/core/css/parser/SizesAttributeParser.cpp
+++ b/Source/core/css/parser/SizesAttributeParser.cpp
@@ -29,16 +29,12 @@ bool SizesAttributeParser::calculateLengthInPixels(TokenIterator startToken, Tok
int length;
if (!CSSPrimitiveValue::isLength(startToken->unitType()))
return false;
- if (m_mediaValues->computeLength(startToken->numericValue(), startToken->unitType(), length)) {
- if (length > 0) {
- result = (unsigned)length;
- return true;
- }
+ if ((m_mediaValues->computeLength(startToken->numericValue(), startToken->unitType(), length)) && (length > 0)) {
+ result = (unsigned)length;
+ return true;
}
}
- if (type == FunctionToken) {
- // FIXME - Handle calc() functions here!
- }
+ // FIXME - Handle calc() FunctionToken here!
return false;
}
@@ -101,6 +97,8 @@ bool SizesAttributeParser::parseMediaConditionAndLength(TokenIterator startToken
bool SizesAttributeParser::parse(Vector<MediaQueryToken>& tokens)
{
+ if (tokens.isEmpty())
+ return false;
TokenIterator startToken = tokens.begin();
TokenIterator endToken;
// Split on a comma token, and send the result tokens to be parsed as (media-condition, length) pairs
« no previous file with comments | « Source/core/css/parser/MediaQueryTokenizer.cpp ('k') | Source/core/css/parser/SizesAttributeParserTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698