mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
238699221e
* chore: bump chromium in DEPS to 147.0.7708.0 * chore: update patches * chore: bump chromium in DEPS to 147.0.7709.0 * chore: bump chromium in DEPS to 147.0.7710.0 * chore: bump chromium in DEPS to 147.0.7713.0 * 7603876: Remove OriginatingProcess and RendererProcess overloads Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7603876 Co-Authored-By: Claude (claude-opus-4-20250514) * 7596126: Clean up StoragePartitionImpl bucket data deletion. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7596126 * fix(patch): ENABLE_GLIC guard removed upstream Upstream removed the #if BUILDFLAG(ENABLE_GLIC) guard around ShouldShowGlicSummarizeButton, making the code unconditional. Restructured the patch to use #if 0 / #else / #endif instead. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7616763 Co-Authored-By: Claude (Anthropic) * fix(patch): Win32 API :: scope qualifiers Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7613666 Co-Authored-By: Claude (Anthropic) * chore: update patches (trivial only) * docs: add skip-and-recreate warning to chromium upgrade skill --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <kleinschmidtorama@gmail.com>
39 lines
1.8 KiB
Diff
39 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
Date: Thu, 4 Oct 2018 14:57:02 -0700
|
|
Subject: feat: enable setting aspect ratio to 0
|
|
|
|
Make SetAspectRatio accept 0 as valid input, which would reset to null.
|
|
|
|
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
|
|
index 8e2a68ffa63776c3782b1503b76a7f1845651e54..32d4b00eafcf534e806a0be65143d61270ba9317 100644
|
|
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
|
|
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
|
|
@@ -619,7 +619,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
|
|
void DesktopWindowTreeHostWin::SetAspectRatio(
|
|
const gfx::SizeF& aspect_ratio,
|
|
const gfx::Size& excluded_margin) {
|
|
- DCHECK(!aspect_ratio.IsEmpty());
|
|
+ DCHECK_NE(aspect_ratio.height(), 0);
|
|
message_handler_->SetAspectRatio(aspect_ratio.width() / aspect_ratio.height(),
|
|
excluded_margin);
|
|
}
|
|
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
|
|
index 6a4f780c6921d901e9f954d1f7ba18c40d8847b9..29560b1f244ba56018799eff1cf5d2eae3eb4e7c 100644
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
|
@@ -1047,8 +1047,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen,
|
|
|
|
void HWNDMessageHandler::SetAspectRatio(float aspect_ratio,
|
|
const gfx::Size& excluded_margin) {
|
|
- // If the aspect ratio is not in the valid range, do nothing.
|
|
- DCHECK_GT(aspect_ratio, 0.0f);
|
|
+ // If the aspect ratio is 0, reset it to null.
|
|
+ if (aspect_ratio == 0.0f) {
|
|
+ aspect_ratio_.reset();
|
|
+ return;
|
|
+ }
|
|
|
|
aspect_ratio_ = aspect_ratio;
|
|
excluded_margin_dip_ = excluded_margin;
|