summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-21 11:21:39 +0000
committernasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-21 11:21:39 +0000
commitda9a32b9e282c1653bb6b5c1b8c89a1970905f21 (patch)
tree847fd0133119d556ff4900890768472e5c919cc4
parent2ec6b9c05878c1fcaf3d684a23c1fbe640e4e9eb (diff)
downloadchromium_src-da9a32b9e282c1653bb6b5c1b8c89a1970905f21.zip
chromium_src-da9a32b9e282c1653bb6b5c1b8c89a1970905f21.tar.gz
chromium_src-da9a32b9e282c1653bb6b5c1b8c89a1970905f21.tar.bz2
Add filtering of IPC messages when RenderFrameHost is swapped out.
BUG=351815 Review URL: https://codereview.chromium.org/205543002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258521 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/frame_host/render_frame_host_impl.cc21
1 files changed, 21 insertions, 0 deletions
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 2050025..4ed8a4c 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -18,6 +18,7 @@
#include "content/common/frame_messages.h"
#include "content/common/input_messages.h"
#include "content/common/inter_process_time_ticks_converter.h"
+#include "content/common/swapped_out_messages.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/content_browser_client.h"
#include "content/public/browser/render_process_host.h"
@@ -228,6 +229,26 @@ bool RenderFrameHostImpl::Send(IPC::Message* message) {
}
bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) {
+ // Filter out most IPC messages if this renderer is swapped out.
+ // We still want to handle certain ACKs to keep our state consistent.
+ // TODO(nasko): Only check RenderViewHost state, as this object's own state
+ // isn't yet properly updated. Transition this check once the swapped out
+ // state is correct in RenderFrameHost itself.
+ if (render_view_host_->IsSwappedOut()) {
+ if (!SwappedOutMessages::CanHandleWhileSwappedOut(msg)) {
+ // If this is a synchronous message and we decided not to handle it,
+ // we must send an error reply, or else the renderer will be stuck
+ // and won't respond to future requests.
+ if (msg.is_sync()) {
+ IPC::Message* reply = IPC::SyncMessage::GenerateReply(&msg);
+ reply->set_reply_error();
+ Send(reply);
+ }
+ // Don't continue looking for someone to handle it.
+ return true;
+ }
+ }
+
if (delegate_->OnMessageReceived(this, msg))
return true;