30fbeec036
* chore: bump chromium in DEPS to 130.0.6723.4 * chore: bump chromium in DEPS to 131.0.6724.0 * chore: update patches * chore: update libc++ filenames * 5844369: controlledframe: Disable Web Bluetooth for <webview> & <controlledframe>5844369* (multiple CLs): Use an opaque type for FrameTreeNode IDs 5807683: Use an opaque type for FrameTreeNode IDs, part 1 |58076835829746: Use an opaque type for FrameTreeNode IDs, part 2 |58297465836903: Use an opaque type for FrameTreeNode IDs, part 7 |58369035837249: Use an opaque type for FrameTreeNode IDs, part 8 |58372495836564: Use an opaque type for FrameTreeNode IDs, part 12 |58365645837180: Use an opaque type for FrameTreeNode IDs, part 15 |5837180* 5822889: [task] Make GetForegroundTaskRunner non-virtual5822889* 5833297: Remove unused inner WebContents attach params5833297* 5806403: Shift PowerMonitor to non static5806403* 5666874: [3/N] Remove old OnPowerChange in PowerObserver5666874* 5829085: [v8] Differentiate between UserVisible and BestEffort task runners5829085* 5791112: [webrtc] Use `c/b/permissions/system` for system permissions5791112* 5825636: [Extensions] Create WebContentsObservers with ExtensionsBrowserClient5825636* fixup! (multiple CLs): Use an opaque type for FrameTreeNode IDs * fixup! 5791112: [webrtc] Use `c/b/permissions/system` for system permissions5791112* chore: bump chromium in DEPS to 131.0.6726.0 * chore: update patches * chore: update libc++ filenames * 5858119: Declutter: Allow opening to a specific feature5858119* fix: macOS SDK 15 error Not sure exactly what changed in the upgrade to macOS SDK 15, but it triggered a new error: ``` electron/shell/browser/ui/message_box_mac.mm:84:7: error: multiple methods named 'highlight:' found with mismatched result, parameter type or attributes ``` The `highlight:` selector a few lines down was ambiguous because the object type of the `NSArray` was not specified. Specifying `NSButton` as the element type makes the selector unambiguous for type checking. * 5854143: [File Download Access Prevention] Obfuscate download file for enterprise deep scan5854143* 5854811: Use kNotAllowedError instead of kSecurityError for Web MIDI5854811* chore: bump chromium in DEPS to 131.0.6728.0 * chore: update patches * disable invalid test * chore: bump chromium in DEPS to 131.0.6730.0 * chore: update patches * update build tools target commit for new macOS SDK * chore: update libc++ file names * chore: bump chromium in DEPS to 131.0.6732.0 * chore: bump chromium in DEPS to 131.0.6734.0 * 5856527: [UI] Use mojo enum for `WindowShowState` in ui/5856527* chore: update build-tools sha to include macOD 15.0 SDK --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: alice <alice@makenotion.com>
51 lines
1.8 KiB
C++
51 lines
1.8 KiB
C++
// Copyright (c) 2018 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/api/electron_api_web_contents.h"
|
|
|
|
#include "content/browser/renderer_host/frame_tree.h" // nogncheck
|
|
#include "content/browser/renderer_host/frame_tree_node.h" // nogncheck
|
|
#include "content/browser/web_contents/web_contents_impl.h" // nogncheck
|
|
#include "shell/browser/osr/osr_render_widget_host_view.h"
|
|
#include "shell/browser/osr/osr_web_contents_view.h"
|
|
|
|
// Including both web_contents_impl.h and node.h would introduce a error, we
|
|
// have to isolate the usage of WebContentsImpl into a clean file to fix it:
|
|
// error C2371: 'ssize_t': redefinition; different basic types
|
|
|
|
namespace electron::api {
|
|
|
|
void WebContents::DetachFromOuterFrame() {
|
|
// See detach_webview_frame.patch on how to detach.
|
|
content::FrameTreeNodeId frame_tree_node_id =
|
|
static_cast<content::WebContentsImpl*>(web_contents())
|
|
->GetOuterDelegateFrameTreeNodeId();
|
|
if (!frame_tree_node_id) {
|
|
auto* node = content::FrameTreeNode::GloballyFindByID(frame_tree_node_id);
|
|
DCHECK(node->parent());
|
|
node->frame_tree().RemoveFrame(node);
|
|
}
|
|
}
|
|
|
|
OffScreenWebContentsView* WebContents::GetOffScreenWebContentsView() const {
|
|
if (IsOffScreen()) {
|
|
const auto* impl =
|
|
static_cast<const content::WebContentsImpl*>(web_contents());
|
|
return static_cast<OffScreenWebContentsView*>(impl->GetView());
|
|
} else {
|
|
return nullptr;
|
|
}
|
|
}
|
|
|
|
OffScreenRenderWidgetHostView* WebContents::GetOffScreenRenderWidgetHostView()
|
|
const {
|
|
if (IsOffScreen()) {
|
|
return static_cast<OffScreenRenderWidgetHostView*>(
|
|
web_contents()->GetRenderWidgetHostView());
|
|
} else {
|
|
return nullptr;
|
|
}
|
|
}
|
|
|
|
} // namespace electron::api
|