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

Side by Side Diff: Source/modules/serviceworkers/FetchResponseData.cpp

Issue 564773004: Fix conversion to WebServiceWorkerResponse headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added xhr end-to-end test Created 6 years, 3 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 "config.h" 5 #include "config.h"
6 #include "FetchResponseData.h" 6 #include "FetchResponseData.h"
7 7
8 #include "core/fetch/CrossOriginAccessControl.h" 8 #include "core/fetch/CrossOriginAccessControl.h"
9 #include "modules/serviceworkers/FetchHeaderList.h" 9 #include "modules/serviceworkers/FetchHeaderList.h"
10 #include "public/platform/WebServiceWorkerResponse.h" 10 #include "public/platform/WebServiceWorkerResponse.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 { 84 {
85 if (m_internalResponse) { 85 if (m_internalResponse) {
86 m_internalResponse->populateWebServiceWorkerResponse(response); 86 m_internalResponse->populateWebServiceWorkerResponse(response);
87 return; 87 return;
88 } 88 }
89 response.setURL(url()); 89 response.setURL(url());
90 response.setStatus(status()); 90 response.setStatus(status());
91 response.setStatusText(statusMessage()); 91 response.setStatusText(statusMessage());
92 for (size_t i = 0; i < headerList()->size(); ++i) { 92 for (size_t i = 0; i < headerList()->size(); ++i) {
93 const FetchHeaderList::Header* header = headerList()->list()[i].get(); 93 const FetchHeaderList::Header* header = headerList()->list()[i].get();
94 response.setHeader(header->first, header->second); 94 response.appendHeader(header->first, header->second);
95 } 95 }
96 response.setBlobDataHandle(blobDataHandle()); 96 response.setBlobDataHandle(blobDataHandle());
97 } 97 }
98 98
99 FetchResponseData::FetchResponseData(Type type, unsigned short status, AtomicStr ing statusMessage) 99 FetchResponseData::FetchResponseData(Type type, unsigned short status, AtomicStr ing statusMessage)
100 : m_type(type) 100 : m_type(type)
101 , m_status(status) 101 , m_status(status)
102 , m_statusMessage(statusMessage) 102 , m_statusMessage(statusMessage)
103 , m_headerList(FetchHeaderList::create()) 103 , m_headerList(FetchHeaderList::create())
104 { 104 {
105 } 105 }
106 106
107 void FetchResponseData::trace(Visitor* visitor) 107 void FetchResponseData::trace(Visitor* visitor)
108 { 108 {
109 visitor->trace(m_headerList); 109 visitor->trace(m_headerList);
110 visitor->trace(m_internalResponse); 110 visitor->trace(m_internalResponse);
111 } 111 }
112 112
113 } // namespace blink 113 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698