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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 FetchRequest PreloadRequest::resourceRequest(Document* document) | 51 FetchRequest PreloadRequest::resourceRequest(Document* document) |
52 { | 52 { |
53 ASSERT(isMainThread()); | 53 ASSERT(isMainThread()); |
54 FetchInitiatorInfo initiatorInfo; | 54 FetchInitiatorInfo initiatorInfo; |
55 initiatorInfo.name = AtomicString(m_initiatorName); | 55 initiatorInfo.name = AtomicString(m_initiatorName); |
56 initiatorInfo.position = m_initiatorPosition; | 56 initiatorInfo.position = m_initiatorPosition; |
57 FetchRequest request(ResourceRequest(completeURL(document)), initiatorInfo); | 57 FetchRequest request(ResourceRequest(completeURL(document)), initiatorInfo); |
58 | 58 |
59 if (m_isCORSEnabled) | 59 if (m_isCORSEnabled) |
60 request.setCrossOriginAccessControl(document->securityOrigin(), m_allowC
redentials); | 60 request.setCrossOriginAccessControl(document->securityOrigin(), m_allowC
redentials); |
| 61 |
| 62 request.setDefer(m_defer); |
| 63 |
61 return request; | 64 return request; |
62 } | 65 } |
63 | 66 |
64 inline HTMLResourcePreloader::HTMLResourcePreloader(Document& document) | 67 inline HTMLResourcePreloader::HTMLResourcePreloader(Document& document) |
65 : m_document(document) | 68 : m_document(document) |
66 { | 69 { |
67 } | 70 } |
68 | 71 |
69 PassOwnPtrWillBeRawPtr<HTMLResourcePreloader> HTMLResourcePreloader::create(Docu
ment& document) | 72 PassOwnPtrWillBeRawPtr<HTMLResourcePreloader> HTMLResourcePreloader::create(Docu
ment& document) |
70 { | 73 { |
(...skipping 10 matching lines...) Expand all Loading... |
81 PreloadRequestStream requests; | 84 PreloadRequestStream requests; |
82 requests.swap(r); | 85 requests.swap(r); |
83 | 86 |
84 for (PreloadRequestStream::iterator it = requests.begin(); it != requests.en
d(); ++it) | 87 for (PreloadRequestStream::iterator it = requests.begin(); it != requests.en
d(); ++it) |
85 preload(it->release()); | 88 preload(it->release()); |
86 } | 89 } |
87 | 90 |
88 void HTMLResourcePreloader::preload(PassOwnPtr<PreloadRequest> preload) | 91 void HTMLResourcePreloader::preload(PassOwnPtr<PreloadRequest> preload) |
89 { | 92 { |
90 FetchRequest request = preload->resourceRequest(m_document); | 93 FetchRequest request = preload->resourceRequest(m_document); |
91 request.setDefer(preload->defer()); | |
92 blink::Platform::current()->histogramCustomCounts("WebCore.PreloadDelayMs",
static_cast<int>(1000 * (monotonicallyIncreasingTime() - preload->discoveryTime(
))), 0, 2000, 20); | 94 blink::Platform::current()->histogramCustomCounts("WebCore.PreloadDelayMs",
static_cast<int>(1000 * (monotonicallyIncreasingTime() - preload->discoveryTime(
))), 0, 2000, 20); |
93 m_document->fetcher()->preload(preload->resourceType(), request, preload->ch
arset()); | 95 m_document->fetcher()->preload(preload->resourceType(), request, preload->ch
arset()); |
94 } | 96 } |
95 | 97 |
96 } | 98 } |
OLD | NEW |