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

Unified Diff: third_party/WebKit/Source/modules/fetch/Response.cpp

Issue 2516353002: Introduce url_list to the Response scheme of CacheStorage. (Closed)
Patch Set: implicit conversion WebURL <-> GURL and WebVector <- vector Created 4 years 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 side-by-side diff with in-line comments
Download patch
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 8b9d1b9624de3301d194ed8714db21e779ca022a..264316c9a362ac9529ff89b7b24889106433130b 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 WebVector<WebURL>& webURLList = webResponse.urlList();
+ Vector<KURL> urlList(webURLList.size());
+ std::transform(webURLList.begin(), webURLList.end(), urlList.begin(),
+ [](const WebURL& url) { return url; });
+ 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;
}

Powered by Google App Engine
This is Rietveld 408576698