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

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

Issue 1314793010: Support fragment URLs for all kinds of SVG images (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 3 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 * (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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 if (!m_accessedImage) { 62 if (!m_accessedImage) {
63 m_accessedImage = true; 63 m_accessedImage = true;
64 64
65 FetchRequest request(ResourceRequest(m_absoluteURL), m_initiatorName.isE mpty() ? FetchInitiatorTypeNames::css : m_initiatorName, options); 65 FetchRequest request(ResourceRequest(m_absoluteURL), m_initiatorName.isE mpty() ? FetchInitiatorTypeNames::css : m_initiatorName, options);
66 request.mutableResourceRequest().setHTTPReferrer(SecurityPolicy::generat eReferrer(m_referrer.referrerPolicy, request.url(), m_referrer.referrer)); 66 request.mutableResourceRequest().setHTTPReferrer(SecurityPolicy::generat eReferrer(m_referrer.referrerPolicy, request.url(), m_referrer.referrer));
67 67
68 if (options.corsEnabled == IsCORSEnabled) 68 if (options.corsEnabled == IsCORSEnabled)
69 request.setCrossOriginAccessControl(document->securityOrigin(), opti ons.allowCredentials, options.credentialsRequested); 69 request.setCrossOriginAccessControl(document->securityOrigin(), opti ons.allowCredentials, options.credentialsRequested);
70 70
71 if (ResourcePtr<ImageResource> cachedImage = ImageResource::fetch(reques t, document->fetcher())) 71 if (ResourcePtr<ImageResource> cachedImage = ImageResource::fetch(reques t, document->fetcher()))
72 m_image = StyleFetchedImage::create(cachedImage.get(), document); 72 m_image = StyleFetchedImage::create(cachedImage.get(), document, req uest.url());
73 } 73 }
74 74
75 return (m_image && m_image->isImageResource()) ? toStyleFetchedImage(m_image ) : 0; 75 return (m_image && m_image->isImageResource()) ? toStyleFetchedImage(m_image ) : 0;
76 } 76 }
77 77
78 void CSSImageValue::restoreCachedResourceIfNeeded(Document& document) 78 void CSSImageValue::restoreCachedResourceIfNeeded(Document& document)
79 { 79 {
80 if (!m_accessedImage || !m_image->isImageResource() || !document.fetcher()) 80 if (!m_accessedImage || !m_image->isImageResource() || !document.fetcher())
81 return; 81 return;
82 if (document.fetcher()->cachedResource(KURL(ParsedURLString, m_absoluteURL)) ) 82 if (document.fetcher()->cachedResource(KURL(ParsedURLString, m_absoluteURL)) )
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 { 126 {
127 KURL url = document.completeURL(m_relativeURL); 127 KURL url = document.completeURL(m_relativeURL);
128 if (url == m_absoluteURL) 128 if (url == m_absoluteURL)
129 return; 129 return;
130 m_absoluteURL = url.string(); 130 m_absoluteURL = url.string();
131 m_accessedImage = false; 131 m_accessedImage = false;
132 m_image.clear(); 132 m_image.clear();
133 } 133 }
134 134
135 } // namespace blink 135 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698