mirror of
https://github.com/electron/electron.git
synced 2026-01-09 15:38:08 -05:00
f3e0517b6e
* chore: bump chromium in DEPS to 102.0.4999.0 * 3576640: Set OOM handler during V8 initialization https://chromium-review.googlesource.com/c/chromium/src/+/3576640 * 3574964: Remove deprecated base::Value usage in print_settings_conversion code. https://chromium-review.googlesource.com/c/chromium/src/+/3574964 * 3570062: Replicate Active state to render process for all RenderViews. https://chromium-review.googlesource.com/c/chromium/src/+/3570062 * chore: fixup patch indices * 3380402: Remove legacy SwiftShader https://chromium-review.googlesource.com/c/chromium/src/+/3380402 * 3570254: [Local Fonts] Rename permission name from FONT_ACCESS to LOCAL_FONTS. https://chromium-review.googlesource.com/c/chromium/src/+/3570254 * 3572172: Rename or remove several parameters involved in creation of MimeHandler streams https://chromium-review.googlesource.com/c/chromium/src/+/3572172 * fix: add missing base/bits include * chore: fix lint * chore: remove ia32 Linux support * chore: patch out swift-format cipd dep on macOS * build: apply patch better * build: reset all caches * build: update zip manifests to remove swiftshared libraries Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3380402 * Revert "build: update zip manifests to remove swiftshared libraries" This reverts commit 6aeec01ef1a79425a7b7d8c1cfb131a26b91c494. * Revert "3380402: Remove legacy SwiftShader" This reverts commit 4c7eebbbf2d0a459cc192959e17ae20f970c2da2. * build: remove unused swiftshader egl libraries Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Samuel Attard <sattard@salesforce.com>
38 lines
2.0 KiB
Diff
38 lines
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 07355cb194bd429a693e587072d11432d6c0888a..b74b4209931c6acd6bc2e93a100c3e65a834ead9 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.h
|
|
+++ b/content/browser/web_contents/web_contents_impl.h
|
|
@@ -1828,7 +1828,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 2f14f906b51ce73a69cd780d70ad6264285138ac..b14695646fe75d213b4affa60a6d775ce2474238 100644
|
|
--- a/content/public/browser/web_contents.h
|
|
+++ b/content/public/browser/web_contents.h
|
|
@@ -673,6 +673,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;
|