diff options
Diffstat (limited to 'chrome')
12 files changed, 16 insertions, 16 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 741ad41..500e917 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -358,7 +358,7 @@ bool BrowserRenderProcessHost::WaitForPaintMsg(int render_widget_id, return widget_helper_->WaitForPaintMsg(render_widget_id, max_delay, msg); } -void BrowserRenderProcessHost::ReceivedBadMessage(uint16 msg_type) { +void BrowserRenderProcessHost::ReceivedBadMessage(uint32 msg_type) { BadMessageTerminateProcess(msg_type, GetHandle()); } @@ -789,7 +789,7 @@ void BrowserRenderProcessHost::OnChannelConnected(int32 peer_pid) { // Static. This function can be called from any thread. void BrowserRenderProcessHost::BadMessageTerminateProcess( - uint16 msg_type, base::ProcessHandle process) { + uint32 msg_type, base::ProcessHandle process) { LOG(ERROR) << "bad message " << msg_type << " terminating renderer."; if (run_renderer_in_process()) { // In single process mode it is better if we don't suicide but just crash. diff --git a/chrome/browser/renderer_host/browser_render_process_host.h b/chrome/browser/renderer_host/browser_render_process_host.h index fae3145..cd94bf5 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.h +++ b/chrome/browser/renderer_host/browser_render_process_host.h @@ -66,7 +66,7 @@ class BrowserRenderProcessHost : public RenderProcessHost, virtual bool WaitForPaintMsg(int render_widget_id, const base::TimeDelta& max_delay, IPC::Message* msg); - virtual void ReceivedBadMessage(uint16 msg_type); + virtual void ReceivedBadMessage(uint32 msg_type); virtual void WidgetRestored(); virtual void WidgetHidden(); virtual void ViewCreated(); @@ -89,7 +89,7 @@ class BrowserRenderProcessHost : public RenderProcessHost, // If the a process has sent a message that cannot be decoded, it is deemed // corrupted and thus needs to be terminated using this call. This function // can be safely called from any thread. - static void BadMessageTerminateProcess(uint16 msg_type, + static void BadMessageTerminateProcess(uint32 msg_type, base::ProcessHandle renderer); // NotificationObserver implementation. diff --git a/chrome/browser/renderer_host/database_dispatcher_host.cc b/chrome/browser/renderer_host/database_dispatcher_host.cc index 9a2d98a..41b8331 100644 --- a/chrome/browser/renderer_host/database_dispatcher_host.cc +++ b/chrome/browser/renderer_host/database_dispatcher_host.cc @@ -90,7 +90,7 @@ bool DatabaseDispatcherHost::OnMessageReceived( return handled; } -void DatabaseDispatcherHost::ReceivedBadMessage(uint16 msg_type) { +void DatabaseDispatcherHost::ReceivedBadMessage(uint32 msg_type) { BrowserRenderProcessHost::BadMessageTerminateProcess( msg_type, process_handle_); } diff --git a/chrome/browser/renderer_host/database_dispatcher_host.h b/chrome/browser/renderer_host/database_dispatcher_host.h index 7b6a558..eb0f8f1 100644 --- a/chrome/browser/renderer_host/database_dispatcher_host.h +++ b/chrome/browser/renderer_host/database_dispatcher_host.h @@ -55,7 +55,7 @@ class DatabaseDispatcherHost void AddObserver(); void RemoveObserver(); - void ReceivedBadMessage(uint16 msg_type); + void ReceivedBadMessage(uint32 msg_type); void SendMessage(IPC::Message* message); // VFS message handlers (file thread) diff --git a/chrome/browser/renderer_host/mock_render_process_host.cc b/chrome/browser/renderer_host/mock_render_process_host.cc index e2aaa13..8be0416 100644 --- a/chrome/browser/renderer_host/mock_render_process_host.cc +++ b/chrome/browser/renderer_host/mock_render_process_host.cc @@ -37,7 +37,7 @@ bool MockRenderProcessHost::WaitForPaintMsg(int render_widget_id, return false; } -void MockRenderProcessHost::ReceivedBadMessage(uint16 msg_type) { +void MockRenderProcessHost::ReceivedBadMessage(uint32 msg_type) { ++bad_msg_count_; } diff --git a/chrome/browser/renderer_host/mock_render_process_host.h b/chrome/browser/renderer_host/mock_render_process_host.h index 4550512..aa04651 100644 --- a/chrome/browser/renderer_host/mock_render_process_host.h +++ b/chrome/browser/renderer_host/mock_render_process_host.h @@ -38,7 +38,7 @@ class MockRenderProcessHost : public RenderProcessHost { virtual bool WaitForPaintMsg(int render_widget_id, const base::TimeDelta& max_delay, IPC::Message* msg); - virtual void ReceivedBadMessage(uint16 msg_type); + virtual void ReceivedBadMessage(uint32 msg_type); virtual void WidgetRestored(); virtual void WidgetHidden(); virtual void ViewCreated(); diff --git a/chrome/browser/renderer_host/render_process_host.h b/chrome/browser/renderer_host/render_process_host.h index 9425949..aad1f83 100644 --- a/chrome/browser/renderer_host/render_process_host.h +++ b/chrome/browser/renderer_host/render_process_host.h @@ -173,7 +173,7 @@ class RenderProcessHost : public IPC::Channel::Sender, IPC::Message* msg) = 0; // Called when a received message cannot be decoded. - virtual void ReceivedBadMessage(uint16 msg_type) = 0; + virtual void ReceivedBadMessage(uint32 msg_type) = 0; // Track the count of visible widgets. Called by listeners to register and // unregister visibility. diff --git a/chrome/browser/views/about_ipc_dialog.cc b/chrome/browser/views/about_ipc_dialog.cc index d7ece5d..092106d 100644 --- a/chrome/browser/views/about_ipc_dialog.cc +++ b/chrome/browser/views/about_ipc_dialog.cc @@ -88,7 +88,7 @@ struct Settings { } settings_views = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; -void CreateColumn(uint16 start, uint16 end, HWND hwnd, +void CreateColumn(uint32 start, uint32 end, HWND hwnd, CListViewCtrl** control) { DCHECK(*control == NULL); *control = new CListViewCtrl(hwnd); diff --git a/chrome/common/appcache/appcache_dispatcher_host.cc b/chrome/common/appcache/appcache_dispatcher_host.cc index 854d5d8..f6c316b 100644 --- a/chrome/common/appcache/appcache_dispatcher_host.cc +++ b/chrome/common/appcache/appcache_dispatcher_host.cc @@ -188,7 +188,7 @@ void AppCacheDispatcherHost::SwapCacheCallback(bool result, void* param) { frontend_proxy_.sender()->Send(pending_reply_msg_.release()); } -void AppCacheDispatcherHost::ReceivedBadMessage(uint16 msg_type) { +void AppCacheDispatcherHost::ReceivedBadMessage(uint32 msg_type) { // TODO(michaeln): Consider gathering UMA stats // http://code.google.com/p/chromium/issues/detail?id=24634 BrowserRenderProcessHost::BadMessageTerminateProcess( diff --git a/chrome/common/appcache/appcache_dispatcher_host.h b/chrome/common/appcache/appcache_dispatcher_host.h index 7b04b9c..9ad46fb 100644 --- a/chrome/common/appcache/appcache_dispatcher_host.h +++ b/chrome/common/appcache/appcache_dispatcher_host.h @@ -54,7 +54,7 @@ class AppCacheDispatcherHost { void StartUpdateCallback(bool result, void* param); void SwapCacheCallback(bool result, void* param); - void ReceivedBadMessage(uint16 msg_type); + void ReceivedBadMessage(uint32 msg_type); AppCacheFrontendProxy frontend_proxy_; appcache::AppCacheBackendImpl backend_impl_; diff --git a/chrome/common/ipc_test_sink.cc b/chrome/common/ipc_test_sink.cc index c278902..6a0e45b 100644 --- a/chrome/common/ipc_test_sink.cc +++ b/chrome/common/ipc_test_sink.cc @@ -26,7 +26,7 @@ const Message* TestSink::GetMessageAt(size_t index) const { return &messages_[index]; } -const Message* TestSink::GetFirstMessageMatching(uint16 id) const { +const Message* TestSink::GetFirstMessageMatching(uint32 id) const { for (size_t i = 0; i < messages_.size(); i++) { if (messages_[i].type() == id) return &messages_[i]; @@ -34,7 +34,7 @@ const Message* TestSink::GetFirstMessageMatching(uint16 id) const { return NULL; } -const Message* TestSink::GetUniqueMessageMatching(uint16 id) const { +const Message* TestSink::GetUniqueMessageMatching(uint32 id) const { size_t found_index = 0; size_t found_count = 0; for (size_t i = 0; i < messages_.size(); i++) { diff --git a/chrome/common/ipc_test_sink.h b/chrome/common/ipc_test_sink.h index 995ae38..ec1e70c 100644 --- a/chrome/common/ipc_test_sink.h +++ b/chrome/common/ipc_test_sink.h @@ -63,14 +63,14 @@ class TestSink { // Returns the first message with the given ID in the queue. If there is no // message with the given ID, returns NULL. The returned pointer will only be // valid until another message is received or the list is cleared. - const Message* GetFirstMessageMatching(uint16 id) const; + const Message* GetFirstMessageMatching(uint32 id) const; // Returns the message with the given ID in the queue. If there is no such // message or there is more than one of that message, this will return NULL // (with the expectation that you'll do an ASSERT_TRUE() on the result). // The returned pointer will only be valid until another message is received // or the list is cleared. - const Message* GetUniqueMessageMatching(uint16 id) const; + const Message* GetUniqueMessageMatching(uint32 id) const; private: // The actual list of received messages. |