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

Unified Diff: Source/modules/serviceworkers/Response.cpp

Issue 519803002: Support embedded created Response objects in ServiceWorker. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@2e-request
Patch Set: rebase to trunk, now just waiting on upstream CL 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/serviceworkers/Response.h ('k') | Source/modules/serviceworkers/ResponseTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/serviceworkers/Response.cpp
diff --git a/Source/modules/serviceworkers/Response.cpp b/Source/modules/serviceworkers/Response.cpp
index a4c01d25ca0302f13c7e58232f378012f67f04ea..5aec6c636a59355a4fe05c4f89ef7f1e6b98306c 100644
--- a/Source/modules/serviceworkers/Response.cpp
+++ b/Source/modules/serviceworkers/Response.cpp
@@ -6,12 +6,44 @@
#include "Response.h"
#include "bindings/core/v8/Dictionary.h"
+#include "bindings/core/v8/ExceptionState.h"
#include "core/fileapi/Blob.h"
#include "modules/serviceworkers/FetchBodyStream.h"
#include "modules/serviceworkers/ResponseInit.h"
+#include "public/platform/WebServiceWorkerResponse.h"
namespace blink {
+namespace {
+
+PassRefPtrWillBeRawPtr<FetchResponseData> createFetchResponseDataFromWebResponse(const WebServiceWorkerResponse& webResponse)
+{
+ RefPtrWillBeRawPtr<FetchResponseData> response;
+ if (200 <= webResponse.status() && webResponse.status() < 300)
+ response = FetchResponseData::create();
+ else
+ response = FetchResponseData::createNetworkErrorResponse();
+
+ response->setURL(webResponse.url());
+ response->setStatus(webResponse.status());
+ response->setStatusMessage(webResponse.statusText());
+ return response;
+}
+
+PassRefPtrWillBeRawPtr<Headers> createHeadersFromWebResponse(const WebServiceWorkerResponse& webResponse)
+{
+ RefPtrWillBeRawPtr<Headers> headers = Headers::create();
+ TrackExceptionState exceptionState;
+ for (HashMap<String, String>::const_iterator i = webResponse.headers().begin(), end = webResponse.headers().end(); i != end; ++i) {
+ headers->append(i->key, i->value, exceptionState);
+ if (exceptionState.hadException())
+ return PassRefPtrWillBeRawPtr<Headers>();
+ }
+ return headers;
+}
+
+}
+
DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(Response);
PassRefPtrWillBeRawPtr<Response> Response::create(Blob* body, const Dictionary& responseInit, ExceptionState& exceptionState)
@@ -94,6 +126,11 @@ PassRefPtrWillBeRawPtr<Response> Response::create(PassRefPtrWillBeRawPtr<FetchRe
return adoptRefWillBeNoop(new Response(response));
}
+PassRefPtrWillBeRawPtr<Response> Response::create(const WebServiceWorkerResponse& webResponse)
+{
+ return adoptRefWillBeNoop(new Response(webResponse));
+}
+
String Response::type() const
{
// "The type attribute's getter must return response's type."
@@ -173,6 +210,15 @@ Response::Response(PassRefPtrWillBeRawPtr<FetchResponseData> response)
ScriptWrappable::init(this);
}
+// FIXME: Handle response body data.
+Response::Response(const WebServiceWorkerResponse& webResponse)
+ : m_response(createFetchResponseDataFromWebResponse(webResponse))
+ , m_headers(createHeadersFromWebResponse(webResponse))
+{
+ m_headers->setGuard(Headers::ResponseGuard);
+ ScriptWrappable::init(this);
+}
+
void Response::trace(Visitor* visitor)
{
visitor->trace(m_response);
« no previous file with comments | « Source/modules/serviceworkers/Response.h ('k') | Source/modules/serviceworkers/ResponseTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698