08b7a1f801* chore: bump chromium in DEPS to 137.0.7139.0 * chore: bump chromium in DEPS to 137.0.7141.0 * chore: update patches Refs https://chromium-review.googlesource.com/c/chromium/src/+/6474596 Refs https://chromium-review.googlesource.com/c/chromium/src/+/6443472 Refs https://chromium-review.googlesource.com/c/chromium/src/+/6471184 * [ServiceWorker] Pipe is_for_service_worker into OverrideURLLoaderFactoryParams Refs https://chromium-review.googlesource.com/c/chromium/src/+/6459481 * Reland "[PermissionOptions] Use PermissionDescriptorPtr in PermissionControllerDelegate" Refs https://chromium-review.googlesource.com/c/chromium/src/+/6455975 * clickiness: Check attestation and user settings on origins Refs https://chromium-review.googlesource.com/c/chromium/src/+/6356796 * extensions : Move ReloadExtension from ExtensionService Refs https://chromium-review.googlesource.com/c/chromium/src/+/6472812 Refs https://chromium-review.googlesource.com/c/chromium/src/+/6472777 * fixup! Update AppleKeychain API to be friendlier Refs https://chromium-review.googlesource.com/c/chromium/src/+/6443472 * chore: script/gen-libc++-filenames.js * Rename ColorVariant::CovertToSkColor() to ColorVariant::ResolveToSkColor() Refs https://chromium-review.googlesource.com/c/chromium/src/+/6373793 * [headless] Provide headless aware window metrics on Windows Refs https://chromium-review.googlesource.com/c/chromium/src/+/6374074 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
38 lines
1.8 KiB
Diff
38 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 828034d26e147dc8f695112247b3b2da7b258d2b..f6686dd07fc13c84b4b41416b6936bfdd1335d1d 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
|
|
@@ -664,7 +664,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 ac502dee8a21725db9de2e232cb5092a0670f1d9..db2b841e973f05049f712c732ae8d4815a8aff7a 100644
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
|
@@ -992,8 +992,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;
|
|
|