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

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

Issue 433793002: Introducing the WebServiceWorkerCache. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix running with partial implementation Created 6 years, 4 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
Index: Source/modules/serviceworkers/Response.cpp
diff --git a/Source/modules/serviceworkers/Response.cpp b/Source/modules/serviceworkers/Response.cpp
index 7da6020ebf2a32cb5f8e16ddab47b650cc4a3836..3fa899976a7cfe29b8d2b8f0679acc6673d4c0d2 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 (webResponse.status() < 200 || webResponse.status() >= 300)
+ response = FetchResponseData::createNetworkErrorResponse();
+ else
+ response = FetchResponseData::create();
+
+ 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;
dominicc (has gone to gerrit) 2014/08/11 01:40:41 Why does this track exceptions? Seems rather voodo
gavinp 2014/08/13 23:25:23 I have ABSOLUTELY NO IDEA. I was shocked that this
+ 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)
@@ -98,6 +130,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."
@@ -177,6 +214,15 @@ Response::Response(PassRefPtrWillBeRawPtr<FetchResponseData> response)
ScriptWrappable::init(this);
}
+// FIXME: Handle response body data.
dominicc (has gone to gerrit) 2014/08/11 01:40:41 Where do things like opacity, etc. flow through?
gavinp 2014/08/13 23:25:23 Initially that won't be handled; this CL tries to
+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);

Powered by Google App Engine
This is Rietveld 408576698