87f7625c5d
* chore: bump chromium in DEPS to 96.0.4662.0 * chore: bump chromium in DEPS to 96.0.4663.0 * chore: update patches * [Extensions] Remove RuntimeData entirely3177328* Make helper macros behave consistently for //content/public UserData types3198788* Enabling sandboxing for the speech recognition service browser tests3146090* [devtools] Add 'RegisterPreference' host binding3162281* [Reland][Extensions]: Add persistAcrossSessions flag (scripting API)3175161* [Bluetooth] Add Passkey prompt dialog for bonding.2841104* Clipboard: Remove ReadImage path in browser3194826* Split printing metafile code into its own target.3164925* Cleanup unused DesktopMediaListObserver params3179203* Remove base::DictionaryValue::GetBinary3201974* Window Placement: change RWHV::GetDisplayList to GetScreenInfos3138774* Add a preview to the Tab Capture picker dialog3045268* Add service-based usage to update print settings3155426* chore: bump chromium in DEPS to 96.0.4664.2 * chore: update patches * chore: bump chromium in DEPS to 96.0.4664.4 * chore: update patches * chore: bump chromium in DEPS to 97.0.4666.0 * Revert "chore: bump chromium in DEPS to 97.0.4666.0" This reverts commit d73caae8ba4b39efc9b3ea4de52685b9c92ef3d0. * Reland "Block external protocol handler with sandbox."3198263* fixup for lint * Add CookiePartitionKeychain parameter to CookeManager.GetCookieList.3206016* Move ui/gfx/transform*,rrect*,mask_filter_info* into ui/gfx/geometry3200392* fixup Move ui/gfx/transform*,rrect*,mask_filter_info* into ui/gfx/geometry * ozone: //chrome/browser clean up from USE_X113186490* content: don't load v8 snapshot in browser process3183394* [devtools] Add 'RegisterPreference' host binding3162281* 3186491: Add 'devtools.sync_preferences' preference3186491* 2951147: DCHECK accessible names for focusable Views2951147* 3201014: Use real font size for calculation of SmallTextRatio3201014* fixup Clipboard: Remove ReadImage path in browser * chore: update patches * fix: disable PlzServiceWorker to fix custom protocol SW script loading Ref:3199761Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> 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 d8411ddc4fd88a1416181cce366b112df3f48d63..a33ec53b96fec67feacc92e71fa6ed17c5e47d7d 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
|
|
@@ -525,7 +525,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 149edcde6c1ad336f39f65c36ed2bb87a2b2a800..a235cab941ec583a8dc9cb5e4105c2d7baae02df 100644
|
|
--- a/ui/views/win/hwnd_message_handler.cc
|
|
+++ b/ui/views/win/hwnd_message_handler.cc
|
|
@@ -928,8 +928,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;
|
|
|