ServiceWorker: support Response.{status,statusText,headers} [blink] (2/3)

public/platform/WebServiceWorkerResponse.h

Index: public/platform/WebServiceWorkerResponse.h
diff --git a/public/platform/WebServiceWorkerResponse.h b/public/platform/WebServiceWorkerResponse.h
index e0d287fd9bd06ca68b36a7617cbd2c3eb445f914..a3d84994f46e813e147b3445cbd436be863ae6c5 100644
--- a/public/platform/WebServiceWorkerResponse.h
+++ b/public/platform/WebServiceWorkerResponse.h
@@ -5,32 +5,62 @@
 #ifndef WebServiceWorkerResponse_h
 #define WebServiceWorkerResponse_h
 
+#include "WebCommon.h"
+#include "public/platform/WebPrivatePtr.h"
 #include "public/platform/WebPrivatePtr.h"

[falken, 2014/05/24 14:32:36]

double include WebPrivatePtr.h

[kinuko, 2014/05/26 05:45:13]

Done.

 #include "public/platform/WebString.h"
 #include "public/platform/WebVector.h"
 
+#if INSIDE_BLINK
+#include "wtf/Forward.h"
+#include "wtf/HashMap.h"
+#include "wtf/text/StringHash.h"
+#endif
+
+// FIXME: Remove this after chromium code is cleaned up.
+#define NEW_SERVICE_WORKER_RESPONSE_INTERFACE
+
 namespace blink {
 
+class WebServiceWorkerResponsePrivate;
+
 // Represents a response to a fetch operation. ServiceWorker uses this to
 // respond to a FetchEvent dispatched by the browser. The plan is for the Cache
 // and fetch() API to also use it.
 class BLINK_PLATFORM_EXPORT WebServiceWorkerResponse {
 public:
-    void setStatusCode(unsigned short);
-    unsigned short statusCode() const;
+    ~WebServiceWorkerResponse() { reset(); }
+    WebServiceWorkerResponse();
+    WebServiceWorkerResponse& operator=(const WebServiceWorkerResponse& r)

[falken, 2014/05/24 14:32:36]

I think Blink style is to write out full words.. "r" -> "response"

[kinuko, 2014/05/26 05:45:13]

Done, but for operator= impl using assign() in public/platform headers using a
single-char variable seems to be pretty common.

+    {
+        assign(r);
+        return *this;
+    }
+
+    void reset();
+    void assign(const WebServiceWorkerResponse&);
+
+    void setStatus(unsigned short);
+    unsigned short status() const;
 
     void setStatusText(const WebString&);
     WebString statusText() const;
 
-    void setMethod(const WebString&);
-    WebString method() const;
+    void setHeader(const WebString& key, const WebString& value);
+    WebVector<WebString> getHeaderKeys() const;
+    WebString getHeader(const WebString& key) const;
+
+#if INSIDE_BLINK
+    BLINK_COMMON_EXPORT void setHeaders(const HashMap<String, String>&);
+    BLINK_COMMON_EXPORT const HashMap<String, String>& headers() const;
+#endif
 
-    // FIXME: Eventually this should have additional methods such as for headers and blob.
+    // FIXME: Eventually this should have additional methods such as for blob.
 
 private:
-    unsigned short m_statusCode;
-    WebString m_statusText;
-    WebString m_method;
+    WebPrivatePtr<WebServiceWorkerResponsePrivate> m_private;
+//    unsigned short m_status;

[jsbell, 2014/05/23 20:59:49]

Delete these?

[kinuko, 2014/05/26 05:45:13]

Done.

+//    WebString m_statusText;
 };
 
 } // namespace blink