Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Side by Side Diff: third_party/WebKit/Source/core/css/CSSImageSetValue.cpp

Issue 2740253002: Remove FetchRequest::mutableResourceRequest() where removing is trivial (Closed)
Patch Set: Fix Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 CrossOriginAttributeValue crossOrigin) { 103 CrossOriginAttributeValue crossOrigin) {
104 if (!m_imagesInSet.size()) 104 if (!m_imagesInSet.size())
105 fillImageSet(); 105 fillImageSet();
106 106
107 if (isCachePending(deviceScaleFactor)) { 107 if (isCachePending(deviceScaleFactor)) {
108 // FIXME: In the future, we want to take much more than deviceScaleFactor 108 // FIXME: In the future, we want to take much more than deviceScaleFactor
109 // into acount here. All forms of scale should be included: 109 // into acount here. All forms of scale should be included:
110 // Page::pageScaleFactor(), LocalFrame::pageZoomFactor(), and any CSS 110 // Page::pageScaleFactor(), LocalFrame::pageZoomFactor(), and any CSS
111 // transforms. https://bugs.webkit.org/show_bug.cgi?id=81698 111 // transforms. https://bugs.webkit.org/show_bug.cgi?id=81698
112 ImageWithScale image = bestImageForScaleFactor(deviceScaleFactor); 112 ImageWithScale image = bestImageForScaleFactor(deviceScaleFactor);
113 FetchRequest request(ResourceRequest(document.completeURL(image.imageURL)), 113 ResourceRequest resourceRequest(document.completeURL(image.imageURL));
114 FetchInitiatorTypeNames::css); 114 resourceRequest.setHTTPReferrer(image.referrer);
115 request.mutableResourceRequest().setHTTPReferrer(image.referrer); 115 FetchRequest request(resourceRequest, FetchInitiatorTypeNames::css);
116 116
117 if (crossOrigin != CrossOriginAttributeNotSet) 117 if (crossOrigin != CrossOriginAttributeNotSet)
118 request.setCrossOriginAccessControl(document.getSecurityOrigin(), 118 request.setCrossOriginAccessControl(document.getSecurityOrigin(),
119 crossOrigin); 119 crossOrigin);
120 if (document.settings() && document.settings()->getFetchImagePlaceholders()) 120 if (document.settings() && document.settings()->getFetchImagePlaceholders())
121 request.setAllowImagePlaceholder(); 121 request.setAllowImagePlaceholder();
122 122
123 if (ImageResourceContent* cachedImage = 123 if (ImageResourceContent* cachedImage =
124 ImageResourceContent::fetch(request, document.fetcher())) 124 ImageResourceContent::fetch(request, document.fetcher()))
125 m_cachedImage = StyleFetchedImageSet::create( 125 m_cachedImage = StyleFetchedImageSet::create(
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 CSSImageSetValue* CSSImageSetValue::valueWithURLsMadeAbsolute() { 178 CSSImageSetValue* CSSImageSetValue::valueWithURLsMadeAbsolute() {
179 CSSImageSetValue* value = CSSImageSetValue::create(); 179 CSSImageSetValue* value = CSSImageSetValue::create();
180 for (auto& item : *this) 180 for (auto& item : *this)
181 item->isImageValue() 181 item->isImageValue()
182 ? value->append(*toCSSImageValue(*item).valueWithURLMadeAbsolute()) 182 ? value->append(*toCSSImageValue(*item).valueWithURLMadeAbsolute())
183 : value->append(*item); 183 : value->append(*item);
184 return value; 184 return value;
185 } 185 }
186 186
187 } // namespace blink 187 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp ('k') | third_party/WebKit/Source/core/css/CSSImageValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698