diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 21:12:46 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 21:12:46 +0000 |
| commit | da7b526e92ff7d8abcd0da698b34ae73d5c81bb2 (patch) | |
| tree | 55628372b19f4239a902c254f04b70c210bbd143 /chrome/browser | |
| parent | 02507d2a5c4cf957a4d66841334859c3dc86fb8a (diff) | |
| download | chromium_src-da7b526e92ff7d8abcd0da698b34ae73d5c81bb2.zip chromium_src-da7b526e92ff7d8abcd0da698b34ae73d5c81bb2.tar.gz chromium_src-da7b526e92ff7d8abcd0da698b34ae73d5c81bb2.tar.bz2 | |
Theoretical crash fix: deleted |blocked_popups_| sticks around un-NULLed.
ContentBlockedBubbleGtk looks at tab_contents->blocked_popup_container(), and
all I can think of is that people are clicking on the icon after
DidNavigateMainFramePostCommit() occurred.
BUG=35909
TEST=none
Review URL: http://codereview.chromium.org/660098
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40045 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/gtk/content_blocked_bubble_gtk.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/gtk/content_blocked_bubble_gtk.cc b/chrome/browser/gtk/content_blocked_bubble_gtk.cc index b1bb7ec..630eb59 100644 --- a/chrome/browser/gtk/content_blocked_bubble_gtk.cc +++ b/chrome/browser/gtk/content_blocked_bubble_gtk.cc @@ -88,6 +88,7 @@ void ContentBlockedBubbleGtk::BuildBubble() { if (content_type_ == CONTENT_SETTINGS_TYPE_POPUPS) { BlockedPopupContainer::BlockedContents blocked_contents; + DCHECK(tab_contents_); DCHECK(tab_contents_->blocked_popup_container()); tab_contents_->blocked_popup_container()->GetBlockedContents( &blocked_contents); diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index b4aa4a2..205b56d 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -1464,6 +1464,7 @@ void TabContents::DidNavigateMainFramePostCommit( if (blocked_popups_) { AutoReset auto_reset(&dont_notify_render_view_, true); blocked_popups_->Destroy(); + blocked_popups_ = NULL; } // Clear "blocked" flags. |