mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
04f2b2e2e3
* chore: bump chromium in DEPS to 102.0.5005.12 * chore: bump chromium in DEPS to 102.0.5005.22 * 3587410: [Printing] Remove JobEventDetails Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3587410 (cherry picked from commit 75d75bc087a29640cc58ecb7122dbc8ea10ce785) * chore: update patches * 3579297: Convert UpdatePrintSettings() to use non-deprecated base::Value APIs. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3579297 * 3577218: WebUI: Delete webui_resources.grd and related GN targets. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3577218 (cherry picked from commit b12e658fee8f8d8832145f0ab141549c3466f567) * chore: bump chromium in DEPS to 102.0.5005.27 * 3368244: Hook SnapshotForContentAnalysis renderer API to scan system prints Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3368244 (cherry picked from commit9ccc4d6249) * 3584006: Remove IsRenderViewLive from content public Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3584006 (cherry picked from commit5c5bc4ca6d) * 3368244: Hook SnapshotForContentAnalysis renderer API to scan system prints Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3368244 (cherry picked from commitdbdff6fe7e) * 3581708: Restore original display when moving from tab-fullscreen to browser-fullscreen. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3581708 (cherry picked from commitc02749954c) * 64908: Stop building legacy SwiftShader GL in Chromium https://swiftshader-review.googlesource.com/c/SwiftShader/+/64908 * 3573245: Added Themed versions of RoundedRectBackground and RoundedRectBorder. https://chromium-review.googlesource.com/c/chromium/src/+/3573245 * fixup for lint 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: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: VerteDinde <vertedinde@electronjs.org>
41 lines
1.9 KiB
Diff
41 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Charles Kerr <charles@charleskerr.com>
|
|
Date: Wed, 9 Jun 2021 14:28:08 -0500
|
|
Subject: refactor: restore base::AdaptCallbackForRepeating
|
|
|
|
Undo https://chromium-review.googlesource.com/c/chromium/src/+/2941842
|
|
to reinstate base::AdaptCallbackForRepeating(). It was removed to fix
|
|
https://bugs.chromium.org/p/chromium/issues/detail?id=730593 .
|
|
|
|
We use AdaptCallbackForRepeating() in about a dozen places. This patch
|
|
should be removed as soon as those have been updated. Patching because
|
|
every instance is a FTBFS that prevents testing any one instance's fix.
|
|
|
|
diff --git a/base/callback_helpers.h b/base/callback_helpers.h
|
|
index 49ce51acb678886e0c679caa42e616400ab3bd48..760d97e8614195c8106b07b8477cf91a5dbebc15 100644
|
|
--- a/base/callback_helpers.h
|
|
+++ b/base/callback_helpers.h
|
|
@@ -96,6 +96,22 @@ class OnceCallbackHolder final {
|
|
|
|
} // namespace internal
|
|
|
|
+// Wraps the given OnceCallback into a RepeatingCallback that relays its
|
|
+// invocation to the original OnceCallback on the first invocation. The
|
|
+// following invocations are just ignored.
|
|
+//
|
|
+// Note that this deliberately subverts the Once/Repeating paradigm of Callbacks
|
|
+// but helps ease the migration from old-style Callbacks. Avoid if possible; use
|
|
+// if necessary for migration. TODO(tzik): Remove it. https://crbug.com/730593
|
|
+template <typename... Args>
|
|
+RepeatingCallback<void(Args...)> AdaptCallbackForRepeating(
|
|
+ OnceCallback<void(Args...)> callback) {
|
|
+ using Helper = internal::OnceCallbackHolder<Args...>;
|
|
+ return base::BindRepeating(
|
|
+ &Helper::Run, std::make_unique<Helper>(std::move(callback),
|
|
+ /*ignore_extra_runs=*/true));
|
|
+}
|
|
+
|
|
// Wraps the given OnceCallback and returns two OnceCallbacks with an identical
|
|
// signature. On first invokation of either returned callbacks, the original
|
|
// callback is invoked. Invoking the remaining callback results in a crash.
|