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

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

Issue 1170503003: Remove resource type-specific fetching logic from ResourceFetcher (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Null-check Document::loader() before calling startPreload() Created 5 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 | Annotate | Revision Log
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
(...skipping 11 matching lines...) Expand all
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 "config.h" 26 #include "config.h"
27 #include "core/html/parser/HTMLResourcePreloader.h" 27 #include "core/html/parser/HTMLResourcePreloader.h"
28 28
29 #include "core/dom/Document.h" 29 #include "core/dom/Document.h"
30 #include "core/fetch/FetchInitiatorInfo.h" 30 #include "core/fetch/FetchInitiatorInfo.h"
31 #include "core/fetch/ResourceFetcher.h" 31 #include "core/fetch/ResourceFetcher.h"
32 #include "core/loader/DocumentLoader.h"
32 #include "platform/network/NetworkHints.h" 33 #include "platform/network/NetworkHints.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
(...skipping 23 matching lines...) Expand all
65 } 66 }
66 preconnect(host, crossOrigin); 67 preconnect(host, crossOrigin);
67 } 68 }
68 69
69 void HTMLResourcePreloader::preload(PassOwnPtr<PreloadRequest> preload) 70 void HTMLResourcePreloader::preload(PassOwnPtr<PreloadRequest> preload)
70 { 71 {
71 if (preload->isPreconnect()) { 72 if (preload->isPreconnect()) {
72 preconnectHost(preload.get()); 73 preconnectHost(preload.get());
73 return; 74 return;
74 } 75 }
76 if (!m_document->loader())
77 return;
75 FetchRequest request = preload->resourceRequest(m_document); 78 FetchRequest request = preload->resourceRequest(m_document);
79 if (preload->resourceType() == Resource::Script || preload->resourceType() = = Resource::CSSStyleSheet)
80 request.setCharset(preload->charset().isEmpty() ? m_document->charset(). string() : preload->charset());
81 request.setForPreload(true);
76 Platform::current()->histogramCustomCounts("WebCore.PreloadDelayMs", static_ cast<int>(1000 * (monotonicallyIncreasingTime() - preload->discoveryTime())), 0, 2000, 20); 82 Platform::current()->histogramCustomCounts("WebCore.PreloadDelayMs", static_ cast<int>(1000 * (monotonicallyIncreasingTime() - preload->discoveryTime())), 0, 2000, 20);
77 m_document->fetcher()->preload(preload->resourceType(), request, preload->ch arset()); 83 m_document->loader()->startPreload(preload->resourceType(), request);
78 } 84 }
79 85
80 } // namespace blink 86 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/imports/HTMLImportsController.cpp ('k') | Source/core/inspector/InspectorResourceContentLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698