mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 106.0.5247.1 * chore: update can_create_window.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3805043 content/renderer/render_view_impl.cc was removed * chore: update patches/chromium/printing.patch Normal code shear. * chore: update patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3764862 fix minor code shear that caused the patch to not apply * chore: update patches/chromium/picture-in-picture.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3781646 Normal code shear. * chore: update patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3805043 content/renderer/render_view_impl.cc was removed Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3792324 Normal code shear. * chore: update patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch Normal code shear. * chore: update patches/chromium/fix_patch_out_profile_refs_in_accessibility_ui.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3798548 Normal code shear. * chore: update patches/chromium/build_disable_print_content_analysis.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3810473 Normal code shear. * chore: short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3807504 Normal code shear. * chore: update patches * chore: bump chromium in DEPS to 106.0.5249.0 * chore: bump chromium in DEPS to 107.0.5250.0 * chore: bump chromium in DEPS to 107.0.5252.0 * chore: bump chromium in DEPS to 107.0.5254.0 * chore: bump chromium in DEPS to 107.0.5256.1 * chore: update v8 patches * chore: update chromium patches * [CodeHealthRotation] base::Value::Dict (v2) migration for //c/b/ui/zoom Refs https://chromium-review.googlesource.com/c/chromium/src/+/3778239 * Add support for snapped window states for lacros https://chromium-review.googlesource.com/c/chromium/src/+/3810538 * webui: Migrate /chrome/browser/ui/webui URLDataSources to GetMimeType(GURL) Refs https://chromium-review.googlesource.com/c/chromium/src/+/3774560 * Provide explicit template arguments to blink::AssociatedInterfaceRegistry::AddInterface Refs https://chromium-review.googlesource.com/c/chromium/src/+/3773459 * Make WebScriptExecutionCallback base::OnceCallback Refs https://chromium-review.googlesource.com/c/chromium/src/+/3676532 https://chromium-review.googlesource.com/c/chromium/src/+/3724623 https://chromium-review.googlesource.com/c/chromium/src/+/3675752 * Add implementation of reduce accept language service Refs https://chromium-review.googlesource.com/c/chromium/src/+/3687391 * Add PermissionResult in //content/public. Refs https://chromium-review.googlesource.com/c/chromium/src/+/3807504 * [Extensions] Add new Webstore domain to extension URLs and clients Refs https://chromium-review.googlesource.com/c/chromium/src/+/3793043 * chore: update node patches * chore: fix lint * chore: update filenames.libcxx.gni * fixup! Make WebScriptExecutionCallback base::OnceCallback * chore: bump chromium in DEPS to 107.0.5266.1 * chore: bump chromium in DEPS to 107.0.5268.0 * chore: bump chromium in DEPS to 107.0.5270.1 * chore: update patches * 3848842: [DevTools] Added 'printing-in-progress' error code. https://chromium-review.googlesource.com/c/chromium/src/+/38488 * 3855766: PA: Move the allocator shim files into partition_allocator/shim/ | https://chromium-review.googlesource.com/c/chromium/src/+/3855766 * Change gfx::Rect to blink::mojom::WindowFeatures in AddNewContents and some related functions. https://chromium-review.googlesource.com/c/chromium/src/+/3835666 * Use base::FunctionRef for the various ForEachRenderFrameHost helpers. https://chromium-review.googlesource.com/c/chromium/src/+/3767487 * [loader] Send cached metadata as part of OnReceiveResponse https://chromium-review.googlesource.com/c/chromium/src/+/3811219 * 3832927: [json-schema-compiler] Support abs::optional<int> https://chromium-review.googlesource.com/c/chromium/src/+/3832927 * Use unique_ptr for BrowserPluginGuestDelegate::CreateNewGuestWindow https://chromium-review.googlesource.com/c/chromium/src/+/3847070 * 3847044: [Android] Dismiss select popup upon entering fullscreen https://chromium-review.googlesource.com/c/chromium/src/+/3847044 * chore: update patches * chore: add missing header * Migration of chrome/ BrowserContextKeyedServiceFactory to ProfileKeyedServiceFactory Part 12 https://chromium-review.googlesource.com/c/chromium/src/+/3804581 * 3786946: cast pwrite64 arg to long to avoid compilation error on arm https://chromium-review.googlesource.com/c/linux-syscall-support/+/3786946 * chore: update patches after rebase * 3846114: float: Implement for lacros p2. https://chromium-review.googlesource.com/c/chromium/src/+/3846114 * 3825237: Enable -Wunqualified-std-cast-call https://chromium-review.googlesource.com/c/chromium/src/+/3825237 * chore: bump chromium in DEPS to 107.0.5272.0 * chore: update patches * 3835746: Rename PepperPluginInfo to ContentPluginInfo https://chromium-review.googlesource.com/c/chromium/src/+/3835746 * 3852542: Plumb drag-image rect from blink to browser to RenderWidgetHostImpl https://chromium-review.googlesource.com/c/chromium/src/+/3852542 * 3826169: [json-schema-compiler] Support abs::optional<bool> https://chromium-review.googlesource.com/c/chromium/src/+/3826169 Also 3840687: [json-schema-compiler] Support abs::optional<double> https://chromium-review.googlesource.com/c/chromium/src/+/3840687 * 3857319: Reland "Remove PrefService::Get" https://chromium-review.googlesource.com/c/chromium/src/+/3857319 * 3854614: Rework LinuxUi ownership and creation https://chromium-review.googlesource.com/c/chromium/src/+/3854614 * chore: bump chromium in DEPS to 107.0.5274.0 * 3866104: [DownloadBubble] Change download notifications in exclusive_access https://chromium-review.googlesource.com/c/chromium/src/+/3866104 * chore: update patches * chore: disable optimization guide for preconnect feature * 3860569: Enable -Wshadow on Linux. https://chromium-review.googlesource.com/c/chromium/src/+/3860569 * chore: update patches after rebase * fixup: update to accomodate Wc++98-compat-extra-semi flag * Revert "fixup! Make WebScriptExecutionCallback base::OnceCallback" This reverts commit 0866fe8648671f04e4ea45ceed85db6e4a3b260b. * fixup! Make WebScriptExecutionCallback base::OnceCallback * fixup! Make WebScriptExecutionCallback base::OnceCallback * 3840937: [sandbox] Merge V8_SANDBOXED_POINTERS into V8_ENABLE_SANDBOX https://chromium-review.googlesource.com/c/v8/v8/+/3840937 * fixup! chore: update can_create_window.patch * chore: update patches * 53946: Track SSL_ERROR_ZERO_RETURN explicitly. https://boringssl-review.googlesource.com/c/boringssl/+/53946 * fixup: Migration of chrome/ BrowserContextKeyedServiceFactory to ProfileKeyedServiceFactory Part 12 https://chromium-review.googlesource.com/c/chromium/src/+/3804581 * 3805932: [headless] Added print compositor support for OOPIF printing. https://chromium-review.googlesource.com/c/chromium/src/+/3805932 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
217 lines
7.6 KiB
C++
217 lines
7.6 KiB
C++
// Copyright (c) 2021 Ryan Gonzalez.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
// Portions of this file are sourced from
|
|
// chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc,
|
|
// Copyright (c) 2019 The Chromium Authors,
|
|
// which is governed by a BSD-style license
|
|
|
|
#include "shell/browser/ui/electron_desktop_window_tree_host_linux.h"
|
|
|
|
#include <vector>
|
|
|
|
#include "base/feature_list.h"
|
|
#include "base/i18n/rtl.h"
|
|
#include "shell/browser/native_window_features.h"
|
|
#include "shell/browser/ui/views/client_frame_view_linux.h"
|
|
#include "ui/gfx/geometry/rect.h"
|
|
#include "ui/gfx/geometry/skia_conversions.h"
|
|
#include "ui/linux/linux_ui.h"
|
|
#include "ui/platform_window/platform_window.h"
|
|
#include "ui/views/widget/desktop_aura/desktop_window_tree_host.h"
|
|
#include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h"
|
|
#include "ui/views/window/non_client_view.h"
|
|
|
|
#if defined(USE_OZONE)
|
|
#include "ui/ozone/buildflags.h"
|
|
#if BUILDFLAG(OZONE_PLATFORM_X11)
|
|
#define USE_OZONE_PLATFORM_X11
|
|
#endif
|
|
#include "ui/ozone/public/ozone_platform.h"
|
|
#endif
|
|
|
|
namespace electron {
|
|
|
|
ElectronDesktopWindowTreeHostLinux::ElectronDesktopWindowTreeHostLinux(
|
|
NativeWindowViews* native_window_view,
|
|
views::DesktopNativeWidgetAura* desktop_native_widget_aura)
|
|
: views::DesktopWindowTreeHostLinux(native_window_view->widget(),
|
|
desktop_native_widget_aura),
|
|
native_window_view_(native_window_view) {}
|
|
|
|
ElectronDesktopWindowTreeHostLinux::~ElectronDesktopWindowTreeHostLinux() =
|
|
default;
|
|
|
|
bool ElectronDesktopWindowTreeHostLinux::SupportsClientFrameShadow() const {
|
|
return platform_window()->CanSetDecorationInsets() &&
|
|
platform_window()->IsTranslucentWindowOpacitySupported();
|
|
}
|
|
|
|
void ElectronDesktopWindowTreeHostLinux::OnWidgetInitDone() {
|
|
views::DesktopWindowTreeHostLinux::OnWidgetInitDone();
|
|
UpdateFrameHints();
|
|
}
|
|
|
|
void ElectronDesktopWindowTreeHostLinux::OnBoundsChanged(
|
|
const BoundsChange& change) {
|
|
views::DesktopWindowTreeHostLinux::OnBoundsChanged(change);
|
|
UpdateFrameHints();
|
|
|
|
#if defined(USE_OZONE_PLATFORM_X11)
|
|
if (ui::OzonePlatform::GetInstance()
|
|
->GetPlatformProperties()
|
|
.electron_can_call_x11) {
|
|
// The OnWindowStateChanged should receive all updates but currently under
|
|
// X11 it doesn't receive changes to the fullscreen status because chromium
|
|
// is handling the fullscreen state changes synchronously, see
|
|
// X11Window::ToggleFullscreen in ui/ozone/platform/x11/x11_window.cc.
|
|
UpdateWindowState(platform_window()->GetPlatformWindowState());
|
|
}
|
|
#endif
|
|
}
|
|
|
|
void ElectronDesktopWindowTreeHostLinux::OnWindowStateChanged(
|
|
ui::PlatformWindowState old_state,
|
|
ui::PlatformWindowState new_state) {
|
|
views::DesktopWindowTreeHostLinux::OnWindowStateChanged(old_state, new_state);
|
|
UpdateFrameHints();
|
|
UpdateWindowState(new_state);
|
|
}
|
|
|
|
void ElectronDesktopWindowTreeHostLinux::UpdateWindowState(
|
|
ui::PlatformWindowState new_state) {
|
|
if (window_state_ == new_state)
|
|
return;
|
|
|
|
switch (window_state_) {
|
|
case ui::PlatformWindowState::kMinimized:
|
|
native_window_view_->NotifyWindowRestore();
|
|
break;
|
|
case ui::PlatformWindowState::kMaximized:
|
|
native_window_view_->NotifyWindowUnmaximize();
|
|
break;
|
|
case ui::PlatformWindowState::kFullScreen:
|
|
native_window_view_->NotifyWindowLeaveFullScreen();
|
|
break;
|
|
case ui::PlatformWindowState::kUnknown:
|
|
case ui::PlatformWindowState::kNormal:
|
|
case ui::PlatformWindowState::kSnappedPrimary:
|
|
case ui::PlatformWindowState::kSnappedSecondary:
|
|
case ui::PlatformWindowState::kFloated:
|
|
break;
|
|
}
|
|
switch (new_state) {
|
|
case ui::PlatformWindowState::kMinimized:
|
|
native_window_view_->NotifyWindowMinimize();
|
|
break;
|
|
case ui::PlatformWindowState::kMaximized:
|
|
native_window_view_->NotifyWindowMaximize();
|
|
break;
|
|
case ui::PlatformWindowState::kFullScreen:
|
|
native_window_view_->NotifyWindowEnterFullScreen();
|
|
break;
|
|
case ui::PlatformWindowState::kUnknown:
|
|
case ui::PlatformWindowState::kNormal:
|
|
case ui::PlatformWindowState::kSnappedPrimary:
|
|
case ui::PlatformWindowState::kSnappedSecondary:
|
|
case ui::PlatformWindowState::kFloated:
|
|
break;
|
|
}
|
|
window_state_ = new_state;
|
|
}
|
|
|
|
void ElectronDesktopWindowTreeHostLinux::OnNativeThemeUpdated(
|
|
ui::NativeTheme* observed_theme) {
|
|
UpdateFrameHints();
|
|
}
|
|
|
|
void ElectronDesktopWindowTreeHostLinux::OnDeviceScaleFactorChanged() {
|
|
UpdateFrameHints();
|
|
}
|
|
|
|
void ElectronDesktopWindowTreeHostLinux::UpdateFrameHints() {
|
|
if (base::FeatureList::IsEnabled(features::kWaylandWindowDecorations)) {
|
|
if (SupportsClientFrameShadow() && native_window_view_->has_frame() &&
|
|
native_window_view_->has_client_frame()) {
|
|
UpdateClientDecorationHints(static_cast<ClientFrameViewLinux*>(
|
|
native_window_view_->widget()->non_client_view()->frame_view()));
|
|
}
|
|
|
|
SizeConstraintsChanged();
|
|
}
|
|
}
|
|
|
|
void ElectronDesktopWindowTreeHostLinux::UpdateClientDecorationHints(
|
|
ClientFrameViewLinux* view) {
|
|
ui::PlatformWindow* window = platform_window();
|
|
bool showing_frame = !native_window_view_->IsFullscreen();
|
|
float scale = device_scale_factor();
|
|
|
|
bool should_set_opaque_region = window->IsTranslucentWindowOpacitySupported();
|
|
|
|
gfx::Insets insets;
|
|
gfx::Insets input_insets;
|
|
if (showing_frame) {
|
|
insets = view->GetBorderDecorationInsets();
|
|
if (base::i18n::IsRTL()) {
|
|
insets.set_left_right(insets.right(), insets.left());
|
|
}
|
|
|
|
input_insets = view->GetInputInsets();
|
|
}
|
|
|
|
gfx::Insets scaled_insets = gfx::ScaleToCeiledInsets(insets, scale);
|
|
window->SetDecorationInsets(&scaled_insets);
|
|
|
|
gfx::Rect input_bounds(view->GetWidget()->GetWindowBoundsInScreen().size());
|
|
input_bounds.Inset(insets + input_insets);
|
|
gfx::Rect scaled_bounds = gfx::ScaleToEnclosingRect(input_bounds, scale);
|
|
window->SetInputRegion(&scaled_bounds);
|
|
|
|
if (should_set_opaque_region) {
|
|
// The opaque region is a list of rectangles that contain only fully
|
|
// opaque pixels of the window. We need to convert the clipping
|
|
// rounded-rect into this format.
|
|
SkRRect rrect = view->GetRoundedWindowContentBounds();
|
|
gfx::RectF rectf(view->GetWindowContentBounds());
|
|
rectf.Scale(scale);
|
|
// It is acceptable to omit some pixels that are opaque, but the region
|
|
// must not include any translucent pixels. Therefore, we must
|
|
// conservatively scale to the enclosed rectangle.
|
|
gfx::Rect rect = gfx::ToEnclosedRect(rectf);
|
|
|
|
// Create the initial region from the clipping rectangle without rounded
|
|
// corners.
|
|
SkRegion region(gfx::RectToSkIRect(rect));
|
|
|
|
// Now subtract out the small rectangles that cover the corners.
|
|
struct {
|
|
SkRRect::Corner corner;
|
|
bool left;
|
|
bool upper;
|
|
} kCorners[] = {
|
|
{SkRRect::kUpperLeft_Corner, true, true},
|
|
{SkRRect::kUpperRight_Corner, false, true},
|
|
{SkRRect::kLowerLeft_Corner, true, false},
|
|
{SkRRect::kLowerRight_Corner, false, false},
|
|
};
|
|
for (const auto& corner : kCorners) {
|
|
auto radii = rrect.radii(corner.corner);
|
|
auto rx = std::ceil(scale * radii.x());
|
|
auto ry = std::ceil(scale * radii.y());
|
|
auto corner_rect = SkIRect::MakeXYWH(
|
|
corner.left ? rect.x() : rect.right() - rx,
|
|
corner.upper ? rect.y() : rect.bottom() - ry, rx, ry);
|
|
region.op(corner_rect, SkRegion::kDifference_Op);
|
|
}
|
|
|
|
// Convert the region to a list of rectangles.
|
|
std::vector<gfx::Rect> opaque_region;
|
|
for (SkRegion::Iterator i(region); !i.done(); i.next())
|
|
opaque_region.push_back(gfx::SkIRectToRect(i.rect()));
|
|
window->SetOpaqueRegion(&opaque_region);
|
|
}
|
|
}
|
|
|
|
} // namespace electron
|