Index: content/browser/web_contents/web_contents_impl.cc |
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
index 8dac42d29f9d94af2feab5c61f5f5934aa6a5533..2f4041f00300357f7f21451176391d9e681ae38d 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -2726,7 +2726,7 @@ void WebContentsImpl::RenderViewCreated(RenderViewHost* render_view_host) { |
// Don't send notifications if we are just creating a swapped-out RVH for |
// the opener chain. These won't be used for view-source or WebUI, so it's |
// ok to return early. |
- if (static_cast<RenderViewHostImpl*>(render_view_host)->is_swapped_out()) |
+ if (static_cast<RenderViewHostImpl*>(render_view_host)->IsSwappedOut()) |
return; |
if (delegate_) |
@@ -3147,7 +3147,7 @@ void WebContentsImpl::RequestOpenURL(RenderViewHost* rvh, |
bool user_gesture) { |
// If this came from a swapped out RenderViewHost, we only allow the request |
// if we are still in the same BrowsingInstance. |
- if (static_cast<RenderViewHostImpl*>(rvh)->is_swapped_out() && |
+ if (static_cast<RenderViewHostImpl*>(rvh)->IsSwappedOut() && |
!rvh->GetSiteInstance()->IsRelatedSiteInstance(GetSiteInstance())) { |
return; |
} |
@@ -3317,7 +3317,7 @@ void WebContentsImpl::RunJavaScriptMessage( |
// showing an interstitial as it's shown over the previous page and we don't |
// want the hidden page's dialogs to interfere with the interstitial. |
bool suppress_this_message = |
- static_cast<RenderViewHostImpl*>(rvh)->is_swapped_out() || |
+ static_cast<RenderViewHostImpl*>(rvh)->IsSwappedOut() || |
ShowingInterstitialPage() || |
!delegate_ || |
delegate_->ShouldSuppressDialogs() || |
@@ -3362,7 +3362,7 @@ void WebContentsImpl::RunBeforeUnloadConfirm(RenderViewHost* rvh, |
delegate_->WillRunBeforeUnloadConfirm(); |
bool suppress_this_message = |
- rvhi->is_swapped_out() || |
+ rvhi->rvh_state() != RenderViewHostImpl::STATE_DEFAULT || |
!delegate_ || |
delegate_->ShouldSuppressDialogs() || |
!delegate_->GetJavaScriptDialogManager(); |