Resolve CSS url(...) non-<image> values against the correct base

third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp

 // Copyright 2015 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 "core/css/parser/CSSPropertyParser.h"
 
 #include "core/StylePropertyShorthand.h"
 #include "core/css/CSSBasicShapeValues.h"
 #include "core/css/CSSBorderImage.h"
 #include "core/css/CSSContentDistributionValue.h"
@@ skipping 1169 matching lines @@
   return filterValue;
 }
 
 static CSSValue* consumeFilter(CSSParserTokenRange& range,
                                const CSSParserContext* context) {
   if (range.peek().id() == CSSValueNone)
     return consumeIdent(range);
 
   CSSValueList* list = CSSValueList::createSpaceSeparated();
   do {
-    CSSValue* filterValue = consumeUrl(range);
+    CSSValue* filterValue = consumeUrl(range, context);
     if (!filterValue) {
       filterValue = consumeFilterFunction(range, context);
       if (!filterValue)
         return nullptr;
     }
     list->append(*filterValue);
   } while (!range.atEnd());
   return list;
 }
 
@@ skipping 373 matching lines @@
                                                               cssParserMode);
 }
 
 static CSSValue* consumePositionY(CSSParserTokenRange& range,
                                   CSSParserMode cssParserMode) {
   return consumePositionLonghand<CSSValueTop, CSSValueBottom>(range,
                                                               cssParserMode);
 }
 
 static CSSValue* consumePaintStroke(CSSParserTokenRange& range,
-                                    CSSParserMode cssParserMode) {
+                                    const CSSParserContext* context) {
   if (range.peek().id() == CSSValueNone)
     return consumeIdent(range);
-  CSSURIValue* url = consumeUrl(range);
+  CSSURIValue* url = consumeUrl(range, context);
   if (url) {
     CSSValue* parsedValue = nullptr;
     if (range.peek().id() == CSSValueNone)
       parsedValue = consumeIdent(range);
     else
-      parsedValue = consumeColor(range, cssParserMode);
+      parsedValue = consumeColor(range, context->mode());
     if (parsedValue) {
       CSSValueList* values = CSSValueList::createSpaceSeparated();
       values->append(*url);
       values->append(*parsedValue);
       return values;
     }
     return url;
   }
-  return consumeColor(range, cssParserMode);
+  return consumeColor(range, context->mode());
 }
 
-static CSSValue* consumeNoneOrURI(CSSParserTokenRange& range) {
+static CSSValue* consumeNoneOrURI(CSSParserTokenRange& range,
+                                  const CSSParserContext* context) {
   if (range.peek().id() == CSSValueNone)
     return consumeIdent(range);
-  return consumeUrl(range);
+  return consumeUrl(range, context);
 }
 
 static CSSValue* consumeBaselineShift(CSSParserTokenRange& range) {
   CSSValueID id = range.peek().id();
   if (id == CSSValueBaseline || id == CSSValueSub || id == CSSValueSuper)
     return consumeIdent(range);
   return consumeLengthOrPercent(range, SVGAttributeMode, ValueRangeAll);
 }
 
 static CSSValue* consumeRxOrRy(CSSParserTokenRange& range) {
@@ skipping 403 matching lines @@
   if (!shape || !args.atEnd())
     return nullptr;
   range = rangeCopy;
   return shape;
 }
 
 static CSSValue* consumeClipPath(CSSParserTokenRange& range,
                                  const CSSParserContext* context) {
   if (range.peek().id() == CSSValueNone)
     return consumeIdent(range);
-  if (CSSURIValue* url = consumeUrl(range))
+  if (CSSURIValue* url = consumeUrl(range, context))
     return url;
   return consumeBasicShape(range, context);
 }
 
 static CSSValue* consumeShapeOutside(CSSParserTokenRange& range,
                                      const CSSParserContext* context) {
   if (CSSValue* imageValue = consumeImageOrNone(range, context))
     return imageValue;
   CSSValueList* list = CSSValueList::createSpaceSeparated();
   if (CSSValue* boxValue = consumeShapeBox(range))
@@ skipping 1144 matching lines @@
           m_range, m_context,
           unresolvedProperty == CSSPropertyAliasWebkitTransform);
     case CSSPropertyWebkitTransformOriginX:
     case CSSPropertyWebkitPerspectiveOriginX:
       return consumePositionX(m_range, m_context->mode());
     case CSSPropertyWebkitTransformOriginY:
     case CSSPropertyWebkitPerspectiveOriginY:
       return consumePositionY(m_range, m_context->mode());
     case CSSPropertyFill:
     case CSSPropertyStroke:
-      return consumePaintStroke(m_range, m_context->mode());
+      return consumePaintStroke(m_range, m_context);
     case CSSPropertyMarkerStart:
     case CSSPropertyMarkerMid:
     case CSSPropertyMarkerEnd:
     case CSSPropertyMask:
-      return consumeNoneOrURI(m_range);
+      return consumeNoneOrURI(m_range, m_context);
     case CSSPropertyFlexGrow:
     case CSSPropertyFlexShrink:
       return consumeNumber(m_range, ValueRangeNonNegative);
     case CSSPropertyColumnRuleWidth:
       return consumeColumnRuleWidth(m_range, m_context->mode());
     case CSSPropertyStrokeOpacity:
     case CSSPropertyFillOpacity:
     case CSSPropertyStopOpacity:
     case CSSPropertyFloodOpacity:
     case CSSPropertyOpacity:
@@ skipping 1600 matching lines @@
     case CSSPropertyGridTemplate:
       return consumeGridTemplateShorthand(CSSPropertyGridTemplate, important);
     case CSSPropertyGrid:
       return consumeGridShorthand(important);
     default:
       return false;
   }
 }
 
 }  // namespace blink