diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-06 20:39:08 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-06 20:39:08 +0000 |
| commit | 5838ade18cedbc5b283f2ceb89aa1a45d3ecb95a (patch) | |
| tree | 8d1f112196456c54dae273900efc854713cffa6d | |
| parent | 7327f0489ed6e656df5d1fbafe1c36a76f03c941 (diff) | |
| download | chromium_src-5838ade18cedbc5b283f2ceb89aa1a45d3ecb95a.zip chromium_src-5838ade18cedbc5b283f2ceb89aa1a45d3ecb95a.tar.gz chromium_src-5838ade18cedbc5b283f2ceb89aa1a45d3ecb95a.tar.bz2 | |
Fixes bug where renderer could show up parented to desktop. This would
occur if RenderWidgetHostView::Show is invoked and the RWHV was never
shown. This can hapen with instant when we delay showing the RWHV.
BUG=78360
TEST=see bug
R=jcivelli@chromium.org
Review URL: http://codereview.chromium.org/6800005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80684 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/tab_contents/interstitial_page.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/tab_contents/interstitial_page.cc b/content/browser/tab_contents/interstitial_page.cc index 3bce1ec..0669286 100644 --- a/content/browser/tab_contents/interstitial_page.cc +++ b/content/browser/tab_contents/interstitial_page.cc @@ -247,7 +247,7 @@ void InterstitialPage::Show() { void InterstitialPage::Hide() { RenderWidgetHostView* old_view = tab_->render_view_host()->view(); - if (old_view && !old_view->IsShowing()) { + if (tab_->interstitial_page() == this && old_view && !old_view->IsShowing()) { // Show the original RVH since we're going away. Note it might not exist if // the renderer crashed while the interstitial was showing. // Note that it is important that we don't call Show() if the view is |