summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-15 03:05:19 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-15 03:05:19 +0000
commita7eccaca75f137ddefabb4067287b4775f4ee071 (patch)
tree6729de2c0f44ecbf180ebcc2f52c498afff6bd32 /content
parent7aac5f43d1ed2b1960353b00ab78100369a0e312 (diff)
downloadchromium_src-a7eccaca75f137ddefabb4067287b4775f4ee071.zip
chromium_src-a7eccaca75f137ddefabb4067287b4775f4ee071.tar.gz
chromium_src-a7eccaca75f137ddefabb4067287b4775f4ee071.tar.bz2
Fixes crash in TabContents. During shutdown render_view_host may
return NULL. BUG=73916 TEST=none R=avi@chromium.org Review URL: http://codereview.chromium.org/6863001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/tab_contents/tab_contents.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index 6ed1c38..71a7644 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -800,7 +800,9 @@ void TabContents::BlockTabContent(bool blocked) {
SkColor greyish = SkColorSetARGB(178, 0, 0, 0);
if (rwhv)
rwhv->SetVisuallyDeemphasized(blocked ? &greyish : NULL, false);
- render_view_host()->set_ignore_input_events(blocked);
+ // RenderViewHost may be NULL during shutdown.
+ if (render_view_host())
+ render_view_host()->set_ignore_input_events(blocked);
if (delegate_)
delegate_->SetTabContentBlocked(this, blocked);
}