From cbe68bdbb875c6ce963e2b8ee1cd930fb44ad4f0 Mon Sep 17 00:00:00 2001 From: David Sanders Date: Tue, 11 Jan 2022 23:39:49 -0800 Subject: [PATCH] chore: update DesktopMediaList patch (#32414) --- patches/chromium/desktop_media_list.patch | 35 +++++++++++++++++++++-- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/patches/chromium/desktop_media_list.patch b/patches/chromium/desktop_media_list.patch index 7d2ee4bd3b68..a2b70a8a8fe6 100644 --- a/patches/chromium/desktop_media_list.patch +++ b/patches/chromium/desktop_media_list.patch @@ -8,15 +8,16 @@ Subject: desktop_media_list.patch * Ensure "OnRefreshComplete()" even if there are no items in the list diff --git a/chrome/browser/media/webrtc/desktop_media_list.h b/chrome/browser/media/webrtc/desktop_media_list.h -index 57cfc646f8ea545271c22d79ec158a04b148bc9c..db4d608d3bed841ddf7225d0918e82112c8d08b5 100644 +index 57cfc646f8ea545271c22d79ec158a04b148bc9c..c5339603930f68e7019ca33d8b9f148cf4ac86af 100644 --- a/chrome/browser/media/webrtc/desktop_media_list.h +++ b/chrome/browser/media/webrtc/desktop_media_list.h -@@ -94,7 +94,7 @@ class DesktopMediaList { +@@ -94,7 +94,8 @@ class DesktopMediaList { // once per DesktopMediaList instance. It should not be called after // StartUpdating(), and StartUpdating() should not be called until |callback| // has been called. - virtual void Update(UpdateCallback callback) = 0; -+ virtual void Update(UpdateCallback callback, bool fetch_thumbnails = false) = 0; ++ virtual void Update(UpdateCallback callback, ++ bool refresh_thumbnails = false) = 0; virtual int GetSourceCount() const = 0; virtual const Source& GetSource(int index) const = 0; @@ -52,6 +53,34 @@ index c56bc6dcc73cf0e0d5e0e64d45436ccac833cd66..69aaecca38ede55ee71310698710e3f1 int GetSourceCount() const override; const Source& GetSource(int index) const override; DesktopMediaList::Type GetMediaListType() const override; +diff --git a/chrome/browser/media/webrtc/fake_desktop_media_list.cc b/chrome/browser/media/webrtc/fake_desktop_media_list.cc +index b1db454db6b7982962541cef18c09425b8f5fa5a..1e37f85d7f786807af331ccc347d84d9b4d7177c 100644 +--- a/chrome/browser/media/webrtc/fake_desktop_media_list.cc ++++ b/chrome/browser/media/webrtc/fake_desktop_media_list.cc +@@ -75,7 +75,8 @@ void FakeDesktopMediaList::StartUpdating(DesktopMediaListObserver* observer) { + thumbnail_ = gfx::ImageSkia::CreateFrom1xBitmap(bitmap); + } + +-void FakeDesktopMediaList::Update(UpdateCallback callback) { ++void FakeDesktopMediaList::Update(UpdateCallback callback, ++ bool refresh_thumbnails) { + std::move(callback).Run(); + } + +diff --git a/chrome/browser/media/webrtc/fake_desktop_media_list.h b/chrome/browser/media/webrtc/fake_desktop_media_list.h +index 1e4a652634fbde2ca9a256baca840bbc5a0e001f..546f5bc3a2f79035f0eec196d9e704b849992a6f 100644 +--- a/chrome/browser/media/webrtc/fake_desktop_media_list.h ++++ b/chrome/browser/media/webrtc/fake_desktop_media_list.h +@@ -32,7 +32,8 @@ class FakeDesktopMediaList : public DesktopMediaList { + void SetThumbnailSize(const gfx::Size& thumbnail_size) override; + void SetViewDialogWindowId(content::DesktopMediaID dialog_id) override; + void StartUpdating(DesktopMediaListObserver* observer) override; +- void Update(UpdateCallback callback) override; ++ void Update(UpdateCallback callback, ++ bool refresh_thumbnails = false) override; + int GetSourceCount() const override; + const Source& GetSource(int index) const override; + DesktopMediaList::Type GetMediaListType() const override; diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc index 04dbc1f44944abd3333e83b603dcdf755c0cb09d..ab2dcc4d5fa19790114cae9611aa815e48386bb7 100644 --- a/chrome/browser/media/webrtc/native_desktop_media_list.cc