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

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

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
(...skipping 13 matching lines...) Expand all
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/FetchInitiatorInfo.h" 29 #include "core/fetch/FetchInitiatorInfo.h"
30 #include "core/fetch/ResourceFetcher.h" 30 #include "core/fetch/ResourceFetcher.h"
31 #include "core/loader/DocumentLoader.h" 31 #include "core/loader/DocumentLoader.h"
32 #include "platform/Histogram.h" 32 #include "platform/Histogram.h"
33 #include "public/platform/Platform.h" 33 #include "public/platform/Platform.h"
34 #include <memory>
35 34
36 namespace blink { 35 namespace blink {
37 36
38 inline HTMLResourcePreloader::HTMLResourcePreloader(Document& document) 37 inline HTMLResourcePreloader::HTMLResourcePreloader(Document& document)
39 : m_document(document) 38 : m_document(document)
40 { 39 {
41 } 40 }
42 41
43 HTMLResourcePreloader* HTMLResourcePreloader::create(Document& document) 42 HTMLResourcePreloader* HTMLResourcePreloader::create(Document& document)
44 { 43 {
45 return new HTMLResourcePreloader(document); 44 return new HTMLResourcePreloader(document);
46 } 45 }
47 46
48 DEFINE_TRACE(HTMLResourcePreloader) 47 DEFINE_TRACE(HTMLResourcePreloader)
49 { 48 {
50 visitor->trace(m_document); 49 visitor->trace(m_document);
51 } 50 }
52 51
53 static void preconnectHost(PreloadRequest* request, const NetworkHintsInterface& networkHintsInterface) 52 static void preconnectHost(PreloadRequest* request, const NetworkHintsInterface& networkHintsInterface)
54 { 53 {
55 ASSERT(request); 54 ASSERT(request);
56 ASSERT(request->isPreconnect()); 55 ASSERT(request->isPreconnect());
57 KURL host(request->baseURL(), request->resourceURL()); 56 KURL host(request->baseURL(), request->resourceURL());
58 if (!host.isValid() || !host.protocolIsInHTTPFamily()) 57 if (!host.isValid() || !host.protocolIsInHTTPFamily())
59 return; 58 return;
60 networkHintsInterface.preconnectHost(host, request->crossOrigin()); 59 networkHintsInterface.preconnectHost(host, request->crossOrigin());
61 } 60 }
62 61
63 void HTMLResourcePreloader::preload(std::unique_ptr<PreloadRequest> preload, con st NetworkHintsInterface& networkHintsInterface) 62 void HTMLResourcePreloader::preload(PassOwnPtr<PreloadRequest> preload, const Ne tworkHintsInterface& networkHintsInterface)
64 { 63 {
65 if (preload->isPreconnect()) { 64 if (preload->isPreconnect()) {
66 preconnectHost(preload.get(), networkHintsInterface); 65 preconnectHost(preload.get(), networkHintsInterface);
67 return; 66 return;
68 } 67 }
69 // TODO(yoichio): Should preload if document is imported. 68 // TODO(yoichio): Should preload if document is imported.
70 if (!m_document->loader()) 69 if (!m_document->loader())
71 return; 70 return;
72 FetchRequest request = preload->resourceRequest(m_document); 71 FetchRequest request = preload->resourceRequest(m_document);
73 // TODO(dgozman): This check should go to HTMLPreloadScanner, but this requi res 72 // TODO(dgozman): This check should go to HTMLPreloadScanner, but this requi res
74 // making Document::completeURLWithOverride logic to be statically accessibl e. 73 // making Document::completeURLWithOverride logic to be statically accessibl e.
75 if (request.url().protocolIsData()) 74 if (request.url().protocolIsData())
76 return; 75 return;
77 if (preload->resourceType() == Resource::Script || preload->resourceType() = = Resource::CSSStyleSheet || preload->resourceType() == Resource::ImportResource ) 76 if (preload->resourceType() == Resource::Script || preload->resourceType() = = Resource::CSSStyleSheet || preload->resourceType() == Resource::ImportResource )
78 request.setCharset(preload->charset().isEmpty() ? m_document->characterS et().getString() : preload->charset()); 77 request.setCharset(preload->charset().isEmpty() ? m_document->characterS et().getString() : preload->charset());
79 request.setForPreload(true, preload->discoveryTime()); 78 request.setForPreload(true, preload->discoveryTime());
80 int duration = static_cast<int>(1000 * (monotonicallyIncreasingTime() - prel oad->discoveryTime())); 79 int duration = static_cast<int>(1000 * (monotonicallyIncreasingTime() - prel oad->discoveryTime()));
81 DEFINE_STATIC_LOCAL(CustomCountHistogram, preloadDelayHistogram, ("WebCore.P reloadDelayMs", 0, 2000, 20)); 80 DEFINE_STATIC_LOCAL(CustomCountHistogram, preloadDelayHistogram, ("WebCore.P reloadDelayMs", 0, 2000, 20));
82 preloadDelayHistogram.count(duration); 81 preloadDelayHistogram.count(duration);
83 m_document->loader()->startPreload(preload->resourceType(), request); 82 m_document->loader()->startPreload(preload->resourceType(), request);
84 } 83 }
85 84
86 } // namespace blink 85 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698