enable_reset_aspect_ratio.patch 1.8 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  2. From: Cheng Zhao <[email protected]>
  3. Date: Thu, 4 Oct 2018 14:57:02 -0700
  4. Subject: feat: enable setting aspect ratio to 0
  5. Make SetAspectRatio accept 0 as valid input, which would reset to null.
  6. 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
  7. index d877d237b2c1622057ff5e2304f232760016b948..e8a6da6bdb14eea3217a6824163364958552ba44 100644
  8. --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
  9. +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
  10. @@ -579,7 +579,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
  11. void DesktopWindowTreeHostWin::SetAspectRatio(
  12. const gfx::SizeF& aspect_ratio,
  13. const gfx::Size& excluded_margin) {
  14. - DCHECK(!aspect_ratio.IsEmpty());
  15. + DCHECK_NE(aspect_ratio.height(), 0);
  16. message_handler_->SetAspectRatio(aspect_ratio.width() / aspect_ratio.height(),
  17. excluded_margin);
  18. }
  19. diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
  20. index 1d52e72cb648de3c82f6061dc95ddd5f1c192ac8..e447cae6e00efa8b0afa72f6d3887bedf9cb5a5c 100644
  21. --- a/ui/views/win/hwnd_message_handler.cc
  22. +++ b/ui/views/win/hwnd_message_handler.cc
  23. @@ -963,8 +963,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen,
  24. void HWNDMessageHandler::SetAspectRatio(float aspect_ratio,
  25. const gfx::Size& excluded_margin) {
  26. - // If the aspect ratio is not in the valid range, do nothing.
  27. - DCHECK_GT(aspect_ratio, 0.0f);
  28. + // If the aspect ratio is 0, reset it to null.
  29. + if (aspect_ratio == 0.0f) {
  30. + aspect_ratio_.reset();
  31. + return;
  32. + }
  33. aspect_ratio_ = aspect_ratio;