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

third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

 /*
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2011 Sencha, Inc. All rights reserved.
  * Copyright (C) 2015 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1673 matching lines @@
 
   return list;
 }
 
 static CSSValue* adjustSVGPaintForCurrentColor(SVGPaintType paintType,
                                                const String& url,
                                                const Color& color,
                                                const Color& currentColor) {
   if (paintType >= SVG_PAINTTYPE_URI_NONE) {
     CSSValueList* values = CSSValueList::createSpaceSeparated();
-    values->append(*CSSURIValue::create(url));
+    values->append(*CSSURIValue::create(AtomicString(url)));
     if (paintType == SVG_PAINTTYPE_URI_NONE)
       values->append(*CSSIdentifierValue::create(CSSValueNone));
     else if (paintType == SVG_PAINTTYPE_URI_CURRENTCOLOR)
       values->append(*CSSColorValue::create(currentColor.rgb()));
     else if (paintType == SVG_PAINTTYPE_URI_RGBCOLOR)
       values->append(*CSSColorValue::create(color.rgb()));
     return values;
   }
   if (paintType == SVG_PAINTTYPE_NONE)
     return CSSIdentifierValue::create(CSSValueNone);
   if (paintType == SVG_PAINTTYPE_CURRENTCOLOR)
     return CSSColorValue::create(currentColor.rgb());
 
   return CSSColorValue::create(color.rgb());
 }
 
-static inline String serializeAsFragmentIdentifier(
+static inline AtomicString serializeAsFragmentIdentifier(
     const AtomicString& resource) {
   return "#" + resource;
 }
 
 CSSValue* ComputedStyleCSSValueMapping::valueForShadowData(
     const ShadowData& shadow,
     const ComputedStyle& style,
     bool useSpread) {
   CSSPrimitiveValue* x = zoomAdjustedPixelValue(shadow.x(), style);
   CSSPrimitiveValue* y = zoomAdjustedPixelValue(shadow.y(), style);
@@ skipping 1467 matching lines @@
       return valueForContentData(style);
     case CSSPropertyCounterIncrement:
       return valueForCounterDirectives(style, propertyID);
     case CSSPropertyCounterReset:
       return valueForCounterDirectives(style, propertyID);
     case CSSPropertyClipPath:
       if (ClipPathOperation* operation = style.clipPath()) {
         if (operation->type() == ClipPathOperation::SHAPE)
           return valueForBasicShape(
               style, toShapeClipPathOperation(operation)->basicShape());
-        if (operation->type() == ClipPathOperation::REFERENCE)
+        if (operation->type() == ClipPathOperation::REFERENCE) {
           return CSSURIValue::create(
-              toReferenceClipPathOperation(operation)->url());
+              AtomicString(toReferenceClipPathOperation(operation)->url()));
+        }
       }
       return CSSIdentifierValue::create(CSSValueNone);
     case CSSPropertyShapeMargin:
       return CSSValue::create(style.shapeMargin(), style.effectiveZoom());
     case CSSPropertyShapeImageThreshold:
       return CSSPrimitiveValue::create(style.shapeImageThreshold(),
                                        CSSPrimitiveValue::UnitType::Number);
     case CSSPropertyShapeOutside:
       return valueForShape(style, style.shapeOutside());
     case CSSPropertyFilter:
@@ skipping 429 matching lines @@
     case CSSPropertyAll:
       return nullptr;
     default:
       break;
   }
   ASSERT_NOT_REACHED();
   return nullptr;
 }
 
 }  // namespace blink