Upstream version 10.39.225.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 000ef1c..682f227 100644 (file)
--- a/src/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp
+++ b/src/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "core/css/CSSImageSetValue.h"
 
-#include "FetchInitiatorTypeNames.h"
+#include "core/FetchInitiatorTypeNames.h"
 #include "core/css/CSSImageValue.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/dom/Document.h"
@@ -37,7 +37,7 @@
 #include "core/rendering/style/StylePendingImage.h"
 #include "wtf/text/StringBuilder.h"
 
-namespace WebCore {
+namespace blink {
 
 CSSImageSetValue::CSSImageSetValue()
     : CSSValueList(ImageSetClass, CommaSeparator)
@@ -105,8 +105,7 @@ 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));
+            request.mutableResourceRequest().setHTTPReferrer(image.referrer);
 
             if (options.corsEnabled == IsCORSEnabled)
                 request.setCrossOriginAccessControl(loader->document()->securityOrigin(), options.allowCredentials, options.credentialsRequested);
@@ -150,7 +149,7 @@ String CSSImageSetValue::customCSSText() const
     size_t i = 0;
     while (i < length) {
         if (i > 0)
-            result.append(", ");
+            result.appendLiteral(", ");
 
         const CSSValue* imageValue = item(i);
         result.append(imageValue->cssText());
@@ -167,7 +166,7 @@ String CSSImageSetValue::customCSSText() const
         ++i;
     }
 
-    result.append(")");
+    result.append(')');
     return result.toString();
 }
 
@@ -193,4 +192,4 @@ PassRefPtrWillBeRawPtr<CSSImageSetValue> CSSImageSetValue::cloneForCSSOM() const
     return adoptRefWillBeNoop(new CSSImageSetValue(*this));
 }
 
-} // namespace WebCore
+} // namespace blink