OLD | NEW |
---|---|
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 Loading... | |
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/css/MediaList.h" | |
33 #include "core/css/MediaQueryEvaluator.h" | |
34 #include "core/html/imports/HTMLImport.h" | 32 #include "core/html/imports/HTMLImport.h" |
35 #include "core/rendering/RenderObject.h" | 33 #include "core/rendering/RenderObject.h" |
36 #include "public/platform/Platform.h" | 34 #include "public/platform/Platform.h" |
37 | 35 |
38 namespace WebCore { | 36 namespace WebCore { |
39 | 37 |
40 bool PreloadRequest::isSafeToSendToAnotherThread() const | 38 bool PreloadRequest::isSafeToSendToAnotherThread() const |
41 { | 39 { |
42 return m_initiatorName.isSafeToSendToAnotherThread() | 40 return m_initiatorName.isSafeToSendToAnotherThread() |
43 && m_charset.isSafeToSendToAnotherThread() | 41 && m_charset.isSafeToSendToAnotherThread() |
44 && m_resourceURL.isSafeToSendToAnotherThread() | 42 && m_resourceURL.isSafeToSendToAnotherThread() |
45 && m_mediaAttribute.isSafeToSendToAnotherThread() | |
46 && m_baseURL.isSafeToSendToAnotherThread(); | 43 && m_baseURL.isSafeToSendToAnotherThread(); |
47 } | 44 } |
48 | 45 |
49 KURL PreloadRequest::completeURL(Document* document) | 46 KURL PreloadRequest::completeURL(Document* document) |
50 { | 47 { |
51 return document->completeURLWithOverride(m_resourceURL, m_baseURL.isEmpty() ? document->url() : m_baseURL); | 48 return document->completeURLWithOverride(m_resourceURL, m_baseURL.isEmpty() ? document->url() : m_baseURL); |
52 } | 49 } |
53 | 50 |
54 FetchRequest PreloadRequest::resourceRequest(Document* document) | 51 FetchRequest PreloadRequest::resourceRequest(Document* document) |
55 { | 52 { |
(...skipping 10 matching lines...) Expand all Loading... | |
66 | 63 |
67 void HTMLResourcePreloader::takeAndPreload(PreloadRequestStream& r) | 64 void HTMLResourcePreloader::takeAndPreload(PreloadRequestStream& r) |
68 { | 65 { |
69 PreloadRequestStream requests; | 66 PreloadRequestStream requests; |
70 requests.swap(r); | 67 requests.swap(r); |
71 | 68 |
72 for (PreloadRequestStream::iterator it = requests.begin(); it != requests.en d(); ++it) | 69 for (PreloadRequestStream::iterator it = requests.begin(); it != requests.en d(); ++it) |
73 preload(it->release()); | 70 preload(it->release()); |
74 } | 71 } |
75 | 72 |
76 static bool mediaAttributeMatches(LocalFrame* frame, RenderStyle* renderStyle, c onst String& attributeValue) | |
77 { | |
78 RefPtrWillBeRawPtr<MediaQuerySet> mediaQueries = MediaQuerySet::create(attri buteValue); | |
79 MediaQueryEvaluator mediaQueryEvaluator("screen", frame, renderStyle); | |
80 return mediaQueryEvaluator.eval(mediaQueries.get()); | |
81 } | |
82 | |
83 void HTMLResourcePreloader::preload(PassOwnPtr<PreloadRequest> preload) | 73 void HTMLResourcePreloader::preload(PassOwnPtr<PreloadRequest> preload) |
84 { | 74 { |
75 /* | |
Mads Ager (chromium)
2014/03/22 09:33:54
Code in comments.
| |
85 Document* executingDocument = m_document->import() ? m_document->import()->m aster() : m_document; | 76 Document* executingDocument = m_document->import() ? m_document->import()->m aster() : m_document; |
86 Document* loadingDocument = m_document; | 77 Document* loadingDocument = m_document; |
87 | 78 |
88 ASSERT(executingDocument->frame()); | 79 if (!preload->media().isEmpty() && !mediaAttributeMatches(executingDocument- >frame(), executingDocument->renderer()->style())) |
89 ASSERT(executingDocument->renderer()); | |
90 ASSERT(executingDocument->renderer()->style()); | |
91 if (!preload->media().isEmpty() && !mediaAttributeMatches(executingDocument- >frame(), executingDocument->renderer()->style(), preload->media())) | |
92 return; | 80 return; |
81 */ | |
93 | 82 |
94 FetchRequest request = preload->resourceRequest(m_document); | 83 FetchRequest request = preload->resourceRequest(m_document); |
95 blink::Platform::current()->histogramCustomCounts("WebCore.PreloadDelayMs", static_cast<int>(1000 * (monotonicallyIncreasingTime() - preload->discoveryTime( ))), 0, 2000, 20); | 84 blink::Platform::current()->histogramCustomCounts("WebCore.PreloadDelayMs", static_cast<int>(1000 * (monotonicallyIncreasingTime() - preload->discoveryTime( ))), 0, 2000, 20); |
96 loadingDocument->fetcher()->preload(preload->resourceType(), request, preloa d->charset()); | 85 m_document->fetcher()->preload(preload->resourceType(), request, preload->ch arset()); |
97 } | 86 } |
98 | 87 |
99 | 88 |
100 } | 89 } |
OLD | NEW |