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

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

Issue 2168903002: Set request context when restoring cached CSSImageValue resource (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
« no previous file with comments | « third_party/WebKit/LayoutTests/http/tests/css/resources/image-value-via-https.css ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 if (m_isCachePending || !m_cachedImage || !document.fetcher() || m_absoluteU RL.isNull()) 83 if (m_isCachePending || !m_cachedImage || !document.fetcher() || m_absoluteU RL.isNull())
84 return; 84 return;
85 if (document.fetcher()->cachedResource(KURL(ParsedURLString, m_absoluteURL)) ) 85 if (document.fetcher()->cachedResource(KURL(ParsedURLString, m_absoluteURL)) )
86 return; 86 return;
87 87
88 ImageResource* resource = m_cachedImage->cachedImage(); 88 ImageResource* resource = m_cachedImage->cachedImage();
89 if (!resource) 89 if (!resource)
90 return; 90 return;
91 91
92 FetchRequest request(ResourceRequest(m_absoluteURL), m_initiatorName.isEmpty () ? FetchInitiatorTypeNames::css : m_initiatorName, resource->options()); 92 FetchRequest request(ResourceRequest(m_absoluteURL), m_initiatorName.isEmpty () ? FetchInitiatorTypeNames::css : m_initiatorName, resource->options());
93 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon textImage);
93 MixedContentChecker::shouldBlockFetch(document.frame(), resource->lastResour ceRequest(), 94 MixedContentChecker::shouldBlockFetch(document.frame(), resource->lastResour ceRequest(),
94 resource->lastResourceRequest().url(), MixedContentChecker::SendReport); 95 resource->lastResourceRequest().url(), MixedContentChecker::SendReport);
95 document.fetcher()->requestLoadStarted(resource->identifier(), resource, req uest, ResourceFetcher::ResourceLoadingFromCache); 96 document.fetcher()->requestLoadStarted(resource->identifier(), resource, req uest, ResourceFetcher::ResourceLoadingFromCache);
96 } 97 }
97 98
98 bool CSSImageValue::hasFailedOrCanceledSubresources() const 99 bool CSSImageValue::hasFailedOrCanceledSubresources() const
99 { 100 {
100 if (!m_cachedImage) 101 if (!m_cachedImage)
101 return false; 102 return false;
102 if (Resource* cachedResource = m_cachedImage->cachedImage()) 103 if (Resource* cachedResource = m_cachedImage->cachedImage())
(...skipping 27 matching lines...) Expand all
130 KURL url = document.completeURL(m_relativeURL); 131 KURL url = document.completeURL(m_relativeURL);
131 AtomicString urlString(url.getString()); 132 AtomicString urlString(url.getString());
132 if (urlString == m_absoluteURL) 133 if (urlString == m_absoluteURL)
133 return; 134 return;
134 m_absoluteURL = urlString; 135 m_absoluteURL = urlString;
135 m_isCachePending = true; 136 m_isCachePending = true;
136 m_cachedImage.clear(); 137 m_cachedImage.clear();
137 } 138 }
138 139
139 } // namespace blink 140 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/http/tests/css/resources/image-value-via-https.css ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698