Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / css / CSSImageSetValue.cpp

diff --git a/src/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp b/src/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp
index 62fda35..000ef1c 100644 (file)
--- a/src/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp
+++ b/src/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp
@@ -57,8 +57,8 @@ void CSSImageSetValue::fillImageSet()
     size_t length = this->length();
     size_t i = 0;
     while (i < length) {
-        CSSValue* imageValue = item(i);
-        String imageURL = toCSSImageValue(imageValue)->url();
+        CSSImageValue* imageValue = toCSSImageValue(item(i));
+        String imageURL = imageValue->url();
 
         ++i;
         ASSERT_WITH_SECURITY_IMPLICATION(i < length);
@@ -67,6 +67,7 @@ void CSSImageSetValue::fillImageSet()
 
         ImageWithScale image;
         image.imageURL = imageURL;
+        image.referrer = imageValue->referrer();
         image.scaleFactor = scaleFactor;
         m_imagesInSet.append(image);
         ++i;
@@ -104,6 +105,8 @@ StyleFetchedImageSet* CSSImageSetValue::cachedImageSet(ResourceFetcher* loader,
         ImageWithScale image = bestImageForScaleFactor();
         if (Document* document = loader->document()) {
             FetchRequest request(ResourceRequest(document->completeURL(image.imageURL)), FetchInitiatorTypeNames::css, options);
+            if (!image.referrer.isEmpty())
+                request.mutableResourceRequest().setHTTPReferrer(Referrer(image.referrer, ReferrerPolicyDefault));
 
             if (options.corsEnabled == IsCORSEnabled)
                 request.setCrossOriginAccessControl(loader->document()->securityOrigin(), options.allowCredentials, options.credentialsRequested);
@@ -187,7 +190,7 @@ CSSImageSetValue::CSSImageSetValue(const CSSImageSetValue& cloneFrom)
 
 PassRefPtrWillBeRawPtr<CSSImageSetValue> CSSImageSetValue::cloneForCSSOM() const
 {
-    return adoptRefWillBeRefCountedGarbageCollected(new CSSImageSetValue(*this));
+    return adoptRefWillBeNoop(new CSSImageSetValue(*this));
 }
 
 } // namespace WebCore