| Index: Source/modules/serviceworkers/ResponseInit.h
|
| diff --git a/Source/modules/serviceworkers/ResponseInit.h b/Source/modules/serviceworkers/ResponseInit.h
|
| index bda31bd5aa5efa060d908307e065a9ca6b326fbe..01e00a7f35c94e1bc89f808782d045ba84f5583f 100644
|
| --- a/Source/modules/serviceworkers/ResponseInit.h
|
| +++ b/Source/modules/serviceworkers/ResponseInit.h
|
| @@ -6,30 +6,34 @@
|
| #define ResponseInit_h
|
|
|
| #include "bindings/core/v8/Dictionary.h"
|
| -#include "modules/serviceworkers/HeaderMap.h"
|
| +#include "modules/serviceworkers/Headers.h"
|
| #include "wtf/RefPtr.h"
|
|
|
| namespace WebCore {
|
|
|
| struct ResponseInit {
|
| ResponseInit()
|
| - : status(200)
|
| - , statusText("OK")
|
| + : m_status(200)
|
| + , m_statusText("OK")
|
| {
|
| }
|
| explicit ResponseInit(const Dictionary& options)
|
| - : status(200)
|
| - , statusText("OK")
|
| + : m_status(200)
|
| + , m_statusText("OK")
|
| {
|
| - options.get("status", status);
|
| + options.get("status", m_status);
|
| // FIXME: Spec uses ByteString for statusText. http://crbug.com/347426
|
| - options.get("statusText", statusText);
|
| - options.get("headers", headers);
|
| + options.get("statusText", m_statusText);
|
| + options.get("headers", m_headers);
|
| + if (!m_headers) {
|
| + options.get("headers", m_headersDictionary);
|
| + }
|
| }
|
|
|
| - unsigned short status;
|
| - String statusText;
|
| - RefPtr<HeaderMap> headers;
|
| + unsigned short m_status;
|
| + String m_statusText;
|
| + RefPtr<Headers> m_headers;
|
| + Dictionary m_headersDictionary;
|
| };
|
|
|
| }
|
|
|