e3e647d21e
* chore: bump chromium in DEPS to 138.0.7166.0 * chore: bump chromium in DEPS to 138.0.7166.2 * 6508373: Add WebContents, Tab getters for future Clank navigation capture rework6508373* 6470924: Introduce auto-populated Search Engine icons.6470924* 6502977: Force same tab navigation while actor coordinator is acting on a tab6502977* chore: bump chromium in DEPS to 138.0.7168.0 * chore: update patches * fix grit patch * chore: bump Chromium to 138.0.7169.2 * fixup! 6508373: Add WebContents, Tab getters for future Clank navigation capture rework * 6493688: NavigationThrottleRunner2: void CreateThrottlesForNavigation6493688* 6488755: Reland "WebSQL: Remove WebPreference"6488755* 6428707: FSA: Only normalize the hardcoded rules once during initialization6428707* chore: fixup patch indices * chore: bump chromium in DEPS to 138.0.7170.0 * 6514121: Remove origin calculation debug info and related methods6514121* chore: bump chromium in DEPS to 138.0.7172.0 * chore: bump chromium in DEPS to 138.0.7173.0 * chore: bump chromium in DEPS to 138.0.7175.0 * fixup! 6514121: Remove origin calculation debug info and related methods Refs6514121* 6531585: Don't retry LayerTreeSink creation on the high priority queue Refs6531585* 6512253: Modernize base::apple's base bundle ID Refs6512253* fixup! 6428707: FSA: Only normalize the hardcoded rules once during initialization Refs6428707* fixup! 6508373: Add WebContents, Tab getters for future Clank navigation capture rework Refs6508373* chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: David Sanders <dsanders11@ucsbalum.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 6ad16425f2fb3438be178cb06a85ef72f8d09e22..61509e2eb982797845098abf5f36e031be63686b 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 9a42a64f52ccbab2cab6119c91b69ab44eeeb9e5..2cd46f4692c84cffff0775bbb67d3585f24e900d 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;
|
|
|