diff options
| author | Robert Nagy <robert@openbsd.org> | 2022-08-31 19:47:43 +0200 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2022-09-03 10:40:22 +0200 |
| commit | 89b6c3ce8595f65174312096d44b14a77a12721d (patch) | |
| tree | aeb179a19c031f080788f4398d8031e2ad8774b5 /www/chromium/files/patch-ui_display_screen.cc | |
| parent | devel/electron17: deprecate and set to expire on 2022-09-30 (diff) | |
www/chromium: update to 105.0.5195.52
Security: https://www.vuxml.org/freebsd/f2043ff6-2916-11ed-a1ef-3065ec8fd3ec.html
Diffstat (limited to 'www/chromium/files/patch-ui_display_screen.cc')
| -rw-r--r-- | www/chromium/files/patch-ui_display_screen.cc | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/www/chromium/files/patch-ui_display_screen.cc b/www/chromium/files/patch-ui_display_screen.cc index ef832b6d1b8f..c8c3aaee115d 100644 --- a/www/chromium/files/patch-ui_display_screen.cc +++ b/www/chromium/files/patch-ui_display_screen.cc @@ -1,34 +1,11 @@ ---- ui/display/screen.cc.orig 2022-08-15 13:11:31 UTC +--- ui/display/screen.cc.orig 2022-08-31 12:19:35 UTC +++ ui/display/screen.cc -@@ -84,27 +84,12 @@ void Screen::SetDisplayForNewWindows(int64_t display_i +@@ -84,7 +84,7 @@ void Screen::SetDisplayForNewWindows(int64_t display_i display_id_for_new_windows_ = display_id; } -#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) --std::unique_ptr<Screen::ScreenSaverSuspender> Screen::SuspendScreenSaver() { -- SetScreenSaverSuspended(true); -- screen_saver_suspension_count_++; -- return base::WrapUnique(new Screen::ScreenSaverSuspender(this)); --} +#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) -+Screen::ScreenSaverSuspender::~ScreenSaverSuspender() = default; - --Screen::ScreenSaverSuspender::~ScreenSaverSuspender() { -- // Check that this suspender still refers to the active screen. Particularly -- // in tests, the screen might be destructed before the suspender. -- if (screen_ == GetScreen()) { -- screen_->screen_saver_suspension_count_--; -- if (screen_->screen_saver_suspension_count_ == 0) { -- screen_->SetScreenSaverSuspended(false); -- } -- } --} -- --bool Screen::SetScreenSaverSuspended(bool suspend) { -+std::unique_ptr<Screen::ScreenSaverSuspender> Screen::SuspendScreenSaver() { - NOTIMPLEMENTED_LOG_ONCE(); -- return false; -+ return nullptr; - } - #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) + Screen::ScreenSaverSuspender::~ScreenSaverSuspender() = default; + std::unique_ptr<Screen::ScreenSaverSuspender> Screen::SuspendScreenSaver() { |