diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 17:38:42 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 17:38:42 +0000 |
commit | 386c7350ed9b017020e84d4b1783c318e68418ab (patch) | |
tree | 41716a234bbd435a5c284239f5601ad77bba30a9 /chrome/common/worker_messages.h | |
parent | 16b7123730e79f41519d1e8221d0cb0619a89b7c (diff) | |
download | chromium_src-386c7350ed9b017020e84d4b1783c318e68418ab.zip chromium_src-386c7350ed9b017020e84d4b1783c318e68418ab.tar.gz chromium_src-386c7350ed9b017020e84d4b1783c318e68418ab.tar.bz2 |
FBTF: Add default ctors/dtors for various param structs.
This patch also moves ParamTraits method definitions to the cc file.
(hbono@ has a patch out that does this for render_messages_params.h, so this
patch doesn't touch that to make sure we don't conflict.)
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/3413003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/worker_messages.h')
-rw-r--r-- | chrome/common/worker_messages.h | 81 |
1 files changed, 12 insertions, 69 deletions
diff --git a/chrome/common/worker_messages.h b/chrome/common/worker_messages.h index 80f876f..0e76c4f 100644 --- a/chrome/common/worker_messages.h +++ b/chrome/common/worker_messages.h @@ -13,7 +13,6 @@ #include <vector> #include "base/basictypes.h" -#include "chrome/common/common_param_traits.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_message_utils.h" @@ -24,6 +23,9 @@ typedef std::pair<string16, std::vector<int> > QueuedMessage; // IPC message. The data members directly correspond to parameters of // WebWorkerClient::postConsoleMessageToWorkerObject() struct WorkerHostMsg_PostConsoleMessageToWorkerObject_Params { + WorkerHostMsg_PostConsoleMessageToWorkerObject_Params(); + ~WorkerHostMsg_PostConsoleMessageToWorkerObject_Params(); + int source_identifier; int message_type; int message_level; @@ -34,6 +36,9 @@ struct WorkerHostMsg_PostConsoleMessageToWorkerObject_Params { // Parameter structure for WorkerProcessMsg_CreateWorker. struct WorkerProcessMsg_CreateWorker_Params { + WorkerProcessMsg_CreateWorker_Params(); + ~WorkerProcessMsg_CreateWorker_Params(); + GURL url; bool is_shared; string16 name; @@ -50,80 +55,18 @@ namespace IPC { template <> struct ParamTraits<WorkerHostMsg_PostConsoleMessageToWorkerObject_Params> { typedef WorkerHostMsg_PostConsoleMessageToWorkerObject_Params param_type; - static void Write(Message* m, const param_type& p) { - WriteParam(m, p.source_identifier); - WriteParam(m, p.message_type); - WriteParam(m, p.message_level); - WriteParam(m, p.message); - WriteParam(m, p.line_number); - WriteParam(m, p.source_url); - } - static bool Read(const Message* m, void** iter, param_type* p) { - return - ReadParam(m, iter, &p->source_identifier) && - ReadParam(m, iter, &p->message_type) && - ReadParam(m, iter, &p->message_level) && - ReadParam(m, iter, &p->message) && - ReadParam(m, iter, &p->line_number) && - ReadParam(m, iter, &p->source_url); - } - static void Log(const param_type& p, std::string* l) { - l->append("("); - LogParam(p.source_identifier, l); - l->append(", "); - LogParam(p.message_type, l); - l->append(", "); - LogParam(p.message_level, l); - l->append(", "); - LogParam(p.message, l); - l->append(", "); - LogParam(p.line_number, l); - l->append(", "); - LogParam(p.source_url, l); - l->append(")"); - } + static void Write(Message* m, const param_type& p); + static bool Read(const Message* m, void** iter, param_type* p); + static void Log(const param_type& p, std::string* l); }; // Traits for WorkerProcessMsg_CreateWorker_Params. template <> struct ParamTraits<WorkerProcessMsg_CreateWorker_Params> { typedef WorkerProcessMsg_CreateWorker_Params param_type; - static void Write(Message* m, const param_type& p) { - WriteParam(m, p.url); - WriteParam(m, p.is_shared); - WriteParam(m, p.name); - WriteParam(m, p.route_id); - WriteParam(m, p.creator_process_id); - WriteParam(m, p.creator_appcache_host_id); - WriteParam(m, p.shared_worker_appcache_id); - } - static bool Read(const Message* m, void** iter, param_type* p) { - return - ReadParam(m, iter, &p->url) && - ReadParam(m, iter, &p->is_shared) && - ReadParam(m, iter, &p->name) && - ReadParam(m, iter, &p->route_id) && - ReadParam(m, iter, &p->creator_process_id) && - ReadParam(m, iter, &p->creator_appcache_host_id) && - ReadParam(m, iter, &p->shared_worker_appcache_id); - } - static void Log(const param_type& p, std::string* l) { - l->append("("); - LogParam(p.url, l); - l->append(", "); - LogParam(p.is_shared, l); - l->append(", "); - LogParam(p.name, l); - l->append(", "); - LogParam(p.route_id, l); - l->append(", "); - LogParam(p.creator_process_id, l); - l->append(", "); - LogParam(p.creator_appcache_host_id, l); - l->append(", "); - LogParam(p.shared_worker_appcache_id, l); - l->append(")"); - } + static void Write(Message* m, const param_type& p); + static bool Read(const Message* m, void** iter, param_type* p); + static void Log(const param_type& p, std::string* l); }; } // namespace IPC |