![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 137.0.7107.0 * chore: bump chromium in DEPS to 137.0.7109.0 * chore: bump chromium in DEPS to 137.0.7111.0 * chore: bump chromium in DEPS to 137.0.7113.0 * 6384240: Remove double-declaration for accessibility on macOS |6384240
* 6422872: Remove unused includes in isolation_info_mojom_traits.h |6422872
* chore: update patches * 6400733: Avoid ipc_message_macros.h usage in some foo_param_traits_macros.h files |6400733
* chore: update patches * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* chore: iwyu * refactor: prefer value initialization over memset() From the looks up upstream commits in base/, it looks like memset() could trigger `-Wunsafe-buffer-usage` warnings soon? Value initialization is more C++ish and less error-prone anyway, due to memset()'s easily swappable parameters. * refactor: NotifyIcon::InitIconData() returns a NOTIFYICONDATA This follows F.20 in the C++ Core Guidelines and also removes the need for memset() * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - strcmp() * fixup! 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). |6433203
* chore: bump chromium in DEPS to 137.0.7115.0 * 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* chore: update patches * 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* fix: add pragma for MacSDK unsafe buffers | 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* chore: bump chromium in DEPS to 137.0.7117.0 * chore: update patches * chore: update filesnames.libcxx.gni * 6431756: Replace SetOwnedByWidget() bool arg with a PassKey. |6431756
* 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* 6428345: Remove ExtensionService usage from ChromeExtensionRegistrarDelegate |6428345
* 6384315: Migrate extensions_enabled from ExtensionService to Registrar |6384315
* 6428749: [extensions] Refactor ExtensionService for AddNewAndUpdateExtension. |6428749
* chore: bump chromium in DEPS to 137.0.7119.0 * 6440290: corner-shape: support inset shadow |6440290
* 6429230: FSA: Move blocked paths to the PermissionContext class |6429230
* chore: update patches * chore: bump chromium in DEPS to 137.0.7121.0 * chore: update patches * fix: partially revert 6443473: Remove ItemDelete from the Mac version of AppleKeychain |6443473
* fix: update filenames.libcxx.gni * chore: bump chromium in DEPS to 137.0.7123.0 * chore: update patches * chore: "grandfather in" electron views too Lock further access to View::set_owned_by_client() |6448510
* chore: update feat_corner_smoothing_css_rule_and_blink_painting.patch corner-shape: support inset shadow |6440290
* refactor: grandfather in AutofillPopupView as a subclass of WidgetDelegateView Add a PassKey for std::make_unique<WidgetDelegateView>() |6442265
* Provide dbus appmenu information on Wayland |6405535
* [extensions] Move OnExtensionInstalled out of ExtensionService. |6443325
* refactor: grandfather in NativeWindowViews for delete callbacks 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). |6433203
* chore: merge the four "grandfather" patches into one * [A11yPerformance] Remove IsAccessibilityAllowed() | 6404386: [A11yPerformance] Remove IsAccessibilityAllowed() |6404386
NB: the changes here are copied from the upstream changes in chrome/browser/ui/webui/accessibility/accessibility_ui.cc * 6420753: [PermissionOptions] Use PermissionDescriptorPtr in PermissionController |6420753
* 6429573: [accessibility] Move mode change out of AccessibilityNotificationWaiter |6429573
* chore: e patches all * 6419936: [win] Change ScreenWin public static methods to virtual |6419936
* 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - fprintf() - fputs() - snprintf() - vsnprintf() * fix: size conversion FTBFS on Win * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - wcscpy_s() * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - wcsncpy_s() * chore: update mas_avoid_private_macos_api_usage.patch.patch 6394283: Remove double-declaration for accessibility on iOS |6394283
Lots of context shear in this commit but the only interesting part is: -+ return nullptr; ++ return {}; Which is needed because the return type is sometimes not a pointer. * chore: e patches all * chore: disable -Wmacro-redefined warning in electron_main_win.cc * chore: bump chromium in DEPS to 137.0.7123.5 * refactor: patch electron PermissionTypes into blink 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* chore: e patches all * chore: remove the box_painter_base.cc part of feat_corner_smoothing_css_rule_and_blink_painting.patch as per code review @ https://github.com/electron/electron/pull/46482#pullrequestreview-2777338370 * test: enable window-smaller-than-64x64 test on Linux * chore: bump chromium in DEPS to 137.0.7124.1 * chore: bump chromium in DEPS to 137.0.7125.1 * chore: bump chromium in DEPS to 137.0.7127.3 * 6459201: [Extensions] Remove ExtensionSystem::FinishDelayedInstallationIfReady() |6459201
* 6454796: [Extensions] Move (most) registrar delayed install logic to //extensions |6454796
* chore: bump chromium in DEPS to 137.0.7128.1 * chore: e patches all * chore: node ./script/gen-libc++-filenames.js * [views] Gate DesktopWindowTreeHostWin::window_enlargement_ behind flag Refs6428649
* feat: allow opt-out animated_content_sampler. Refs6438681
* Trigger CI --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
111 lines
4.2 KiB
C++
111 lines
4.2 KiB
C++
// Copyright (c) 2022 Slack Technologies, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/electron_web_contents_utility_handler_impl.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "content/public/browser/browser_context.h"
|
|
#include "content/public/browser/permission_controller.h"
|
|
#include "content/public/browser/permission_descriptor_util.h"
|
|
#include "content/public/browser/render_frame_host.h"
|
|
#include "content/public/browser/render_process_host.h"
|
|
#include "mojo/public/cpp/bindings/self_owned_receiver.h"
|
|
#include "shell/browser/web_contents_permission_helper.h"
|
|
#include "third_party/blink/public/mojom/permissions/permission_status.mojom.h"
|
|
|
|
namespace electron {
|
|
ElectronWebContentsUtilityHandlerImpl::ElectronWebContentsUtilityHandlerImpl(
|
|
content::RenderFrameHost* frame_host,
|
|
mojo::PendingAssociatedReceiver<mojom::ElectronWebContentsUtility> receiver)
|
|
: render_frame_host_token_(frame_host->GetGlobalFrameToken()) {
|
|
content::WebContents* web_contents =
|
|
content::WebContents::FromRenderFrameHost(frame_host);
|
|
DCHECK(web_contents);
|
|
content::WebContentsObserver::Observe(web_contents);
|
|
|
|
receiver_.Bind(std::move(receiver));
|
|
receiver_.set_disconnect_handler(base::BindOnce(
|
|
&ElectronWebContentsUtilityHandlerImpl::OnConnectionError, GetWeakPtr()));
|
|
}
|
|
|
|
ElectronWebContentsUtilityHandlerImpl::
|
|
~ElectronWebContentsUtilityHandlerImpl() = default;
|
|
|
|
void ElectronWebContentsUtilityHandlerImpl::RenderFrameDeleted(
|
|
content::RenderFrameHost* render_frame_host) {
|
|
if (render_frame_host->GetGlobalFrameToken() == render_frame_host_token_) {
|
|
delete this;
|
|
}
|
|
}
|
|
|
|
void ElectronWebContentsUtilityHandlerImpl::OnConnectionError() {
|
|
delete this;
|
|
}
|
|
|
|
void ElectronWebContentsUtilityHandlerImpl::OnFirstNonEmptyLayout() {
|
|
api::WebContents* api_web_contents = api::WebContents::From(web_contents());
|
|
if (api_web_contents) {
|
|
api_web_contents->OnFirstNonEmptyLayout(GetRenderFrameHost());
|
|
}
|
|
}
|
|
|
|
void ElectronWebContentsUtilityHandlerImpl::SetTemporaryZoomLevel(
|
|
double level) {
|
|
api::WebContents* api_web_contents = api::WebContents::From(web_contents());
|
|
if (api_web_contents) {
|
|
api_web_contents->SetTemporaryZoomLevel(level);
|
|
}
|
|
}
|
|
|
|
void ElectronWebContentsUtilityHandlerImpl::CanAccessClipboardDeprecated(
|
|
mojom::PermissionName name,
|
|
const blink::LocalFrameToken& frame_token,
|
|
CanAccessClipboardDeprecatedCallback callback) {
|
|
if (render_frame_host_token_.frame_token == frame_token) {
|
|
// Paste requires either (1) user activation, ...
|
|
if (web_contents()->HasRecentInteraction()) {
|
|
std::move(callback).Run(blink::mojom::PermissionStatus::GRANTED);
|
|
return;
|
|
}
|
|
|
|
// (2) granted permission, ...
|
|
content::RenderFrameHost* render_frame_host = GetRenderFrameHost();
|
|
content::BrowserContext* browser_context =
|
|
render_frame_host->GetBrowserContext();
|
|
content::PermissionController* permission_controller =
|
|
browser_context->GetPermissionController();
|
|
blink::PermissionType permission;
|
|
if (name == mojom::PermissionName::DEPRECATED_SYNC_CLIPBOARD_READ) {
|
|
permission = blink::PermissionType::DEPRECATED_SYNC_CLIPBOARD_READ;
|
|
} else {
|
|
std::move(callback).Run(blink::mojom::PermissionStatus::DENIED);
|
|
return;
|
|
}
|
|
// TODO(wg-upgrades) https://crbug.com/406755622 remove use of deprecated
|
|
// CreatePermissionDescriptorForPermissionType()
|
|
blink::mojom::PermissionStatus status =
|
|
permission_controller->GetPermissionStatusForCurrentDocument(
|
|
content::PermissionDescriptorUtil::
|
|
CreatePermissionDescriptorForPermissionType(permission),
|
|
render_frame_host);
|
|
std::move(callback).Run(status);
|
|
} else {
|
|
std::move(callback).Run(blink::mojom::PermissionStatus::DENIED);
|
|
}
|
|
}
|
|
|
|
content::RenderFrameHost*
|
|
ElectronWebContentsUtilityHandlerImpl::GetRenderFrameHost() {
|
|
return content::RenderFrameHost::FromFrameToken(render_frame_host_token_);
|
|
}
|
|
|
|
// static
|
|
void ElectronWebContentsUtilityHandlerImpl::Create(
|
|
content::RenderFrameHost* frame_host,
|
|
mojo::PendingAssociatedReceiver<mojom::ElectronWebContentsUtility>
|
|
receiver) {
|
|
new ElectronWebContentsUtilityHandlerImpl(frame_host, std::move(receiver));
|
|
}
|
|
} // namespace electron
|