mirror of
https://github.com/electron/electron.git
synced 2026-10-28 11:44:46 +08:00
a89731b06c
* chore: bump chromium in DEPS to 158.0.8116.0 * 8527713: [Linux] Persist offered GlobalShortcuts portal shortcuts Upstream BindShortcuts() now looks commands up with find() and falls back to persisted offered shortcuts whose owner isn't loaded. Moved the pending bind group tracking into the found branch so unloaded shortcuts don't resolve a registration. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/8527713 Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * 8618876: Add compromised eMudhra intermediates to blocklist. Upstream now ships the same eight SPKI hashes in cert_verify_proc_blocklist.inc, so the Electron patch carrying them is no longer needed. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/8618876 Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * chore: update patches * 8615507: Use ChildProcessId in ContentBrowserClient::SelectClientCertificate() Ref: https://chromium-review.googlesource.com/c/chromium/src/+/8615507 Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * 8617940: Roll hunspell_dictionaries and update dictionary versions Ref: https://chromium-review.googlesource.com/c/chromium/src/+/8617940 Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * 8581764: DynamicPatching: Decouple //content from ChildModule Ref: https://chromium-review.googlesource.com/c/chromium/src/+/8581764 Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: electron-claude[bot] <279139701+electron-claude[bot]@users.noreply.github.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
44 lines
2.2 KiB
Diff
44 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Attard <marshallofsound@electronjs.org>
|
|
Date: Thu, 9 Mar 2023 01:28:56 -0800
|
|
Subject: feat: expose DocumentLoader::SetDefersLoading on WebDocumentLoader
|
|
|
|
This allows embedders to call SetDefersLoading without reaching into Blink internals. Electron uses this to defer page loading until the preload scripts have finished executing.
|
|
This might be upstreamable?
|
|
|
|
diff --git a/third_party/blink/public/web/web_document_loader.h b/third_party/blink/public/web/web_document_loader.h
|
|
index b6da61a76551f1de95b8cfb0a1167b14040f3dd1..9413492f8e0fd6c5371c66329e1ad6d4163ba670 100644
|
|
--- a/third_party/blink/public/web/web_document_loader.h
|
|
+++ b/third_party/blink/public/web/web_document_loader.h
|
|
@@ -38,6 +38,8 @@
|
|
#include "third_party/blink/public/platform/cross_variant_mojo_util.h"
|
|
#include "third_party/blink/public/platform/web_archive_info.h"
|
|
#include "third_party/blink/public/platform/web_common.h"
|
|
+#include "third_party/blink/public/platform/web_loader_freeze_mode.h"
|
|
+#include "third_party/blink/public/platform/web_source_location.h"
|
|
#include "third_party/blink/public/web/web_navigation_type.h"
|
|
|
|
namespace blink {
|
|
@@ -62,6 +64,8 @@ class BLINK_EXPORT WebDocumentLoader {
|
|
virtual std::unique_ptr<ExtraData> Clone() = 0;
|
|
};
|
|
|
|
+ virtual void SetDefersLoading(WebLoaderFreezeMode) = 0;
|
|
+
|
|
static bool WillLoadUrlAsEmpty(const WebURL&);
|
|
|
|
// Returns the http referrer of original request which initited this load.
|
|
diff --git a/third_party/blink/renderer/core/loader/document_loader.h b/third_party/blink/renderer/core/loader/document_loader.h
|
|
index eec882554e19f51e5316d7f243ea104426254717..04a93e4d756f77f957677b66f42baf62390bc143 100644
|
|
--- a/third_party/blink/renderer/core/loader/document_loader.h
|
|
+++ b/third_party/blink/renderer/core/loader/document_loader.h
|
|
@@ -329,7 +329,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>,
|
|
std::optional<scheduler::TaskAttributionId> task_state_id,
|
|
bool should_skip_screenshot);
|
|
|
|
- void SetDefersLoading(LoaderFreezeMode);
|
|
+ void SetDefersLoading(LoaderFreezeMode) override;
|
|
|
|
DocumentLoadTiming& GetTiming() { return document_load_timing_; }
|
|
|