| Index: content/common/service_worker_messages.h
|
| diff --git a/content/common/service_worker_messages.h b/content/common/service_worker_messages.h
|
| index d2a5eb27602b15e38c9a351eb9bc231da098c5b3..78beb73bcacef243b06f41ff6e92b4b8c1737cc6 100644
|
| --- a/content/common/service_worker_messages.h
|
| +++ b/content/common/service_worker_messages.h
|
| @@ -5,11 +5,18 @@
|
| // Message definition file, included multiple times, hence no include guard.
|
|
|
| #include "base/strings/string16.h"
|
| +#include "content/common/service_worker_types.h"
|
| #include "ipc/ipc_message_macros.h"
|
| #include "ipc/ipc_param_traits.h"
|
| #include "third_party/WebKit/public/platform/WebServiceWorkerError.h"
|
| #include "url/gurl.h"
|
|
|
| +IPC_STRUCT_TRAITS_BEGIN(content::ServiceWorkerFetchRequest)
|
| + IPC_STRUCT_TRAITS_MEMBER(url)
|
| + IPC_STRUCT_TRAITS_MEMBER(method)
|
| + IPC_STRUCT_TRAITS_MEMBER(headers)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| #undef IPC_MESSAGE_EXPORT
|
| #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
|
|
|
| @@ -63,11 +70,33 @@ IPC_MESSAGE_CONTROL1(ServiceWorkerHostMsg_ProviderDestroyed,
|
| // For EmbeddedWorker related messages -------------------------------------
|
|
|
| // Browser -> Renderer message to create a new embedded worker context.
|
| -IPC_MESSAGE_CONTROL3(ServiceWorkerMsg_StartWorker,
|
| +IPC_MESSAGE_CONTROL3(EmbeddedWorkerMsg_StartWorker,
|
| int /* embedded_worker_id */,
|
| int64 /* service_worker_version_id */,
|
| GURL /* script_url */)
|
|
|
| -// Browser -> Renderer message to terminate the embedded worker.
|
| -IPC_MESSAGE_CONTROL1(ServiceWorkerMsg_TerminateWorker,
|
| +// Browser -> Renderer message to stop (terminate) the embedded worker.
|
| +IPC_MESSAGE_CONTROL1(EmbeddedWorkerMsg_StopWorker,
|
| + int /* embedded_worker_id */)
|
| +
|
| +// Renderer -> Browser message to indicate that the worker is started.
|
| +IPC_MESSAGE_CONTROL2(EmbeddedWorkerHostMsg_WorkerStarted,
|
| + int /* thread_id */,
|
| + int /* embedded_worker_id */)
|
| +
|
| +// Renderer -> Browser message to indicate that the worker is stopped.
|
| +IPC_MESSAGE_CONTROL1(EmbeddedWorkerHostMsg_WorkerStopped,
|
| int /* embedded_worker_id */)
|
| +
|
| +// ---------------------------------------------------------------------------
|
| +// For EmbeddedWorkerContext related messages, which are directly sent from
|
| +// browser to the worker thread in the child process. We use a new message class
|
| +// for this for easier cross-thread message dispatching.
|
| +
|
| +#undef IPC_MESSAGE_START
|
| +#define IPC_MESSAGE_START EmbeddedWorkerContextMsgStart
|
| +
|
| +IPC_MESSAGE_CONTROL3(EmbeddedWorkerContextMsg_FetchEvent,
|
| + int /* thread_id */,
|
| + int /* embedded_worker_id */,
|
| + content::ServiceWorkerFetchRequest)
|
|
|