From dabd2c6df4a215d4c1b05a84bd60713b71cbebef Mon Sep 17 00:00:00 2001 From: "darin@chromium.org" Date: Fri, 26 Feb 2010 15:16:33 +0000 Subject: Add a defensive null check. Apparently, we can sometimes have a null RenderView here. This must corresponse to a frame/document that has already been detached from the page. R=jorlow BUG=36831 TEST=none Review URL: http://codereview.chromium.org/661169 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40121 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/renderer/render_thread.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/renderer/render_thread.cc') diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index 58d225f..047dbff 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -277,8 +277,8 @@ int32 RenderThread::RoutingIDForCurrentContext() { if (v8::Context::InContext()) { RenderView* view = RenderView::FromWebView(WebFrame::frameForCurrentContext()->view()); - DCHECK(view); - routing_id = view->routing_id(); + if (view) + routing_id = view->routing_id(); } else { DLOG(WARNING) << "Not called within a script context!"; } -- cgit v1.1