OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "modules/serviceworkers/FetchEvent.h" | 5 #include "modules/serviceworkers/FetchEvent.h" |
6 | 6 |
7 #include "bindings/core/v8/ScriptState.h" | 7 #include "bindings/core/v8/ScriptState.h" |
8 #include "bindings/core/v8/ToV8.h" | 8 #include "bindings/core/v8/ToV8.h" |
9 #include "bindings/core/v8/V8HiddenValue.h" | 9 #include "bindings/core/v8/V8HiddenValue.h" |
10 #include "modules/fetch/BytesConsumerForDataConsumerHandle.h" | 10 #include "modules/fetch/BytesConsumerForDataConsumerHandle.h" |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 std::unique_ptr<WebServiceWorkerResponse> response, | 113 std::unique_ptr<WebServiceWorkerResponse> response, |
114 std::unique_ptr<WebDataConsumerHandle> dataConsumeHandle) { | 114 std::unique_ptr<WebDataConsumerHandle> dataConsumeHandle) { |
115 if (!scriptState->contextIsValid()) | 115 if (!scriptState->contextIsValid()) |
116 return; | 116 return; |
117 DCHECK(m_preloadResponseProperty); | 117 DCHECK(m_preloadResponseProperty); |
118 ScriptState::Scope scope(scriptState); | 118 ScriptState::Scope scope(scriptState); |
119 FetchResponseData* responseData = FetchResponseData::createWithBuffer( | 119 FetchResponseData* responseData = FetchResponseData::createWithBuffer( |
120 new BodyStreamBuffer(scriptState, new BytesConsumerForDataConsumerHandle( | 120 new BodyStreamBuffer(scriptState, new BytesConsumerForDataConsumerHandle( |
121 scriptState->getExecutionContext(), | 121 scriptState->getExecutionContext(), |
122 std::move(dataConsumeHandle)))); | 122 std::move(dataConsumeHandle)))); |
123 responseData->setURL(response->url()); | 123 const WebVector<WebURL>& webURLList = response->urlList(); |
| 124 // Navigation preload doesn't support redirect. |
| 125 DCHECK_EQ(1u, webURLList.size()); |
| 126 Vector<KURL> urlList(1); |
| 127 urlList[0] = webURLList[0]; |
| 128 responseData->setURLList(urlList); |
124 responseData->setStatus(response->status()); | 129 responseData->setStatus(response->status()); |
125 responseData->setStatusMessage(response->statusText()); | 130 responseData->setStatusMessage(response->statusText()); |
126 responseData->setResponseTime(response->responseTime()); | 131 responseData->setResponseTime(response->responseTime()); |
127 for (const auto& header : response->headers()) | 132 for (const auto& header : response->headers()) |
128 responseData->headerList()->append(header.key, header.value); | 133 responseData->headerList()->append(header.key, header.value); |
129 FetchResponseData* taintedResponse = | 134 FetchResponseData* taintedResponse = |
130 responseData->createBasicFilteredResponse(); | 135 responseData->createBasicFilteredResponse(); |
131 m_preloadResponseProperty->resolve( | 136 m_preloadResponseProperty->resolve( |
132 Response::create(scriptState->getExecutionContext(), taintedResponse)); | 137 Response::create(scriptState->getExecutionContext(), taintedResponse)); |
133 } | 138 } |
134 | 139 |
135 void FetchEvent::onNavigationPreloadError( | 140 void FetchEvent::onNavigationPreloadError( |
136 ScriptState* scriptState, | 141 ScriptState* scriptState, |
137 std::unique_ptr<WebServiceWorkerError> error) { | 142 std::unique_ptr<WebServiceWorkerError> error) { |
138 if (!scriptState->contextIsValid()) | 143 if (!scriptState->contextIsValid()) |
139 return; | 144 return; |
140 DCHECK(m_preloadResponseProperty); | 145 DCHECK(m_preloadResponseProperty); |
141 m_preloadResponseProperty->reject( | 146 m_preloadResponseProperty->reject( |
142 ServiceWorkerError::take(nullptr, *error.get())); | 147 ServiceWorkerError::take(nullptr, *error.get())); |
143 } | 148 } |
144 | 149 |
145 DEFINE_TRACE(FetchEvent) { | 150 DEFINE_TRACE(FetchEvent) { |
146 visitor->trace(m_observer); | 151 visitor->trace(m_observer); |
147 visitor->trace(m_request); | 152 visitor->trace(m_request); |
148 visitor->trace(m_preloadResponseProperty); | 153 visitor->trace(m_preloadResponseProperty); |
149 ExtendableEvent::trace(visitor); | 154 ExtendableEvent::trace(visitor); |
150 } | 155 } |
151 | 156 |
152 } // namespace blink | 157 } // namespace blink |
OLD | NEW |