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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2561453002: Remove null Document check from RenderFrameImpl::OnMessageReceived (Closed)
Patch Set: Fix for real this time Created 4 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index f68bb2e5666f71404361907fd889992464b5d5cf..68ad6f13d7d6404392bd7c7e668003f310b74dd4 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1477,13 +1477,9 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) {
if (!frame_)
return false;
- // TODO(kenrb): document() should not be null, but as a transitional step
- // we have RenderFrameProxy 'wrapping' a RenderFrameImpl, passing messages
- // to this method. This happens for a top-level remote frame, where a
- // document-less RenderFrame is replaced by a RenderFrameProxy but kept
- // around and is still able to receive messages.
- if (!frame_->document().isNull())
- GetContentClient()->SetActiveURL(frame_->document().url());
+ DCHECK(!frame_->document().isNull());
+
+ GetContentClient()->SetActiveURL(frame_->document().url());
for (auto& observer : observers_) {
if (observer.OnMessageReceived(msg))
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698