зеркало из https://github.com/electron/electron.git
38 строки
2.0 KiB
Diff
38 строки
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
Date: Fri, 3 Sep 2021 18:28:51 -0700
|
|
Subject: fix: expose DecrementCapturerCount in web_contents_impl
|
|
|
|
This was made private in https://chromium-review.googlesource.com/c/chromium/src/+/2807829 but
|
|
we invoke it in order to expose contents.decrementCapturerCount([stayHidden, stayAwake])
|
|
to users. We should try to upstream this.
|
|
|
|
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
|
|
index cef24f4d97a371d0f8996cd80becda169492018c..0db420804049814b7ab45b16164edeca81ae9bfa 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.h
|
|
+++ b/content/browser/web_contents/web_contents_impl.h
|
|
@@ -1872,7 +1872,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
|
|
// IncrementCapturerCount() is destructed.
|
|
void DecrementCapturerCount(bool stay_hidden,
|
|
bool stay_awake,
|
|
- bool is_activity = true);
|
|
+ bool is_activity = true) override;
|
|
|
|
// Calculates the PageVisibilityState for |visibility|, taking the capturing
|
|
// state into account.
|
|
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
|
|
index f0ca6d5d46e86bc85b60ff0de3185075f169075a..6c5b9bad4f647c2e1c2a4c68067f76353b5d60b6 100644
|
|
--- a/content/public/browser/web_contents.h
|
|
+++ b/content/public/browser/web_contents.h
|
|
@@ -672,6 +672,10 @@ class WebContents : public PageNavigator,
|
|
bool stay_awake,
|
|
bool is_activity = true) = 0;
|
|
|
|
+ virtual void DecrementCapturerCount(bool stay_hidden,
|
|
+ bool stay_awake,
|
|
+ bool is_activity = true) = 0;
|
|
+
|
|
// Getter for the capture handle, which allows a captured application to
|
|
// opt-in to exposing information to its capturer(s).
|
|
virtual const blink::mojom::CaptureHandleConfig& GetCaptureHandleConfig() = 0;
|