OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012 Apple Inc. All rights reserved. | 2 * Copyright (C) 2012 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 15 matching lines...) Expand all Loading... |
26 #include "core/css/CSSImageSetValue.h" | 26 #include "core/css/CSSImageSetValue.h" |
27 | 27 |
28 #include "core/css/CSSImageValue.h" | 28 #include "core/css/CSSImageValue.h" |
29 #include "core/css/CSSPrimitiveValue.h" | 29 #include "core/css/CSSPrimitiveValue.h" |
30 #include "core/dom/Document.h" | 30 #include "core/dom/Document.h" |
31 #include "core/fetch/FetchInitiatorTypeNames.h" | 31 #include "core/fetch/FetchInitiatorTypeNames.h" |
32 #include "core/fetch/FetchRequest.h" | 32 #include "core/fetch/FetchRequest.h" |
33 #include "core/fetch/ImageResource.h" | 33 #include "core/fetch/ImageResource.h" |
34 #include "core/fetch/ResourceFetcher.h" | 34 #include "core/fetch/ResourceFetcher.h" |
35 #include "core/fetch/ResourceLoaderOptions.h" | 35 #include "core/fetch/ResourceLoaderOptions.h" |
| 36 #include "core/frame/Settings.h" |
36 #include "core/style/StyleFetchedImageSet.h" | 37 #include "core/style/StyleFetchedImageSet.h" |
37 #include "core/style/StyleInvalidImage.h" | 38 #include "core/style/StyleInvalidImage.h" |
38 #include "platform/weborigin/KURL.h" | 39 #include "platform/weborigin/KURL.h" |
39 #include "platform/weborigin/SecurityPolicy.h" | 40 #include "platform/weborigin/SecurityPolicy.h" |
40 #include "wtf/text/StringBuilder.h" | 41 #include "wtf/text/StringBuilder.h" |
41 #include <algorithm> | 42 #include <algorithm> |
42 | 43 |
43 namespace blink { | 44 namespace blink { |
44 | 45 |
45 CSSImageSetValue::CSSImageSetValue() | 46 CSSImageSetValue::CSSImageSetValue() |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 // Page::pageScaleFactor(), LocalFrame::pageZoomFactor(), and any CSS | 110 // Page::pageScaleFactor(), LocalFrame::pageZoomFactor(), and any CSS |
110 // transforms. https://bugs.webkit.org/show_bug.cgi?id=81698 | 111 // transforms. https://bugs.webkit.org/show_bug.cgi?id=81698 |
111 ImageWithScale image = bestImageForScaleFactor(deviceScaleFactor); | 112 ImageWithScale image = bestImageForScaleFactor(deviceScaleFactor); |
112 FetchRequest request(ResourceRequest(document.completeURL(image.imageURL)), | 113 FetchRequest request(ResourceRequest(document.completeURL(image.imageURL)), |
113 FetchInitiatorTypeNames::css); | 114 FetchInitiatorTypeNames::css); |
114 request.mutableResourceRequest().setHTTPReferrer(image.referrer); | 115 request.mutableResourceRequest().setHTTPReferrer(image.referrer); |
115 | 116 |
116 if (crossOrigin != CrossOriginAttributeNotSet) | 117 if (crossOrigin != CrossOriginAttributeNotSet) |
117 request.setCrossOriginAccessControl(document.getSecurityOrigin(), | 118 request.setCrossOriginAccessControl(document.getSecurityOrigin(), |
118 crossOrigin); | 119 crossOrigin); |
| 120 request.setPlaceholderImageRequestType( |
| 121 document.settings() && document.settings()->fetchImagePlaceholders() |
| 122 ? FetchRequest::AllowPlaceholder |
| 123 : FetchRequest::DisallowPlaceholder); |
119 | 124 |
120 if (ImageResource* cachedImage = | 125 if (ImageResource* cachedImage = |
121 ImageResource::fetch(request, document.fetcher())) | 126 ImageResource::fetch(request, document.fetcher())) |
122 m_cachedImage = StyleFetchedImageSet::create( | 127 m_cachedImage = StyleFetchedImageSet::create( |
123 cachedImage, image.scaleFactor, this, request.url()); | 128 cachedImage, image.scaleFactor, this, request.url()); |
124 else | 129 else |
125 m_cachedImage = StyleInvalidImage::create(image.imageURL); | 130 m_cachedImage = StyleInvalidImage::create(image.imageURL); |
126 m_cachedScaleFactor = deviceScaleFactor; | 131 m_cachedScaleFactor = deviceScaleFactor; |
127 } | 132 } |
128 | 133 |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 CSSImageSetValue* CSSImageSetValue::valueWithURLsMadeAbsolute() { | 180 CSSImageSetValue* CSSImageSetValue::valueWithURLsMadeAbsolute() { |
176 CSSImageSetValue* value = CSSImageSetValue::create(); | 181 CSSImageSetValue* value = CSSImageSetValue::create(); |
177 for (auto& item : *this) | 182 for (auto& item : *this) |
178 item->isImageValue() | 183 item->isImageValue() |
179 ? value->append(*toCSSImageValue(*item).valueWithURLMadeAbsolute()) | 184 ? value->append(*toCSSImageValue(*item).valueWithURLMadeAbsolute()) |
180 : value->append(*item); | 185 : value->append(*item); |
181 return value; | 186 return value; |
182 } | 187 } |
183 | 188 |
184 } // namespace blink | 189 } // namespace blink |
OLD | NEW |