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

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

Issue 2210473002: Mark ResourceClient/ImageResourceObserver finished just before notifying (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tests 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
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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(MarkFinishedOption markFinishedOption)
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 if (markFinishedOption == MarkFinishedOption::ShouldMarkFinished)
111 markClientFinished(c);
110 c->setCSSStyleSheet(resourceRequest().url(), response().url(), encoding( ), this); 112 c->setCSSStyleSheet(resourceRequest().url(), response().url(), encoding( ), this);
113 }
111 // Clear the decoded text as it is unlikely to be needed immediately again a nd is cheap to regenerate. 114 // Clear the decoded text as it is unlikely to be needed immediately again a nd is cheap to regenerate.
112 m_decodedSheetText = String(); 115 m_decodedSheetText = String();
113 } 116 }
114 117
115 bool CSSStyleSheetResource::isSafeToUnlock() const 118 bool CSSStyleSheetResource::isSafeToUnlock() const
116 { 119 {
117 return m_data->hasOneRef(); 120 return m_data->hasOneRef();
118 } 121 }
119 122
120 void CSSStyleSheetResource::destroyDecodedDataIfPossible() 123 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 176 // This stylesheet resource did conflict with another resource and was
174 // not added to the cache. 177 // not added to the cache.
175 setParsedStyleSheetCache(nullptr); 178 setParsedStyleSheetCache(nullptr);
176 return; 179 return;
177 } 180 }
178 setParsedStyleSheetCache(sheet); 181 setParsedStyleSheetCache(sheet);
179 setDecodedSize(m_parsedStyleSheetCache->estimatedSizeInBytes()); 182 setDecodedSize(m_parsedStyleSheetCache->estimatedSizeInBytes());
180 } 183 }
181 184
182 } // namespace blink 185 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698