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

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

Issue 1976463003: Preload scan external CSS for @import (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: actually include crasher fix Created 4 years, 6 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) 2013 Google Inc. All Rights Reserved. 2 * Copyright (C) 2013 Google Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "core/html/parser/HTMLResourcePreloader.h" 26 #include "core/html/parser/HTMLResourcePreloader.h"
27 27
28 #include "core/dom/Document.h" 28 #include "core/dom/Document.h"
29 #include "core/fetch/CSSStyleSheetResource.h"
29 #include "core/fetch/FetchInitiatorInfo.h" 30 #include "core/fetch/FetchInitiatorInfo.h"
30 #include "core/fetch/ResourceFetcher.h" 31 #include "core/fetch/ResourceFetcher.h"
31 #include "core/loader/DocumentLoader.h" 32 #include "core/loader/DocumentLoader.h"
32 #include "platform/Histogram.h" 33 #include "platform/Histogram.h"
33 #include "public/platform/Platform.h" 34 #include "public/platform/Platform.h"
34 35
35 namespace blink { 36 namespace blink {
36 37
37 inline HTMLResourcePreloader::HTMLResourcePreloader(Document& document) 38 inline HTMLResourcePreloader::HTMLResourcePreloader(Document& document)
38 : m_document(document) 39 : m_document(document)
39 { 40 {
40 } 41 }
41 42
42 HTMLResourcePreloader* HTMLResourcePreloader::create(Document& document) 43 HTMLResourcePreloader* HTMLResourcePreloader::create(Document& document)
43 { 44 {
44 return new HTMLResourcePreloader(document); 45 return new HTMLResourcePreloader(document);
45 } 46 }
46 47
47 DEFINE_TRACE(HTMLResourcePreloader) 48 DEFINE_TRACE(HTMLResourcePreloader)
48 { 49 {
49 visitor->trace(m_document); 50 visitor->trace(m_document);
50 } 51 }
51 52
53 int HTMLResourcePreloader::countPreloads()
54 {
55 if (m_document->loader())
56 return m_document->loader()->fetcher()->countPreloads();
57 return 0;
58 }
59
52 static void preconnectHost(PreloadRequest* request, const NetworkHintsInterface& networkHintsInterface) 60 static void preconnectHost(PreloadRequest* request, const NetworkHintsInterface& networkHintsInterface)
53 { 61 {
54 ASSERT(request); 62 ASSERT(request);
55 ASSERT(request->isPreconnect()); 63 ASSERT(request->isPreconnect());
56 KURL host(request->baseURL(), request->resourceURL()); 64 KURL host(request->baseURL(), request->resourceURL());
57 if (!host.isValid() || !host.protocolIsInHTTPFamily()) 65 if (!host.isValid() || !host.protocolIsInHTTPFamily())
58 return; 66 return;
59 networkHintsInterface.preconnectHost(host, request->crossOrigin()); 67 networkHintsInterface.preconnectHost(host, request->crossOrigin());
60 } 68 }
61 69
(...skipping 10 matching lines...) Expand all
72 // TODO(dgozman): This check should go to HTMLPreloadScanner, but this requi res 80 // TODO(dgozman): This check should go to HTMLPreloadScanner, but this requi res
73 // making Document::completeURLWithOverride logic to be statically accessibl e. 81 // making Document::completeURLWithOverride logic to be statically accessibl e.
74 if (request.url().protocolIsData()) 82 if (request.url().protocolIsData())
75 return; 83 return;
76 if (preload->resourceType() == Resource::Script || preload->resourceType() = = Resource::CSSStyleSheet || preload->resourceType() == Resource::ImportResource ) 84 if (preload->resourceType() == Resource::Script || preload->resourceType() = = Resource::CSSStyleSheet || preload->resourceType() == Resource::ImportResource )
77 request.setCharset(preload->charset().isEmpty() ? m_document->characterS et().getString() : preload->charset()); 85 request.setCharset(preload->charset().isEmpty() ? m_document->characterS et().getString() : preload->charset());
78 request.setForPreload(true); 86 request.setForPreload(true);
79 int duration = static_cast<int>(1000 * (monotonicallyIncreasingTime() - prel oad->discoveryTime())); 87 int duration = static_cast<int>(1000 * (monotonicallyIncreasingTime() - prel oad->discoveryTime()));
80 DEFINE_STATIC_LOCAL(CustomCountHistogram, preloadDelayHistogram, ("WebCore.P reloadDelayMs", 0, 2000, 20)); 88 DEFINE_STATIC_LOCAL(CustomCountHistogram, preloadDelayHistogram, ("WebCore.P reloadDelayMs", 0, 2000, 20));
81 preloadDelayHistogram.count(duration); 89 preloadDelayHistogram.count(duration);
82 m_document->loader()->startPreload(preload->resourceType(), request); 90
91 Resource* resource = m_document->loader()->startPreload(preload->resourceTyp e(), request);
92 // Note that if the cssExternalScanner{Preload,NoPreload} settings flags are
93 // not set, this resource client does nothing.
94 if (resource && preload->resourceType() == Resource::CSSStyleSheet) {
95 OwnPtr<CSSPreloaderResourceClient> client = adoptPtr(new CSSPreloaderRes ourceClient(resource, this));
96 resource->addClient(client.get(), true /* passive */);
97 m_cssPreloaders.add(std::move(client));
98 }
83 } 99 }
84 100
85 } // namespace blink 101 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698