mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
5d80264944
* chore: bump chromium in DEPS to 145.0.7620.0 * chore: bump chromium in DEPS to 145.0.7622.0 * chore: bump chromium in DEPS to 145.0.7624.0 * chore: bump chromium in DEPS to 145.0.7626.0 * chore: bump chromium in DEPS to 145.0.7628.0 * 7362759: Migrate various base::Contains() to contains() in ui | https://chromium-review.googlesource.com/c/chromium/src/+/7362759 * chore: update patches * 7411324: url: Mark deprecated functions as UNSAFE_BUFFER_USAGE https://chromium-review.googlesource.com/c/chromium/src/+/7411324 * 7366867: Store property info in CSSParserLocalContext for random() https://chromium-review.googlesource.com/c/chromium/src/+/7366867 * 7277406: Exclude PiP from getDisplayMedia picker thumbnails https://chromium-review.googlesource.com/c/chromium/src/+/7277406 * 7253489: activity_reporter: Create stub module owned by browser_process https://chromium-review.googlesource.com/c/chromium/src/+/7253489 * 7404514: Create device parental controls delegate https://chromium-review.googlesource.com/c/chromium/src/+/7404514 * 7269504: Update histograms to use the updated MediaStreamRequestResult enum https://chromium-review.googlesource.com/c/chromium/src/+/7269504 * fixup! 7253489: activity_reporter: Create stub module owned by browser_process * 7368549: Reland "Use native rollup" https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7368549 * 4803165: Enable suppressing input event dispatch while paint-holding. https://chromium-review.googlesource.com/c/chromium/src/+/4803165 * chore: make device_parental_controls lazy --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
49 lines
2.3 KiB
Diff
49 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
Date: Thu, 20 Sep 2018 17:45:47 -0700
|
|
Subject: disable_hidden.patch
|
|
|
|
Electron uses this to disable background throttling for hidden windows.
|
|
|
|
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
|
|
index 330793d9e5642ba327c596b142a15c7a659603ce..f658122d05a1233bf8dfc049887385dad5f9371b 100644
|
|
--- a/content/browser/renderer_host/render_widget_host_impl.cc
|
|
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
|
|
@@ -846,6 +846,10 @@ void RenderWidgetHostImpl::WasHidden() {
|
|
return;
|
|
}
|
|
|
|
+ if (disable_hidden_) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
// Cancel pending pointer lock requests, unless there's an open user prompt.
|
|
// Prompts should remain open and functional across tab switches.
|
|
if (!delegate_ || !delegate_->IsWaitingForPointerLockPrompt(this)) {
|
|
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
|
|
index 614390e29fa84af4c141102d86f3ebdb7293b813..0bb31ec2e957301e55c81225683ec9982ba63039 100644
|
|
--- a/content/browser/renderer_host/render_widget_host_impl.h
|
|
+++ b/content/browser/renderer_host/render_widget_host_impl.h
|
|
@@ -1036,6 +1036,8 @@ class CONTENT_EXPORT RenderWidgetHostImpl
|
|
return synthetic_gesture_controller_.get();
|
|
}
|
|
|
|
+ // Electron: Prevents the widget from getting hidden.
|
|
+ bool disable_hidden_ = false;
|
|
protected:
|
|
// |routing_id| must not be IPC::mojom::kRoutingIdNone.
|
|
// If this object outlives |delegate|, DetachDelegate() must be called when
|
|
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
|
index 3c1f05313dc444f4e303e1d789db781953b824a4..4df91cea76224362565bb968852d05c1a4f865f9 100644
|
|
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
|
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
|
@@ -710,7 +710,7 @@ void RenderWidgetHostViewAura::HideImpl() {
|
|
CHECK(visibility_ == Visibility::HIDDEN ||
|
|
visibility_ == Visibility::OCCLUDED);
|
|
|
|
- if (!host()->IsHidden()) {
|
|
+ if (!host()->IsHidden() && !host()->disable_hidden_) {
|
|
host()->WasHidden();
|
|
aura::WindowTreeHost* host = window_->GetHost();
|
|
aura::Window* parent = window_->parent();
|