ca75bca667
* chore: bump chromium in DEPS to 520c02b46668fc608927e0fcd79b6a90885a48bf * chore: bump chromium in DEPS to 90.0.4414.0 * resolve chromium conflicts * resolve v8 conflicts * fix node gn files * 2673502: Remove RenderViewCreated use from ExtensionHost.2673502* 2676903: [mojo] Remove most legacy Binding classes.2676903* 2644847: Move self-deleting URLLoaderFactory base into //services/network.2644847* 2664006: Remove from mojo::DataPipe.2664006* 2674530: Remove CertVerifierService feature2674530* 2668748: Move OnSSLCertificateError to a new interface.2668748* 2672923: Remove RAPPOR reporting infrastructure.2672923* 2673502: Remove RenderViewCreated use from ExtensionHost.2673502* 2655126: Convert FrameHostMsg_ContextMenu and FrameMsg_ContextMenuClosed|CustomContextMenuAction to Mojo2655126* 2628705: Window Placement: Implement screen.isExtended and change event2628705* 2643161: Refactor storage::kFileSystem*Native*2643161* fix build * only remove the biggest subdir of //ios * chore: bump chromium in DEPS to 90.0.4415.0 * update patches * update sysroots * 2686147: Remove WebContentsObserver::RenderViewCreated().2686147* 2596429: Fixing how extension's split and spanning modes affect OriginAccessList.2596429* 2686026: [mojo] Delete AssociatedInterfacePtr (replaced by AssociatedRemote)2686026* 2651705: Move ui/base/dragdrop/file_info to ui/base/clipboard2651705* 358217: drawBitmap is deprecated https://skia-review.googlesource.com/c/skia/+/358217 * fix gn check * 2678098: Use gen/front_end as input to generate_devtools_grd2678098* 2674530: Remove CertVerifierService feature2674530* fixup 2664006: Remove from mojo::DataPipe.2664006* fixup build_add_electron_tracing_category.patch * 2673415: [base] Prepare CrashReporterClient for string16 switch2673415* 2673413: Add CursorFactoryWin to handle Cursors on Windows2673413* 2668748: Move OnSSLCertificateError to a new interface.2668748* fix mas gn check * update patch after merge * Update node for .mjs files * build: load v8_prof_processor dependencies as ESM * chore: add patch to fix linux 32bit Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
38 lines
1.6 KiB
Diff
38 lines
1.6 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 31db3cdbfad4d97b3cd9aa3bd884ea4e1dc6e564..5787a24deaefd177ddc0ed1b2f897b36a2f84d64 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
|
|
@@ -484,7 +484,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
|
|
}
|
|
|
|
void DesktopWindowTreeHostWin::SetAspectRatio(const gfx::SizeF& aspect_ratio) {
|
|
- DCHECK(!aspect_ratio.IsEmpty());
|
|
+ DCHECK_NE(aspect_ratio.height(), 0);
|
|
message_handler_->SetAspectRatio(aspect_ratio.width() /
|
|
aspect_ratio.height());
|
|
}
|
|
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
|
|
index 1013375edabb6e59338bcd9266f04ee09668098e..80b0e1cb9f52c8b25f00d538733c0c15c2df0196 100644
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
|
@@ -921,8 +921,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
|
|
}
|
|
|
|
void HWNDMessageHandler::SetAspectRatio(float aspect_ratio) {
|
|
- // 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;
|
|
|