Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(897)

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 1849013004: Fix JavaScript alerts from frames with oopif on, after a cross-process click. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@alertfix
Patch Set: ordering Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 2393 matching lines...) Expand 10 before | Expand all | Expand 10 after
2404 // When pending deletion, just set the loading state to not loading. 2404 // When pending deletion, just set the loading state to not loading.
2405 // Otherwise, OnDidStopLoading will take care of that, as well as sending 2405 // Otherwise, OnDidStopLoading will take care of that, as well as sending
2406 // notification to the FrameTreeNode about the change in loading state. 2406 // notification to the FrameTreeNode about the change in loading state.
2407 if (rfh_state_ != STATE_DEFAULT) 2407 if (rfh_state_ != STATE_DEFAULT)
2408 is_loading_ = false; 2408 is_loading_ = false;
2409 else 2409 else
2410 OnDidStopLoading(); 2410 OnDidStopLoading();
2411 } 2411 }
2412 } 2412 }
2413 2413
2414 void RenderFrameHostImpl::SuppressDialogsUntilSwapOut() {
2415 Send(new FrameMsg_SuppressDialogsUntilSwapOut(GetRoutingID()));
2416 }
2417
2414 bool RenderFrameHostImpl::IsSameSiteInstance( 2418 bool RenderFrameHostImpl::IsSameSiteInstance(
2415 RenderFrameHostImpl* other_render_frame_host) { 2419 RenderFrameHostImpl* other_render_frame_host) {
2416 // As a sanity check, make sure the frame belongs to the same BrowserContext. 2420 // As a sanity check, make sure the frame belongs to the same BrowserContext.
2417 CHECK_EQ(GetSiteInstance()->GetBrowserContext(), 2421 CHECK_EQ(GetSiteInstance()->GetBrowserContext(),
2418 other_render_frame_host->GetSiteInstance()->GetBrowserContext()); 2422 other_render_frame_host->GetSiteInstance()->GetBrowserContext());
2419 return GetSiteInstance() == other_render_frame_host->GetSiteInstance(); 2423 return GetSiteInstance() == other_render_frame_host->GetSiteInstance();
2420 } 2424 }
2421 2425
2422 void RenderFrameHostImpl::SetAccessibilityMode(AccessibilityMode mode) { 2426 void RenderFrameHostImpl::SetAccessibilityMode(AccessibilityMode mode) {
2423 Send(new FrameMsg_SetAccessibilityMode(routing_id_, mode)); 2427 Send(new FrameMsg_SetAccessibilityMode(routing_id_, mode));
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
2758 } 2762 }
2759 2763
2760 void RenderFrameHostImpl::CreateWebBluetoothService( 2764 void RenderFrameHostImpl::CreateWebBluetoothService(
2761 blink::mojom::WebBluetoothServiceRequest request) { 2765 blink::mojom::WebBluetoothServiceRequest request) {
2762 DCHECK(!web_bluetooth_service_); 2766 DCHECK(!web_bluetooth_service_);
2763 web_bluetooth_service_.reset( 2767 web_bluetooth_service_.reset(
2764 new WebBluetoothServiceImpl(this, std::move(request))); 2768 new WebBluetoothServiceImpl(this, std::move(request)));
2765 } 2769 }
2766 2770
2767 } // namespace content 2771 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698