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

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: cleaner re swapped out 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 2378 matching lines...) Expand 10 before | Expand all | Expand 10 after
2389 // When pending deletion, just set the loading state to not loading. 2389 // When pending deletion, just set the loading state to not loading.
2390 // Otherwise, OnDidStopLoading will take care of that, as well as sending 2390 // Otherwise, OnDidStopLoading will take care of that, as well as sending
2391 // notification to the FrameTreeNode about the change in loading state. 2391 // notification to the FrameTreeNode about the change in loading state.
2392 if (rfh_state_ != STATE_DEFAULT) 2392 if (rfh_state_ != STATE_DEFAULT)
2393 is_loading_ = false; 2393 is_loading_ = false;
2394 else 2394 else
2395 OnDidStopLoading(); 2395 OnDidStopLoading();
2396 } 2396 }
2397 } 2397 }
2398 2398
2399 void RenderFrameHostImpl::SuppressFurtherDialogs() {
2400 Send(new FrameMsg_SuppressFurtherDialogs(GetRoutingID()));
2401 }
2402
2399 bool RenderFrameHostImpl::IsSameSiteInstance( 2403 bool RenderFrameHostImpl::IsSameSiteInstance(
2400 RenderFrameHostImpl* other_render_frame_host) { 2404 RenderFrameHostImpl* other_render_frame_host) {
2401 // As a sanity check, make sure the frame belongs to the same BrowserContext. 2405 // As a sanity check, make sure the frame belongs to the same BrowserContext.
2402 CHECK_EQ(GetSiteInstance()->GetBrowserContext(), 2406 CHECK_EQ(GetSiteInstance()->GetBrowserContext(),
2403 other_render_frame_host->GetSiteInstance()->GetBrowserContext()); 2407 other_render_frame_host->GetSiteInstance()->GetBrowserContext());
2404 return GetSiteInstance() == other_render_frame_host->GetSiteInstance(); 2408 return GetSiteInstance() == other_render_frame_host->GetSiteInstance();
2405 } 2409 }
2406 2410
2407 void RenderFrameHostImpl::SetAccessibilityMode(AccessibilityMode mode) { 2411 void RenderFrameHostImpl::SetAccessibilityMode(AccessibilityMode mode) {
2408 Send(new FrameMsg_SetAccessibilityMode(routing_id_, mode)); 2412 Send(new FrameMsg_SetAccessibilityMode(routing_id_, mode));
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
2743 } 2747 }
2744 2748
2745 void RenderFrameHostImpl::CreateWebBluetoothService( 2749 void RenderFrameHostImpl::CreateWebBluetoothService(
2746 blink::mojom::WebBluetoothServiceRequest request) { 2750 blink::mojom::WebBluetoothServiceRequest request) {
2747 DCHECK(!web_bluetooth_service_); 2751 DCHECK(!web_bluetooth_service_);
2748 web_bluetooth_service_.reset( 2752 web_bluetooth_service_.reset(
2749 new WebBluetoothServiceImpl(this, std::move(request))); 2753 new WebBluetoothServiceImpl(this, std::move(request)));
2750 } 2754 }
2751 2755
2752 } // namespace content 2756 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698