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

Side by Side Diff: third_party/WebKit/Source/core/fetch/CSSStyleSheetResource.cpp

Issue 2183323005: Make Resource::m_response private (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « no previous file | third_party/WebKit/Source/core/fetch/ImageResource.cpp » ('j') | 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 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
6 Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. 6 Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 void CSSStyleSheetResource::didAddClient(ResourceClient* c) 76 void CSSStyleSheetResource::didAddClient(ResourceClient* c)
77 { 77 {
78 ASSERT(StyleSheetResourceClient::isExpectedType(c)); 78 ASSERT(StyleSheetResourceClient::isExpectedType(c));
79 // Resource::didAddClient() must be before setCSSStyleSheet(), 79 // Resource::didAddClient() must be before setCSSStyleSheet(),
80 // because setCSSStyleSheet() may cause scripts to be executed, which could destroy 'c' if it is an instance of HTMLLinkElement. 80 // because setCSSStyleSheet() may cause scripts to be executed, which could destroy 'c' if it is an instance of HTMLLinkElement.
81 // see the comment of HTMLLinkElement::setCSSStyleSheet. 81 // see the comment of HTMLLinkElement::setCSSStyleSheet.
82 Resource::didAddClient(c); 82 Resource::didAddClient(c);
83 83
84 if (!isLoading()) 84 if (!isLoading())
85 static_cast<StyleSheetResourceClient*>(c)->setCSSStyleSheet(m_resourceRe quest.url(), m_response.url(), encoding(), this); 85 static_cast<StyleSheetResourceClient*>(c)->setCSSStyleSheet(m_resourceRe quest.url(), response().url(), encoding(), this);
86 } 86 }
87 87
88 const String CSSStyleSheetResource::sheetText(MIMETypeCheck mimeTypeCheck) const 88 const String CSSStyleSheetResource::sheetText(MIMETypeCheck mimeTypeCheck) const
89 { 89 {
90 ASSERT(!isPurgeable()); 90 ASSERT(!isPurgeable());
91 91
92 if (!m_data || m_data->isEmpty() || !canUseSheet(mimeTypeCheck)) 92 if (!m_data || m_data->isEmpty() || !canUseSheet(mimeTypeCheck))
93 return String(); 93 return String();
94 94
95 if (!m_decodedSheetText.isNull()) 95 if (!m_decodedSheetText.isNull())
96 return m_decodedSheetText; 96 return m_decodedSheetText;
97 97
98 // Don't cache the decoded text, regenerating is cheap and it can use quite a bit of memory 98 // Don't cache the decoded text, regenerating is cheap and it can use quite a bit of memory
99 return decodedText(); 99 return decodedText();
100 } 100 }
101 101
102 void CSSStyleSheetResource::checkNotify() 102 void CSSStyleSheetResource::checkNotify()
103 { 103 {
104 // Decode the data to find out the encoding and keep the sheet text around d uring checkNotify() 104 // Decode the data to find out the encoding and keep the sheet text around d uring checkNotify()
105 if (m_data) 105 if (m_data)
106 m_decodedSheetText = decodedText(); 106 m_decodedSheetText = decodedText();
107 107
108 ResourceClientWalker<StyleSheetResourceClient> w(clients()); 108 ResourceClientWalker<StyleSheetResourceClient> w(clients());
109 while (StyleSheetResourceClient* c = w.next()) 109 while (StyleSheetResourceClient* c = w.next())
110 c->setCSSStyleSheet(m_resourceRequest.url(), m_response.url(), encoding( ), this); 110 c->setCSSStyleSheet(m_resourceRequest.url(), response().url(), encoding( ), this);
111 // Clear the decoded text as it is unlikely to be needed immediately again a nd is cheap to regenerate. 111 // Clear the decoded text as it is unlikely to be needed immediately again a nd is cheap to regenerate.
112 m_decodedSheetText = String(); 112 m_decodedSheetText = String();
113 } 113 }
114 114
115 bool CSSStyleSheetResource::isSafeToUnlock() const 115 bool CSSStyleSheetResource::isSafeToUnlock() const
116 { 116 {
117 return m_data->hasOneRef(); 117 return m_data->hasOneRef();
118 } 118 }
119 119
120 void CSSStyleSheetResource::destroyDecodedDataIfPossible() 120 void CSSStyleSheetResource::destroyDecodedDataIfPossible()
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 // This stylesheet resource did conflict with another resource and was 173 // This stylesheet resource did conflict with another resource and was
174 // not added to the cache. 174 // not added to the cache.
175 setParsedStyleSheetCache(nullptr); 175 setParsedStyleSheetCache(nullptr);
176 return; 176 return;
177 } 177 }
178 setParsedStyleSheetCache(sheet); 178 setParsedStyleSheetCache(sheet);
179 setDecodedSize(m_parsedStyleSheetCache->estimatedSizeInBytes()); 179 setDecodedSize(m_parsedStyleSheetCache->estimatedSizeInBytes());
180 } 180 }
181 181
182 } // namespace blink 182 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/fetch/ImageResource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698