mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
e5d3fbf6dc
* chore: bump chromium in DEPS to 147.0.7693.0 * chore: bump chromium in DEPS to 147.0.7694.0 * chore: bump chromium in DEPS to 147.0.7695.0 * chore: bump chromium in DEPS to 147.0.7697.0 * chore: bump chromium in DEPS to 147.0.7698.0 * fix(patch): IsGuest moved to SecurityPrincipal Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7234613 Co-Authored-By: Claude (claude-opus-4-6) * chore: update patches (trivial only) * fix(patch): v8::External API now requires ExternalPointerTypeTag Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7562476 Co-Authored-By: Claude (claude-opus-4-6) * fix: update CreateCustomWebContents signature Upstream added disposition and window_features parameters. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7585256 Co-Authored-By: Claude (claude-opus-4-6) * fix: OriginatingProcess renamed to OriginatingProcessId Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7557820 Co-Authored-By: Claude (claude-opus-4-6) * fix: kLogNetLog moved from network::switches to net::switches Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7559090 Co-Authored-By: Claude (claude-opus-4-6) * fix(patch): patch out glic and save-to-drive Profile usage in PDF Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7589312 Co-Authored-By: Claude (claude-opus-4-6) * chore: bump chromium in DEPS to 147.0.7699.0 * chore: remove upstreamed pseudonymization salt descriptor code Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7568382 Co-Authored-By: Claude (claude-opus-4-6) * chore: update patches (trivial only) * chore: update reclient patch format (copy-from to new-file) Co-Authored-By: Claude (claude-opus-4-6) * chore: remove upstreamed patch and update stale patches Co-Authored-By: Claude (claude-opus-4-6) * fix: expose GetLibGdk3 and guard glic function body GetLibGdk3 needs to be public for Electron's gdk_display_beep usage. ShouldShowGlicSummarizeButton body must be guarded, not just call site. Co-Authored-By: Claude (claude-opus-4-6) * fix(patch): v8::External API in nan requires ExternalPointerTypeTag Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7562476 Co-Authored-By: Claude (claude-opus-4-6) * fixup fix(patch): v8::External API in nan requires ExternalPointerTypeTag * fixup: remove extraneous changes to patches Caused bydebb3716816e51034728* fixup: revert fix: expose GetLibGdk3 and guard glic function body Reverts6e51034728as this was an unneeded changed caused by the incorrect changes made indebb371681* 7586673: Update logic for showing pdf summarize button 7586673: Update logic for showing pdf summarize button | https://chromium-review.googlesource.com/c/chromium/src/+/7586673 Also 7454131: set enable_glic=true | https://chromium-review.googlesource.com/c/chromium/src/+/7454131 (landed in previous roll) --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Alice Zhao <alicelovescake@anthropic.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 9735afc8efad7d1ef841574af30db3a8937b69ca..ad1dceef2209f312e3fdec6c7f7bc2b05c93b297 100644
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
|
@@ -1046,8 +1046,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;
|