mirror of
https://github.com/electron/electron.git
synced 2026-01-10 07:58:08 -05:00
* chore: bump chromium in DEPS to 133.0.6902.0
* chore: bump chromium in DEPS to 133.0.6903.0
* chore: update patches
* Update PdfViewer Save File Picker to use showSaveFilePicker.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6074308
* Code Health: Clean up stale MacWebContentsOcclusion
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6078344
* Change RenderProcessHost::GetID to RenderProcessHost::GetDeprecatedID
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6065543
* [WebRTC] Make WebRTC IP Handling policy a mojo enum
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6063620
* chore: gen filenames.libcxx.gni
* Remove allow_unsafe_buffers pragma in //printing
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6092280
* refactor: to use ChildProcessId where possible
Refs https://issues.chromium.org/issues/379869738
* [Win] Update TabletMode detection code
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6003486
* chore: bump chromium in DEPS to 133.0.6905.0
* chore: update patches
* Reland "Move global shortcut listener to //ui/base"
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6099035
* [shared storage] Implement the batch `with_lock` option for response header
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6072742
* chore: bump chromium in DEPS to 133.0.6907.0
* chore: bump chromium in DEPS to 133.0.6909.0
* chore: bump chromium in DEPS to 133.0.6911.0
* chore: bump chromium in DEPS to 133.0.6912.0
* chore: update patches
* WebUI: Reveal hidden deps to ui/webui/resources.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6096291
* chore: bump chromium in DEPS to 133.0.6913.0
* chore: bump chromium in DEPS to 133.0.6915.0
* Code Health: Clean up stale base::Feature "AccessibilityTreeForViews"
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6104174
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
* fix: remove fastapitypedarray usage
* chore: update patches
* chore: script/gen-libc++-filenames.js
* Code Health: Clean up stale base::Feature "WinRetrieveSuggestionsOnlyOnDemand"
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6109477
* fix: empty suggestions with windows platform checker
Amends the fix from https://github.com/electron/electron/pull/29690
since the feature flag is no longer available. We follow the
same pattern as //chrome/browser/renderer_context_menu/spelling_menu_observer.cc
to generate the suggestion list on demand when context menu action
is invoked.
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
* fixup! fix: empty suggestions with windows platform checker
* fixup! fix: empty suggestions with windows platform checker
* revert: 6078344: Code Health: Clean up stale MacWebContentsOcclusion | https://chromium-review.googlesource.com/c/chromium/src/+/6078344
* Revert "revert: 6078344: Code Health: Clean up stale MacWebContentsOcclusion | https://chromium-review.googlesource.com/c/chromium/src/+/6078344"
This reverts commit 9cacda452e.
* chore: bump to 133.0.6920.0, update patches
* Revert "6078344: Code Health: Clean up stale MacWebContentsOcclusion"
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/6078344
* fixup! Update PdfViewer Save File Picker to use showSaveFilePicker.
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
131 lines
4.8 KiB
C++
131 lines
4.8 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()
|
|
->GetDeprecatedID();
|
|
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();
|
|
|
|
// 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,
|
|
/*is_full_page=*/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::OnZoomChanged(
|
|
const WebContentsZoomController::ZoomChangedEventData& data) {
|
|
if (data.web_contents == GetOwnerWebContents()) {
|
|
auto* zoom_controller = api_web_contents_->GetZoomController();
|
|
if (data.temporary) {
|
|
zoom_controller->SetTemporaryZoomLevel(data.new_zoom_level);
|
|
} else {
|
|
if (blink::ZoomValuesEqual(data.new_zoom_level,
|
|
zoom_controller->GetZoomLevel()))
|
|
return;
|
|
zoom_controller->SetZoomLevel(data.new_zoom_level);
|
|
}
|
|
// Change the default zoom factor to match the embedders' new zoom level.
|
|
double zoom_factor = blink::ZoomLevelToZoomFactor(data.new_zoom_level);
|
|
zoom_controller->SetDefaultZoomFactor(zoom_factor);
|
|
}
|
|
}
|
|
|
|
void WebViewGuestDelegate::OnZoomControllerDestroyed(
|
|
WebContentsZoomController* zoom_controller) {
|
|
ResetZoomController();
|
|
}
|
|
|
|
void WebViewGuestDelegate::ResetZoomController() {
|
|
if (embedder_zoom_controller_) {
|
|
embedder_zoom_controller_->RemoveObserver(this);
|
|
embedder_zoom_controller_ = nullptr;
|
|
}
|
|
}
|
|
|
|
std::unique_ptr<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 base::WrapUnique(
|
|
static_cast<content::WebContentsImpl*>(guest_contents_impl));
|
|
}
|
|
return guest_contents;
|
|
}
|
|
|
|
base::WeakPtr<content::BrowserPluginGuestDelegate>
|
|
WebViewGuestDelegate::GetGuestDelegateWeakPtr() {
|
|
return weak_ptr_factory_.GetWeakPtr();
|
|
}
|
|
|
|
} // namespace electron
|