mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
a06b49aca1
* chore: bump chromium in DEPS to 148.0.7755.0 * chore: bump chromium in DEPS to 148.0.7756.0 * chore: update patches * 7698536: Wire up experiment arms for Glic summarize pdf button. Refs https://chromium-review.googlesource.com/c/chromium/src/+/7698536 * 7695602: Include gperf to sources for iOS builds Refs https://chromium-review.googlesource.com/c/chromium/src/+/7695602 * 7671200: Expose IgnoreDuplicateNavs in WebView Refs https://chromium-review.googlesource.com/c/chromium/src/+/7671200 * chore: bump chromium in DEPS to 148.0.7758.0 * chore: update patches * 7701873: Allow running completion callbacks directly in CommitPresentedFrameToCA() on Mac Refs https://chromium-review.googlesource.com/c/chromium/src/+/7701873 * 7697732: Enhance diagnostic logging for ScreenCaptureKit errors on macOS Refs https://chromium-review.googlesource.com/c/chromium/src/+/7697732 * 7698176: Disallow cookies with empty name and ambiguous value Refs https://chromium-review.googlesource.com/c/chromium/src/+/7698176 * 7607319: Code Health: Use span in base::HexEncode Refs https://chromium-review.googlesource.com/c/chromium/src/+/7607319 * chore: bump chromium in DEPS to 148.0.7759.0 * chore: update patches * 7696478: [extensions] Move StreamContainer to extensions/browser/mime_handler/ Refs https://chromium-review.googlesource.com/c/chromium/src/+/7696478 * 7656748: Fixed controlled frame fullscreen crash Refs https://chromium-review.googlesource.com/c/chromium/src/+/7656748 * chore: update patches * fixup! 7696478: [extensions] Move StreamContainer to extensions/browser/mime_handler/ --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.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 4c1c0c60b69f1a0ee7f98e03e6d8d2ca05645b0a..340a8d61e302c1b1ca6ad0dfb859fc9b0e4106b6 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
|
|
@@ -638,7 +638,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 e00c2c13c180367375639838a13a7a7c846b3072..074223b543e70abd7fc3cb304424e166127b440c 100644
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
|
@@ -1051,8 +1051,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;
|