summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorjeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-29 18:55:18 +0000
committerjeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-29 18:55:18 +0000
commit48ce616af771249804667888297d0081b6b3e249 (patch)
tree21aecf73bcb129000a2df54887cd569c18b04c5f /chrome/common
parent159b2a3a31ff9aab59dc489e2bb1549eefec6039 (diff)
downloadchromium_src-48ce616af771249804667888297d0081b6b3e249.zip
chromium_src-48ce616af771249804667888297d0081b6b3e249.tar.gz
chromium_src-48ce616af771249804667888297d0081b6b3e249.tar.bz2
* Bring up render_mesages.cc on POSIX.
* Add Pickle::Read/WriteUint32 & ParamTraits<uint32>. * Removed NSEvent from WebInputEvent since it appears not to be needed anymore. Review URL: http://codereview.chromium.org/16479 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7484 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/common.scons4
-rw-r--r--chrome/common/ipc_message_utils.h18
2 files changed, 20 insertions, 2 deletions
diff --git a/chrome/common/common.scons b/chrome/common/common.scons
index 8edc509..a86aa6b 100644
--- a/chrome/common/common.scons
+++ b/chrome/common/common.scons
@@ -60,12 +60,14 @@ input_files.extend([
'json_value_serializer.cc',
'libxml_utils.cc',
'logging_chrome.cc',
+ 'message_router.cc',
'net/cookie_monster_sqlite.cc',
'notification_registrar.cc',
'notification_service.cc',
'pref_member.cc',
'pref_names.cc',
'property_bag.cc',
+ 'render_messages.cc',
'slide_animation.cc',
'sqlite_compiled_statement.cc',
'sqlite_utils.cc',
@@ -100,12 +102,10 @@ if env.Bit('windows'):
'ipc_sync_channel.cc',
'jstemplate_builder.cc',
'l10n_util.cc',
- 'message_router.cc',
'net/url_request_intercept_job.cc',
'os_exchange_data.cc',
'plugin_messages.cc',
'process_watcher.cc',
- 'render_messages.cc',
'resource_bundle.cc',
'resource_dispatcher.cc',
'security_filter_peer.cc',
diff --git a/chrome/common/ipc_message_utils.h b/chrome/common/ipc_message_utils.h
index b01d037..4234737 100644
--- a/chrome/common/ipc_message_utils.h
+++ b/chrome/common/ipc_message_utils.h
@@ -161,6 +161,24 @@ struct ParamTraits<size_t> {
}
};
+#if defined(OS_MACOSX)
+// On Linux size_t & uint32 can be the same type.
+// TODO(playmobil): Fix compilation if this is not the case.
+template <>
+struct ParamTraits<uint32> {
+ typedef uint32 param_type;
+ static void Write(Message* m, const param_type& p) {
+ m->WriteUInt32(p);
+ }
+ static bool Read(const Message* m, void** iter, param_type* r) {
+ return m->ReadUInt32(iter, r);
+ }
+ static void Log(const param_type& p, std::wstring* l) {
+ l->append(StringPrintf(L"%u", p));
+ }
+};
+#endif // defined(OS_MACOSX)
+
template <>
struct ParamTraits<int64> {
typedef int64 param_type;