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

Side by Side Diff: third_party/WebKit/Source/core/html/parser/CSSPreloadScanner.cpp

Issue 1947053002: Manual revert of "Preload scan external css for @import" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Keep histograms.xml Created 4 years, 7 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) 2008, 2010 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008, 2010 Apple Inc. All Rights Reserved.
3 * Copyright (C) 2009 Torch Mobile, Inc. http://www.torchmobile.com/ 3 * Copyright (C) 2009 Torch Mobile, Inc. http://www.torchmobile.com/
4 * Copyright (C) 2010 Google Inc. All Rights Reserved. 4 * Copyright (C) 2010 Google Inc. All Rights Reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
15 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY 15 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
16 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 16 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
18 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR 18 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
19 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 19 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
20 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 20 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
22 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 22 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include "core/html/parser/CSSPreloadScanner.h" 28 #include "core/html/parser/CSSPreloadScanner.h"
29 29
30 #include "core/fetch/CSSStyleSheetResource.h"
31 #include "core/fetch/FetchInitiatorTypeNames.h" 30 #include "core/fetch/FetchInitiatorTypeNames.h"
32 #include "core/html/parser/HTMLParserIdioms.h" 31 #include "core/html/parser/HTMLParserIdioms.h"
33 #include "core/html/parser/HTMLResourcePreloader.h"
34 #include "platform/Histogram.h"
35 #include "platform/text/SegmentedString.h" 32 #include "platform/text/SegmentedString.h"
36 33
37 namespace blink { 34 namespace blink {
38 35
39 CSSPreloadScanner::CSSPreloadScanner() 36 CSSPreloadScanner::CSSPreloadScanner()
40 { 37 {
41 } 38 }
42 39
43 CSSPreloadScanner::~CSSPreloadScanner() 40 CSSPreloadScanner::~CSSPreloadScanner()
44 { 41 {
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 } 226 }
230 m_state = Initial; 227 m_state = Initial;
231 } else if (equalIgnoringCase(m_rule, "charset")) 228 } else if (equalIgnoringCase(m_rule, "charset"))
232 m_state = Initial; 229 m_state = Initial;
233 else 230 else
234 m_state = DoneParsingImportRules; 231 m_state = DoneParsingImportRules;
235 m_rule.clear(); 232 m_rule.clear();
236 m_ruleValue.clear(); 233 m_ruleValue.clear();
237 } 234 }
238 235
239 CSSPreloaderResourceClient::CSSPreloaderResourceClient(Resource* resource, HTMLR esourcePreloader* preloader)
240 : m_resource(resource)
241 , m_preloader(preloader)
242 {
243 }
244
245 void CSSPreloaderResourceClient::notifyFinished(Resource* resource)
246 {
247 resource->removeClient(this);
248 m_resource.clear();
249 }
250
251 // Only attach for one appendData call, as that's where most imports will likely
252 // be (according to spec).
253 void CSSPreloaderResourceClient::didAppendFirstData(const CSSStyleSheetResource* resource)
254 {
255 const String& chunk = resource->decodedText();
256 if (!chunk.isNull() && m_preloader) {
257 CSSPreloadScanner cssPreloadScanner;
258 PreloadRequestStream preloads;
259 // Passing an empty SegmentedString here results in PreloadRequests
260 // with no file/line information.
261 // TODO(csharrison): If this becomes an issue the CSSPreloadScanner
262 // may be augmented to take care of this case without performing an
263 // additional copy.
264 cssPreloadScanner.scan(chunk, SegmentedString(), preloads, resource->res ponse().url());
265 int currentPreloadCount = m_preloader->countPreloads();
266 m_preloader->takeAndPreload(preloads);
267 DEFINE_STATIC_LOCAL(CustomCountHistogram, cssImportHistogram, ("PreloadS canner.ExternalCSS.PreloadCount", 1, 100, 50));
268 cssImportHistogram.count(m_preloader->countPreloads() - currentPreloadCo unt);
269 }
270 m_resource->removeClient(this);
271 m_resource.clear();
272 }
273
274 } // namespace blink 236 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698