chore: deprecate apply-patches in favour of git-{import,export}-patches (#15300)
This commit is contained in:
parent
4185efa08f
commit
335e9f68b7
123 changed files with 4368 additions and 4780 deletions
|
@ -1,5 +1,15 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: deepak1556 <hop2deep@gmail.com>
|
||||
Date: Thu, 18 Oct 2018 17:07:01 -0700
|
||||
Subject: desktop_media_list.patch
|
||||
|
||||
* Adds a new observer method to DesktopMediaListObserver for
|
||||
desktop capture api.
|
||||
* Backports https://chromium-review.googlesource.com/c/chromium/src/+/1199806
|
||||
that fixes crash with screen capturer, can be removed in 71.0.3539.0
|
||||
|
||||
diff --git a/chrome/browser/media/webrtc/desktop_media_list.h b/chrome/browser/media/webrtc/desktop_media_list.h
|
||||
index 8e02a8a95eb0..3497b85428a5 100644
|
||||
index 8e02a8a95eb07516162eacdf5b361231d3a02975..3497b85428a52c6019cfb5d30229071f99ecfb20 100644
|
||||
--- a/chrome/browser/media/webrtc/desktop_media_list.h
|
||||
+++ b/chrome/browser/media/webrtc/desktop_media_list.h
|
||||
@@ -32,6 +32,9 @@ class DesktopMediaList {
|
||||
|
@ -26,7 +36,7 @@ index 8e02a8a95eb0..3497b85428a5 100644
|
|||
virtual content::DesktopMediaID::Type GetMediaListType() const = 0;
|
||||
};
|
||||
diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.cc b/chrome/browser/media/webrtc/desktop_media_list_base.cc
|
||||
index 43dd95ef72f5..d4662708f649 100644
|
||||
index 43dd95ef72f5b35b91471950cc114800d54945ab..d4662708f64934372422b853673eaaf8f05e4baf 100644
|
||||
--- a/chrome/browser/media/webrtc/desktop_media_list_base.cc
|
||||
+++ b/chrome/browser/media/webrtc/desktop_media_list_base.cc
|
||||
@@ -18,6 +18,11 @@ DesktopMediaListBase::DesktopMediaListBase(base::TimeDelta update_period)
|
||||
|
@ -88,7 +98,7 @@ index 43dd95ef72f5..d4662708f649 100644
|
|||
base::BindOnce(&DesktopMediaListBase::Refresh,
|
||||
weak_factory_.GetWeakPtr()),
|
||||
diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.h b/chrome/browser/media/webrtc/desktop_media_list_base.h
|
||||
index 746df1210aa9..461e0edf8509 100644
|
||||
index 746df1210aa92af5c9d4703112b4bd6c09b94fdf..461e0edf8509569d05c86f466c02b5035183d0df 100644
|
||||
--- a/chrome/browser/media/webrtc/desktop_media_list_base.h
|
||||
+++ b/chrome/browser/media/webrtc/desktop_media_list_base.h
|
||||
@@ -24,12 +24,14 @@ class DesktopMediaListBase : public DesktopMediaList {
|
||||
|
@ -108,7 +118,7 @@ index 746df1210aa9..461e0edf8509 100644
|
|||
|
||||
static uint32_t GetImageHash(const gfx::Image& image);
|
||||
diff --git a/chrome/browser/media/webrtc/desktop_media_list_observer.h b/chrome/browser/media/webrtc/desktop_media_list_observer.h
|
||||
index 47401abc984e..ca6a527ffac8 100644
|
||||
index 47401abc984e6fe26c7f4c5399aa565c687060b0..ca6a527ffac877c27aac94337ec5a7b546e09768 100644
|
||||
--- a/chrome/browser/media/webrtc/desktop_media_list_observer.h
|
||||
+++ b/chrome/browser/media/webrtc/desktop_media_list_observer.h
|
||||
@@ -18,6 +18,10 @@ class DesktopMediaListObserver {
|
||||
|
@ -123,7 +133,7 @@ index 47401abc984e..ca6a527ffac8 100644
|
|||
protected:
|
||||
virtual ~DesktopMediaListObserver() {}
|
||||
diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
|
||||
index 0c9ba953cb3c..c2482774f074 100644
|
||||
index 0c9ba953cb3c268930fb101105c22416ed3cae08..c2482774f0747a0300d72d7ef05ed429caaf7d19 100644
|
||||
--- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
|
||||
+++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
|
||||
@@ -5,11 +5,15 @@
|
||||
|
@ -262,7 +272,7 @@ index 0c9ba953cb3c..c2482774f074 100644
|
|||
base::Unretained(worker_.get()), native_ids,
|
||||
thumbnail_size_));
|
||||
diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.h b/chrome/browser/media/webrtc/native_desktop_media_list.h
|
||||
index e6f0e17b05ee..75c9ca04ce48 100644
|
||||
index e6f0e17b05ee4dc45827dc2dd00d484201f74646..75c9ca04ce481ab79615515da948c29d449865dc 100644
|
||||
--- a/chrome/browser/media/webrtc/native_desktop_media_list.h
|
||||
+++ b/chrome/browser/media/webrtc/native_desktop_media_list.h
|
||||
@@ -8,7 +8,7 @@
|
||||
|
@ -288,3 +298,6 @@ index e6f0e17b05ee..75c9ca04ce48 100644
|
|||
std::unique_ptr<Worker> worker_;
|
||||
|
||||
#if defined(USE_AURA)
|
||||
--
|
||||
2.17.0
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue