Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Side by Side Diff: content/browser/frame_host/render_frame_message_filter.cc

Issue 292443004: Remove IPC_BEGIN_MESSAGE_MAP_EX macro since r270839 made all bad IPCs kill their child processes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/frame_host/render_frame_message_filter.h" 5 #include "content/browser/frame_host/render_frame_message_filter.h"
6 6
7 #include "content/browser/frame_host/render_frame_host_impl.h" 7 #include "content/browser/frame_host/render_frame_host_impl.h"
8 #include "content/browser/renderer_host/render_widget_helper.h" 8 #include "content/browser/renderer_host/render_widget_helper.h"
9 #include "content/common/frame_messages.h" 9 #include "content/common/frame_messages.h"
10 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
(...skipping 21 matching lines...) Expand all
32 int render_process_id, 32 int render_process_id,
33 RenderWidgetHelper* render_widget_helper) 33 RenderWidgetHelper* render_widget_helper)
34 : BrowserMessageFilter(FrameMsgStart), 34 : BrowserMessageFilter(FrameMsgStart),
35 render_process_id_(render_process_id), 35 render_process_id_(render_process_id),
36 render_widget_helper_(render_widget_helper) { 36 render_widget_helper_(render_widget_helper) {
37 } 37 }
38 38
39 RenderFrameMessageFilter::~RenderFrameMessageFilter() { 39 RenderFrameMessageFilter::~RenderFrameMessageFilter() {
40 } 40 }
41 41
42 bool RenderFrameMessageFilter::OnMessageReceived(const IPC::Message& message, 42 bool RenderFrameMessageFilter::OnMessageReceived(const IPC::Message& message) {
43 bool* message_was_ok) {
44 bool handled = true; 43 bool handled = true;
45 IPC_BEGIN_MESSAGE_MAP_EX(RenderFrameMessageFilter, message, *message_was_ok) 44 IPC_BEGIN_MESSAGE_MAP(RenderFrameMessageFilter, message)
46 IPC_MESSAGE_HANDLER(FrameHostMsg_CreateChildFrame, OnCreateChildFrame) 45 IPC_MESSAGE_HANDLER(FrameHostMsg_CreateChildFrame, OnCreateChildFrame)
47 IPC_MESSAGE_UNHANDLED(handled = false) 46 IPC_MESSAGE_UNHANDLED(handled = false)
48 IPC_END_MESSAGE_MAP_EX() 47 IPC_END_MESSAGE_MAP()
49 48
50 return handled; 49 return handled;
51 } 50 }
52 51
53 void RenderFrameMessageFilter::OnCreateChildFrame( 52 void RenderFrameMessageFilter::OnCreateChildFrame(
54 int parent_routing_id, 53 int parent_routing_id,
55 const std::string& frame_name, 54 const std::string& frame_name,
56 int* new_routing_id) { 55 int* new_routing_id) {
57 *new_routing_id = render_widget_helper_->GetNextRoutingID(); 56 *new_routing_id = render_widget_helper_->GetNextRoutingID();
58 BrowserThread::PostTask( 57 BrowserThread::PostTask(
59 BrowserThread::UI, FROM_HERE, 58 BrowserThread::UI, FROM_HERE,
60 base::Bind(&CreateChildFrameOnUI, render_process_id_, 59 base::Bind(&CreateChildFrameOnUI, render_process_id_,
61 parent_routing_id, frame_name, *new_routing_id)); 60 parent_routing_id, frame_name, *new_routing_id));
62 } 61 }
63 62
64 } // namespace content 63 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_message_filter.h ('k') | content/browser/histogram_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698