Chromium Code Reviews| Index: third_party/WebKit/Source/modules/fetch/Response.cpp |
| diff --git a/third_party/WebKit/Source/modules/fetch/Response.cpp b/third_party/WebKit/Source/modules/fetch/Response.cpp |
| index 50d5c8629a0651016371a11d15f16387116cf707..6e43104b99169c7368b46000449c43750c12faae 100644 |
| --- a/third_party/WebKit/Source/modules/fetch/Response.cpp |
| +++ b/third_party/WebKit/Source/modules/fetch/Response.cpp |
| @@ -44,7 +44,11 @@ FetchResponseData* createFetchResponseDataFromWebResponse( |
| else |
| response = FetchResponseData::createNetworkErrorResponse(); |
| - response->setURL(webResponse.url()); |
| + const blink::WebVector<blink::WebURL>& webURLList = webResponse.urlList(); |
| + Vector<blink::KURL> urlList(webURLList.size()); |
| + std::transform(webURLList.begin(), webURLList.end(), urlList.begin(), |
| + [](const blink::WebURL& url) { return url; }); |
|
falken
2016/11/30 14:57:38
we shouldn't need all the blink:: here, no?
horo
2016/12/01 07:42:14
Done.
|
| + response->setURLList(urlList); |
| response->setStatus(webResponse.status()); |
| response->setStatusMessage(webResponse.statusText()); |
| response->setResponseTime(webResponse.responseTime()); |
| @@ -350,9 +354,12 @@ String Response::url() const { |
| // "The url attribute's getter must return the empty string if response's |
| // url is null and response's url, serialized with the exclude fragment |
| // flag set, otherwise." |
| - if (!m_response->url().hasFragmentIdentifier()) |
| - return m_response->url(); |
| - KURL url(m_response->url()); |
| + const KURL* responseURL = m_response->url(); |
| + if (!responseURL) |
| + return emptyString(); |
| + if (!responseURL->hasFragmentIdentifier()) |
| + return *responseURL; |
| + KURL url(*responseURL); |
| url.removeFragmentIdentifier(); |
| return url; |
| } |