diff options
| author | mal@chromium.org <mal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 18:26:24 +0000 |
|---|---|---|
| committer | mal@chromium.org <mal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 18:26:24 +0000 |
| commit | 9985d68f21cdcd27d761af2754d07782d45dd304 (patch) | |
| tree | 2a0f01d1c9b8b99cafaac4273c9e26134da42f7c | |
| parent | 28dad7b7c6c920f7a3ca4eeb78ed270cb4df39fb (diff) | |
| download | chromium_src-9985d68f21cdcd27d761af2754d07782d45dd304.zip chromium_src-9985d68f21cdcd27d761af2754d07782d45dd304.tar.gz chromium_src-9985d68f21cdcd27d761af2754d07782d45dd304.tar.bz2 | |
Merge 40121 - 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, darin
BUG=36831
TEST=none
Review URL: http://codereview.chromium.org/661169
TBR=darin@chromium.org
Review URL: http://codereview.chromium.org/661188
git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@40134 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/renderer/render_thread.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index c054b0c..454bee5 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -237,8 +237,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!"; } |