mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: use frame tree api to remove <webview> frame (#16501)

Browse source 
Replaces the usage of testing api added in
03d499bf34
This commit is contained in:
Robo 2019-02-26 07:17:29 +05:30 • committed by Samuel Attard
parent 6da939629b
commit ddcebb096f
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
atom/browser/api/atom_api_web_contents_impl.cc
View file

@ -4,7 +4,10 @@
#include "atom/browser/api/atom_api_web_contents.h" #include "atom/browser/api/atom_api_web_contents.h"
#include "content/browser/frame_host/frame_tree.h"
#include "content/browser/frame_host/frame_tree_node.h"
#include "content/browser/web_contents/web_contents_impl.h" #include "content/browser/web_contents/web_contents_impl.h"
#include "content/public/browser/guest_mode.h"
#if BUILDFLAG(ENABLE_OSR) #if BUILDFLAG(ENABLE_OSR)
#include "atom/browser/osr/osr_render_widget_host_view.h" #include "atom/browser/osr/osr_render_widget_host_view.h"
@ -21,8 +24,15 @@ namespace api {
void WebContents::DetachFromOuterFrame() { void WebContents::DetachFromOuterFrame() {
// See detach_webview_frame.patch on how to detach. // See detach_webview_frame.patch on how to detach.
auto* impl = static_cast<content::WebContentsImpl*>(web_contents()); DCHECK(content::GuestMode::IsCrossProcessFrameGuest(web_contents()));
impl->GetRenderManagerForTesting()->RemoveOuterDelegateFrame(); int frame_tree_node_id =
static_cast<content::WebContentsImpl*>(web_contents())
->GetOuterDelegateFrameTreeNodeId();
if (frame_tree_node_id != content::FrameTreeNode::kFrameTreeNodeInvalidId) {
auto* node = content::FrameTreeNode::GloballyFindByID(frame_tree_node_id);
DCHECK(node->parent());
node->frame_tree()->RemoveFrame(node);
}
} }
#if BUILDFLAG(ENABLE_OSR) #if BUILDFLAG(ENABLE_OSR)