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

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

Index: third_party/WebKit/Source/core/css/CSSValue.cpp
diff --git a/third_party/WebKit/Source/core/css/CSSValue.cpp b/third_party/WebKit/Source/core/css/CSSValue.cpp
index 4401b1139785f9b9762d31e59493acb0af7729db..257b780be4f4014a7c4b12625a6359c9b9a9bd31 100644
--- a/third_party/WebKit/Source/core/css/CSSValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSValue.cpp
@@ -112,6 +112,28 @@ bool CSSValue::hasFailedOrCanceledSubresources() const {
   return false;
 }
 
+bool CSSValue::mayContainUrl() const {
+  if (isValueList())
+    return toCSSValueList(*this).mayContainUrl();
+  return isImageValue() || isURIValue();
+}
+
+void CSSValue::reResolveUrl(const Document& document) const {
+  // TODO(fs): Should handle all values that can contain URLs.
+  if (isImageValue()) {
+    toCSSImageValue(*this).reResolveURL(document);
+    return;
+  }
+  if (isURIValue()) {
+    toCSSURIValue(*this).reResolveUrl(document);
+    return;
+  }
+  if (isValueList()) {
+    toCSSValueList(*this).reResolveUrl(document);
+    return;
+  }
+}
+
 template <class ChildClassType>
 inline static bool compareCSSValues(const CSSValue& first,
                                     const CSSValue& second) {