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

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: fixes 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 2383 matching lines...) Expand 10 before | Expand all | Expand 10 after
2394 // When pending deletion, just set the loading state to not loading. 2394 // When pending deletion, just set the loading state to not loading.
2395 // Otherwise, OnDidStopLoading will take care of that, as well as sending 2395 // Otherwise, OnDidStopLoading will take care of that, as well as sending
2396 // notification to the FrameTreeNode about the change in loading state. 2396 // notification to the FrameTreeNode about the change in loading state.
2397 if (rfh_state_ != STATE_DEFAULT) 2397 if (rfh_state_ != STATE_DEFAULT)
2398 is_loading_ = false; 2398 is_loading_ = false;
2399 else 2399 else
2400 OnDidStopLoading(); 2400 OnDidStopLoading();
2401 } 2401 }
2402 } 2402 }
2403 2403
2404 void RenderFrameHostImpl::SuppressFurtherDialogs() {
2405 Send(new FrameMsg_SuppressFurtherDialogs(GetRoutingID()));
2406 }
2407
2404 bool RenderFrameHostImpl::IsSameSiteInstance( 2408 bool RenderFrameHostImpl::IsSameSiteInstance(
2405 RenderFrameHostImpl* other_render_frame_host) { 2409 RenderFrameHostImpl* other_render_frame_host) {
2406 // As a sanity check, make sure the frame belongs to the same BrowserContext. 2410 // As a sanity check, make sure the frame belongs to the same BrowserContext.
2407 CHECK_EQ(GetSiteInstance()->GetBrowserContext(), 2411 CHECK_EQ(GetSiteInstance()->GetBrowserContext(),
2408 other_render_frame_host->GetSiteInstance()->GetBrowserContext()); 2412 other_render_frame_host->GetSiteInstance()->GetBrowserContext());
2409 return GetSiteInstance() == other_render_frame_host->GetSiteInstance(); 2413 return GetSiteInstance() == other_render_frame_host->GetSiteInstance();
2410 } 2414 }
2411 2415
2412 void RenderFrameHostImpl::SetAccessibilityMode(AccessibilityMode mode) { 2416 void RenderFrameHostImpl::SetAccessibilityMode(AccessibilityMode mode) {
2413 Send(new FrameMsg_SetAccessibilityMode(routing_id_, mode)); 2417 Send(new FrameMsg_SetAccessibilityMode(routing_id_, mode));
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
2748 } 2752 }
2749 2753
2750 void RenderFrameHostImpl::CreateWebBluetoothService( 2754 void RenderFrameHostImpl::CreateWebBluetoothService(
2751 blink::mojom::WebBluetoothServiceRequest request) { 2755 blink::mojom::WebBluetoothServiceRequest request) {
2752 DCHECK(!web_bluetooth_service_); 2756 DCHECK(!web_bluetooth_service_);
2753 web_bluetooth_service_.reset( 2757 web_bluetooth_service_.reset(
2754 new WebBluetoothServiceImpl(this, std::move(request))); 2758 new WebBluetoothServiceImpl(this, std::move(request)));
2755 } 2759 }
2756 2760
2757 } // namespace content 2761 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698