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

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

Issue 1858753003: Remove RawPtr from core/css (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 62
63 if (m_isCachePending) { 63 if (m_isCachePending) {
64 m_isCachePending = false; 64 m_isCachePending = false;
65 65
66 FetchRequest request(ResourceRequest(m_absoluteURL), m_initiatorName.isE mpty() ? FetchInitiatorTypeNames::css : m_initiatorName); 66 FetchRequest request(ResourceRequest(m_absoluteURL), m_initiatorName.isE mpty() ? FetchInitiatorTypeNames::css : m_initiatorName);
67 request.mutableResourceRequest().setHTTPReferrer(SecurityPolicy::generat eReferrer(m_referrer.referrerPolicy, request.url(), m_referrer.referrer)); 67 request.mutableResourceRequest().setHTTPReferrer(SecurityPolicy::generat eReferrer(m_referrer.referrerPolicy, request.url(), m_referrer.referrer));
68 68
69 if (crossOrigin != CrossOriginAttributeNotSet) 69 if (crossOrigin != CrossOriginAttributeNotSet)
70 request.setCrossOriginAccessControl(document->getSecurityOrigin(), c rossOrigin); 70 request.setCrossOriginAccessControl(document->getSecurityOrigin(), c rossOrigin);
71 71
72 if (RawPtr<ImageResource> cachedImage = ImageResource::fetch(request, do cument->fetcher())) 72 if (ImageResource* cachedImage = ImageResource::fetch(request, document- >fetcher()))
73 m_cachedImage = StyleFetchedImage::create(cachedImage.get(), documen t, request.url()); 73 m_cachedImage = StyleFetchedImage::create(cachedImage, document, req uest.url());
74 else 74 else
75 m_cachedImage = StyleInvalidImage::create(url()); 75 m_cachedImage = StyleInvalidImage::create(url());
76 } 76 }
77 77
78 return m_cachedImage.get(); 78 return m_cachedImage.get();
79 } 79 }
80 80
81 void CSSImageValue::restoreCachedResourceIfNeeded(Document& document) const 81 void CSSImageValue::restoreCachedResourceIfNeeded(Document& document) const
82 { 82 {
83 if (m_isCachePending || !m_cachedImage || !document.fetcher()) 83 if (m_isCachePending || !m_cachedImage || !document.fetcher())
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 KURL url = document.completeURL(m_relativeURL); 130 KURL url = document.completeURL(m_relativeURL);
131 AtomicString urlString(url.getString()); 131 AtomicString urlString(url.getString());
132 if (urlString == m_absoluteURL) 132 if (urlString == m_absoluteURL)
133 return; 133 return;
134 m_absoluteURL = urlString; 134 m_absoluteURL = urlString;
135 m_isCachePending = true; 135 m_isCachePending = true;
136 m_cachedImage.clear(); 136 m_cachedImage.clear();
137 } 137 }
138 138
139 } // namespace blink 139 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSImageValue.h ('k') | third_party/WebKit/Source/core/css/CSSImportRule.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698