e86d1cba75
* chore: bump chromium in DEPS to 104.0.5096.0 * 3651284: Use the entry settings object for window.open navigation https://chromium-review.googlesource.com/c/chromium/src/+/3651284 * 3644598: Make RenderFrameHost used for notification permission decision https://chromium-review.googlesource.com/c/chromium/src/+/3644598 * 3642842: Window Placement: Prototype Fullscreen Capability Delegation - Part 2 https://chromium-review.googlesource.com/c/chromium/src/+/3642842 * 3652785: [sandbox] Enable sandboxed pointers on sanitizer builds https://chromium-review.googlesource.com/c/v8/v8/+/3652785 * 3611967: webhid: Migrate HidDelegate to use BrowserContext and Origin https://chromium-review.googlesource.com/c/chromium/src/+/3611967 * 3665762: Remove RenderFrameHost::IsRenderFrameCreated from //content/. https://chromium-review.googlesource.com/c/chromium/src/+/3665762 * 3659375: Fold x509_util_ios and most of x509_util_mac into x509_util_apple https://chromium-review.googlesource.com/c/chromium/src/+/3659375 * 3656234: [CodeHealth] Remove uses of base::ListValue::Append() (Final, take 2) https://chromium-review.googlesource.com/c/chromium/src/+/3656234 * chore: update patch indices * chore: fix lint * 3644598: Make RenderFrameHost used for notification permission decision https://chromium-review.googlesource.com/c/chromium/src/+/3644598 * webhid: Migrate HidDelegate to use BrowserContext and Origin This is a temporary fix for https://chromium-review.googlesource.com/c/chromium/src/+/3611967 to get the build compiling, but we need to either patch around https://chromium-review.googlesource.com/c/chromium/src/+/3611967 or move our device permissioning to BrowserContext * chore: fix lint * build: run electron/script/gen-libc++-filenames.js fixes gn check * chore: bump chromium in DEPS to 104.0.5098.0 * chore: disable flaking tests * 3682394: Change pipes surrounding code references in comments to backticks https://chromium-review.googlesource.com/c/chromium/src/+/3682394 * 3652749: Delete GLRenderer and related classes https://chromium-review.googlesource.com/c/chromium/src/+/3652749 * chore: fixup patch indices * 3671199: Remove ContentMainDelegate::PostFieldTrialInitialization https://chromium-review.googlesource.com/c/chromium/src/+/3671199 * 3607963: hid: Do not exclude HID device with no collections https://chromium-review.googlesource.com/c/chromium/src/+/3607963 * refactor: use ElectronBrowserContext instead of WebContents to persist devices due to changes like https://chromium-review.googlesource.com/c/chromium/src/+/3611967, we can no longer use WebContents to store device permissions so this commit moves device permission storage to live in memory in ElectronBrowserContext instead. * 3557253: Deprecate some signature checks https://chromium-review.googlesource.com/c/v8/v8/+/3557253 * chore: bump chromium in DEPS to 104.0.5100.0 * 3680781: Add policy for Renderer App Container. https://chromium-review.googlesource.com/c/chromium/src/+/3680781 * chore: update patch indices * 3675465: Update NetLog network service API to use mojom::DictionaryValue. https://chromium-review.googlesource.com/c/chromium/src/+/3675465 * chore: bump chromium in DEPS to 104.0.5102.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5103.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5104.0 * chore: update patches * fix: add patch for DCHECK in fullscreen test * build: fix nan build * build: make the nan spec runner work on macOS * chore: bump chromium in DEPS to 104.0.5106.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5108.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5110.0 * chore: update patches * chore: bump chromium in DEPS to 104.0.5112.0 * chore: bump chromium in DEPS to 105.0.5113.0 * chore: bump chromium in DEPS to 105.0.5115.0 * chore: bump chromium in DEPS to 105.0.5117.0 * chore: update patches * chore: update libcpp patch * 3693745: Delete base::LowerCaseEqualsASCII() Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3693745 * 3669226: Remove printing PostTask usage of IO thread Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3669226 * 3687395: Remove DictionaryValue::HasKey(). Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3687395 * 3691014: Prevent unsafe narrowing: ui/accessibility, part 2 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3691014 * 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560567 * 3684873: [Bluetooth][Win/Linux] Add bluetooth pair confirmation prompt https://chromium-review.googlesource.com/c/chromium/src/+/3684873 * chore: bump chromium in DEPS to 105.0.5119.0 * chore: missing includes in desktop_notification_controller * chore: update patches * 3685951: Reland "Make sure screen object is created once in tests." https://chromium-review.googlesource.com/c/chromium/src/+/3685951 * fixup: Reland "Make sure screen object is created once in tests." * 3646014: [API] Deprecate LegacyOOMErrorCallback Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3646014 * chore: bump chromium in DEPS to 105.0.5121.0 * chore: update patches * 3699085: [cleanup] update PrintBackend::EnumeratePrinters to use reference Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3699085 * chore: bump chromium in DEPS to 105.0.5123.0 * chore: update patches * chore: bump chromium in DEPS to 105.0.5125.0 * chore: update patches * 3630082: [sandbox] Also enable the sandbox outside of Chromium builds Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3630082 * chore: bump chromium in DEPS to 105.0.5127.0 * chore: update patches * chore: bump chromium in DEPS to 105.0.5129.0 * chore: update patches * 3703741: Remove WebContents::GetMainFrame. https://chromium-review.googlesource.com/c/chromium/src/+/3703741 * chore: update patches * fixup! 3703741: Remove WebContents::GetMainFrame. * fix lint * more lint * chore: document breaking change * 3687671: [v8] Freeze flags after initialization https://chromium-review.googlesource.com/c/chromium/src/+/3687671 * fixup! 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. * use the v8 allocator for node serdes * chore: update patches * remove faulty non-v8-sandbox-compatible code * make NodeArrayBufferAllocator use the v8 allocator under the hood * fixup! 3560567: [MSC] Porting GenerateStreams clients to handle stream vectors. * fix build on windows * 3691954: [Reland][Extensions Bindings] Validate arguments sent to API events https://chromium-review.googlesource.com/c/chromium/src/+/3691954 * chore: remove deprecated AccessorSignatures https://github.com/nodejs/nan/pull/941 * Update patches/chromium/notification_provenance.patch Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * remove chore_expose_v8_initialization_isolate_callbacks.patch * add link to nodejs/nan#941 * 52026: Do not allow md4 or md5 based signatures in X.509 certificates. https://boringssl-review.googlesource.com/c/boringssl/+/52026 * chore: update patches * disable nan buffer-test * disable sandboxed pointers for now * force sandboxed pointers off * improve node allocation patch * restore accidentally dropped node crypto test patch Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <sattard@salesforce.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Jeremy Rose <japthorp@slack-corp.com>
122 lines
4.5 KiB
C++
122 lines
4.5 KiB
C++
// Copyright (c) 2015 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/web_view_guest_delegate.h"
|
|
|
|
#include <memory>
|
|
|
|
#include "content/browser/web_contents/web_contents_impl.h" // nogncheck
|
|
#include "content/public/browser/navigation_handle.h"
|
|
#include "content/public/browser/render_frame_host.h"
|
|
#include "content/public/browser/render_process_host.h"
|
|
#include "content/public/browser/render_view_host.h"
|
|
#include "content/public/browser/render_widget_host.h"
|
|
#include "content/public/browser/render_widget_host_view.h"
|
|
#include "shell/browser/api/electron_api_web_contents.h"
|
|
#include "third_party/blink/public/common/page/page_zoom.h"
|
|
|
|
namespace electron {
|
|
|
|
WebViewGuestDelegate::WebViewGuestDelegate(content::WebContents* embedder,
|
|
api::WebContents* api_web_contents)
|
|
: embedder_web_contents_(embedder), api_web_contents_(api_web_contents) {}
|
|
|
|
WebViewGuestDelegate::~WebViewGuestDelegate() {
|
|
ResetZoomController();
|
|
}
|
|
|
|
void WebViewGuestDelegate::AttachToIframe(
|
|
content::WebContents* embedder_web_contents,
|
|
int embedder_frame_id) {
|
|
embedder_web_contents_ = embedder_web_contents;
|
|
|
|
int embedder_process_id =
|
|
embedder_web_contents_->GetPrimaryMainFrame()->GetProcess()->GetID();
|
|
auto* embedder_frame =
|
|
content::RenderFrameHost::FromID(embedder_process_id, embedder_frame_id);
|
|
DCHECK_EQ(embedder_web_contents_,
|
|
content::WebContents::FromRenderFrameHost(embedder_frame));
|
|
|
|
content::WebContents* guest_web_contents = api_web_contents_->web_contents();
|
|
|
|
// Force a refresh of the webPreferences so that OverrideWebkitPrefs runs on
|
|
// the new web contents before the renderer process initializes.
|
|
// guest_web_contents->NotifyPreferencesChanged();
|
|
|
|
// Attach this inner WebContents |guest_web_contents| to the outer
|
|
// WebContents |embedder_web_contents|. The outer WebContents's
|
|
// frame |embedder_frame| hosts the inner WebContents.
|
|
embedder_web_contents_->AttachInnerWebContents(
|
|
base::WrapUnique<content::WebContents>(guest_web_contents),
|
|
embedder_frame, false);
|
|
|
|
ResetZoomController();
|
|
|
|
embedder_zoom_controller_ =
|
|
WebContentsZoomController::FromWebContents(embedder_web_contents_);
|
|
embedder_zoom_controller_->AddObserver(this);
|
|
auto* zoom_controller = api_web_contents_->GetZoomController();
|
|
zoom_controller->SetEmbedderZoomController(embedder_zoom_controller_);
|
|
|
|
api_web_contents_->Emit("did-attach");
|
|
}
|
|
|
|
void WebViewGuestDelegate::WillDestroy() {
|
|
ResetZoomController();
|
|
}
|
|
|
|
content::WebContents* WebViewGuestDelegate::GetOwnerWebContents() {
|
|
return embedder_web_contents_;
|
|
}
|
|
|
|
void WebViewGuestDelegate::OnZoomLevelChanged(
|
|
content::WebContents* web_contents,
|
|
double level,
|
|
bool is_temporary) {
|
|
if (web_contents == GetOwnerWebContents()) {
|
|
if (is_temporary) {
|
|
api_web_contents_->GetZoomController()->SetTemporaryZoomLevel(level);
|
|
} else {
|
|
api_web_contents_->GetZoomController()->SetZoomLevel(level);
|
|
}
|
|
// Change the default zoom factor to match the embedders' new zoom level.
|
|
double zoom_factor = blink::PageZoomLevelToZoomFactor(level);
|
|
api_web_contents_->GetZoomController()->SetDefaultZoomFactor(zoom_factor);
|
|
}
|
|
}
|
|
|
|
void WebViewGuestDelegate::OnZoomControllerWebContentsDestroyed() {
|
|
ResetZoomController();
|
|
}
|
|
|
|
void WebViewGuestDelegate::ResetZoomController() {
|
|
if (embedder_zoom_controller_) {
|
|
embedder_zoom_controller_->RemoveObserver(this);
|
|
embedder_zoom_controller_ = nullptr;
|
|
}
|
|
}
|
|
|
|
content::WebContents* WebViewGuestDelegate::CreateNewGuestWindow(
|
|
const content::WebContents::CreateParams& create_params) {
|
|
// Code below mirrors what content::WebContentsImpl::CreateNewWindow
|
|
// does for non-guest sources
|
|
content::WebContents::CreateParams guest_params(create_params);
|
|
guest_params.context = embedder_web_contents_->GetNativeView();
|
|
std::unique_ptr<content::WebContents> guest_contents =
|
|
content::WebContents::Create(guest_params);
|
|
if (!create_params.opener_suppressed) {
|
|
auto* guest_contents_impl =
|
|
static_cast<content::WebContentsImpl*>(guest_contents.release());
|
|
auto* new_guest_view = guest_contents_impl->GetView();
|
|
content::RenderWidgetHostView* widget_view =
|
|
new_guest_view->CreateViewForWidget(
|
|
guest_contents_impl->GetRenderViewHost()->GetWidget());
|
|
if (!create_params.initially_hidden)
|
|
widget_view->Show();
|
|
return guest_contents_impl;
|
|
}
|
|
return guest_contents.release();
|
|
}
|
|
|
|
} // namespace electron
|