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

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

Issue 1373753002: Change CSSToStyleMap functions to take const CSSValue&s (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review feedback Created 5 years, 2 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 28 matching lines...) Expand all
39 , m_absoluteURL(url.string()) 39 , m_absoluteURL(url.string())
40 , m_isCachePending(!image) 40 , m_isCachePending(!image)
41 , m_cachedImage(image) 41 , m_cachedImage(image)
42 { 42 {
43 } 43 }
44 44
45 CSSImageValue::~CSSImageValue() 45 CSSImageValue::~CSSImageValue()
46 { 46 {
47 } 47 }
48 48
49 StyleFetchedImage* CSSImageValue::cacheImage(Document* document, const ResourceL oaderOptions& options) 49 StyleFetchedImage* CSSImageValue::cacheImage(Document* document, const ResourceL oaderOptions& options) const
50 { 50 {
51 ASSERT(document); 51 ASSERT(document);
52 52
53 if (m_isCachePending) { 53 if (m_isCachePending) {
54 m_isCachePending = false; 54 m_isCachePending = false;
55 55
56 FetchRequest request(ResourceRequest(m_absoluteURL), m_initiatorName.isE mpty() ? FetchInitiatorTypeNames::css : m_initiatorName, options); 56 FetchRequest request(ResourceRequest(m_absoluteURL), m_initiatorName.isE mpty() ? FetchInitiatorTypeNames::css : m_initiatorName, options);
57 request.mutableResourceRequest().setHTTPReferrer(SecurityPolicy::generat eReferrer(m_referrer.referrerPolicy, request.url(), m_referrer.referrer)); 57 request.mutableResourceRequest().setHTTPReferrer(SecurityPolicy::generat eReferrer(m_referrer.referrerPolicy, request.url(), m_referrer.referrer));
58 58
59 if (options.corsEnabled == IsCORSEnabled) 59 if (options.corsEnabled == IsCORSEnabled)
60 request.setCrossOriginAccessControl(document->securityOrigin(), opti ons.allowCredentials, options.credentialsRequested); 60 request.setCrossOriginAccessControl(document->securityOrigin(), opti ons.allowCredentials, options.credentialsRequested);
61 61
62 if (ResourcePtr<ImageResource> cachedImage = ImageResource::fetch(reques t, document->fetcher())) 62 if (ResourcePtr<ImageResource> cachedImage = ImageResource::fetch(reques t, document->fetcher()))
63 m_cachedImage = StyleFetchedImage::create(cachedImage.get(), documen t); 63 m_cachedImage = StyleFetchedImage::create(cachedImage.get(), documen t);
64 } 64 }
65 65
66 return m_cachedImage.get(); 66 return m_cachedImage.get();
67 } 67 }
68 68
69 void CSSImageValue::restoreCachedResourceIfNeeded(Document& document) 69 void CSSImageValue::restoreCachedResourceIfNeeded(Document& document) const
70 { 70 {
71 if (m_isCachePending || !m_cachedImage || !document.fetcher()) 71 if (m_isCachePending || !m_cachedImage || !document.fetcher())
72 return; 72 return;
73 if (document.fetcher()->cachedResource(KURL(ParsedURLString, m_absoluteURL)) ) 73 if (document.fetcher()->cachedResource(KURL(ParsedURLString, m_absoluteURL)) )
74 return; 74 return;
75 75
76 ImageResource* resource = m_cachedImage->cachedImage(); 76 ImageResource* resource = m_cachedImage->cachedImage();
77 if (!resource) 77 if (!resource)
78 return; 78 return;
79 79
(...skipping 26 matching lines...) Expand all
106 { 106 {
107 return m_cachedImage ? m_cachedImage->knownToBeOpaque(layoutObject) : false; 107 return m_cachedImage ? m_cachedImage->knownToBeOpaque(layoutObject) : false;
108 } 108 }
109 109
110 DEFINE_TRACE_AFTER_DISPATCH(CSSImageValue) 110 DEFINE_TRACE_AFTER_DISPATCH(CSSImageValue)
111 { 111 {
112 visitor->trace(m_cachedImage); 112 visitor->trace(m_cachedImage);
113 CSSValue::traceAfterDispatch(visitor); 113 CSSValue::traceAfterDispatch(visitor);
114 } 114 }
115 115
116 void CSSImageValue::reResolveURL(const Document& document) 116 void CSSImageValue::reResolveURL(const Document& document) const
117 { 117 {
118 KURL url = document.completeURL(m_relativeURL); 118 KURL url = document.completeURL(m_relativeURL);
119 AtomicString urlString(url.string()); 119 AtomicString urlString(url.string());
120 if (urlString == m_absoluteURL) 120 if (urlString == m_absoluteURL)
121 return; 121 return;
122 m_absoluteURL = urlString; 122 m_absoluteURL = urlString;
123 m_isCachePending = true; 123 m_isCachePending = true;
124 m_cachedImage.clear(); 124 m_cachedImage.clear();
125 } 125 }
126 126
127 } // namespace blink 127 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698