Have srcset respond to viewport changes

Source/core/css/parser/SizesAttributeParser.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/SizesAttributeParser.h"
 
 #include "core/MediaTypeNames.h"
 #include "core/css/MediaQueryEvaluator.h"
 #include "core/css/parser/MediaQueryTokenizer.h"
 #include "core/css/parser/SizesCalcParser.h"
 
 namespace blink {
 
-unsigned SizesAttributeParser::findEffectiveSize(const String& attribute, PassRefPtr<MediaValues> mediaValues)
+SizesAttributeParser::SizesAttributeParser(PassRefPtr<MediaValues> mediaValues, const String& attribute)
+    : m_mediaValues(mediaValues)
+    , m_length(0)
+    , m_lengthWasSet(false)
+    , m_viewportDependant(false)
 {
-    Vector<MediaQueryToken> tokens;
-    SizesAttributeParser parser(mediaValues);
+    MediaQueryTokenizer::tokenize(attribute, m_tokens);
+    m_isValid = parse(m_tokens);
+}
 
-    MediaQueryTokenizer::tokenize(attribute, tokens);
-    if (!parser.parse(tokens))
-        return parser.effectiveSizeDefaultValue();
-    return parser.effectiveSize();
+unsigned SizesAttributeParser::length()
+{
+    if (m_isValid)
+        return effectiveSize();
+    return effectiveSizeDefaultValue();
 }
 
 bool SizesAttributeParser::calculateLengthInPixels(MediaQueryTokenIterator startToken, MediaQueryTokenIterator endToken, unsigned& result)
 {
     if (startToken == endToken)
         return false;
     MediaQueryTokenType type = startToken->type();
     if (type == DimensionToken) {
         int length;
         if (!CSSPrimitiveValue::isLength(startToken->unitType()))
             return false;
+        m_viewportDependant = CSSPrimitiveValue::isViewportPercentageLength(startToken->unitType());

[esprehn, 2014/08/01 14:06:44]

Does this need to be m_viewportDependant ||
CSSPrimitiveValue::isViewportPercentageLength(startToken->unitType()); ?

         if ((m_mediaValues->computeLength(startToken->numericValue(), startToken->unitType(), length)) && (length > 0)) {
             result = (unsigned)length;
             return true;
         }
     } else if (type == FunctionToken) {
-        return SizesCalcParser::parse(startToken, endToken, m_mediaValues, result);
+        SizesCalcParser calcParser(startToken, endToken, m_mediaValues);
+        if (!calcParser.isValid())
+            return false;
+        m_viewportDependant = m_viewportDependant || calcParser.viewportDependant();
+        result = calcParser.result();
+        return true;
     } else if (type == NumberToken && !startToken->numericValue()) {
         result = 0;
         return true;
     }
 
     return false;
 }
 
 static void reverseSkipIrrelevantTokens(MediaQueryTokenIterator& token, MediaQueryTokenIterator startToken)
 {
@@ skipping 75 matching lines @@
 
 unsigned SizesAttributeParser::effectiveSize()
 {
     if (m_lengthWasSet)
         return m_length;
     return effectiveSizeDefaultValue();
 }
 
 unsigned SizesAttributeParser::effectiveSizeDefaultValue()
 {
-    // Returning the equivalent of "100%"
+    // Returning the equivalent of "100vw"
+    m_viewportDependant = true;
     return m_mediaValues->viewportWidth();
 }
 
 } // namespace