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

Side by Side Diff: third_party/WebKit/Source/modules/serviceworkers/FetchEvent.cpp

Issue 2787783002: Resolve preloadResponse of Navigation Preload even if the response body is empty. (Closed)
Patch Set: move to wpt test Created 3 years, 8 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 // 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 } 107 }
108 108
109 void FetchEvent::onNavigationPreloadResponse( 109 void FetchEvent::onNavigationPreloadResponse(
110 ScriptState* scriptState, 110 ScriptState* scriptState,
111 std::unique_ptr<WebURLResponse> response, 111 std::unique_ptr<WebURLResponse> response,
112 std::unique_ptr<WebDataConsumerHandle> dataConsumeHandle) { 112 std::unique_ptr<WebDataConsumerHandle> dataConsumeHandle) {
113 if (!scriptState->contextIsValid()) 113 if (!scriptState->contextIsValid())
114 return; 114 return;
115 DCHECK(m_preloadResponseProperty); 115 DCHECK(m_preloadResponseProperty);
116 ScriptState::Scope scope(scriptState); 116 ScriptState::Scope scope(scriptState);
117 FetchResponseData* responseData = FetchResponseData::createWithBuffer( 117 FetchResponseData* responseData =
118 new BodyStreamBuffer(scriptState, new BytesConsumerForDataConsumerHandle( 118 dataConsumeHandle
119 scriptState->getExecutionContext(), 119 ? FetchResponseData::createWithBuffer(new BodyStreamBuffer(
120 std::move(dataConsumeHandle)))); 120 scriptState, new BytesConsumerForDataConsumerHandle(
121 scriptState->getExecutionContext(),
122 std::move(dataConsumeHandle))))
123 : FetchResponseData::create();
121 Vector<KURL> urlList(1); 124 Vector<KURL> urlList(1);
122 urlList[0] = response->url(); 125 urlList[0] = response->url();
123 responseData->setURLList(urlList); 126 responseData->setURLList(urlList);
124 responseData->setStatus(response->httpStatusCode()); 127 responseData->setStatus(response->httpStatusCode());
125 responseData->setStatusMessage(response->httpStatusText()); 128 responseData->setStatusMessage(response->httpStatusText());
126 responseData->setResponseTime(response->toResourceResponse().responseTime()); 129 responseData->setResponseTime(response->toResourceResponse().responseTime());
127 const HTTPHeaderMap& headers( 130 const HTTPHeaderMap& headers(
128 response->toResourceResponse().httpHeaderFields()); 131 response->toResourceResponse().httpHeaderFields());
129 for (const auto& header : headers) { 132 for (const auto& header : headers) {
130 responseData->headerList()->append(header.key, header.value); 133 responseData->headerList()->append(header.key, header.value);
(...skipping 15 matching lines...) Expand all
146 } 149 }
147 150
148 DEFINE_TRACE(FetchEvent) { 151 DEFINE_TRACE(FetchEvent) {
149 visitor->trace(m_observer); 152 visitor->trace(m_observer);
150 visitor->trace(m_request); 153 visitor->trace(m_request);
151 visitor->trace(m_preloadResponseProperty); 154 visitor->trace(m_preloadResponseProperty);
152 ExtendableEvent::trace(visitor); 155 ExtendableEvent::trace(visitor);
153 } 156 }
154 157
155 } // namespace blink 158 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698