mirror of
https://github.com/electron/electron.git
synced 2026-01-08 23:18:06 -05:00
0e4e9dc98c
* chore: bump chromium in DEPS to 121.0.6116.0
* chore: update patches
* Update webIDL to support close event.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/4970653
* Remove uses of implicit conversion of ScopedTypeRef
Refs https://bugs.chromium.org/p/chromium/issues/detail?id=1495439
* Add GlobalRenderFrameHostToken
Refs https://chromium-review.googlesource.com/c/chromium/src/+/5001743
* [DevTools] Console Insights: move from build flag to Feature API
Refs https://chromium-review.googlesource.com/c/chromium/src/+/5002232
* [Extensions] Use script serialization in scripting API
Refs https://chromium-review.googlesource.com/c/chromium/src/+/4968680
Refs https://chromium-review.googlesource.com/c/chromium/src/+/4998265
* [api] Remove AllCan Read/Write
https://chromium-review.googlesource.com/c/v8/v8/+/5006387
* chore: update libcxx files
* chore: address nan compilation error
* spec: use nan dependency from third_party
It is easier to get fixes for spec modules depending on nan
* ci: publish nan artifact for woa
* fix: bad patch update
* chore: update nan resolution
* Revert "chore: update nan resolution"
This reverts commit 786cdb858c.
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
43 lines
2.2 KiB
Diff
43 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 0960ab9c8361222cd4acf554e04dc3fc124d714e..524c7cf9032a249a30cc726019266ecddacac070 100644
|
|
--- a/third_party/blink/public/web/web_document_loader.h
|
|
+++ b/third_party/blink/public/web/web_document_loader.h
|
|
@@ -38,6 +38,7 @@
|
|
#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"
|
|
|
|
@@ -62,6 +63,8 @@ class BLINK_EXPORT WebDocumentLoader {
|
|
virtual ~ExtraData() = default;
|
|
};
|
|
|
|
+ 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 509bda9f831cfd42cc9d540d00043368da8c0da9..b264898e6b8b13a3aac6b91e48a25f50d35f0ad1 100644
|
|
--- a/third_party/blink/renderer/core/loader/document_loader.h
|
|
+++ b/third_party/blink/renderer/core/loader/document_loader.h
|
|
@@ -308,7 +308,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>,
|
|
absl::optional<scheduler::TaskAttributionId>
|
|
soft_navigation_heuristics_task_id);
|
|
|
|
- void SetDefersLoading(LoaderFreezeMode);
|
|
+ void SetDefersLoading(LoaderFreezeMode) override;
|
|
|
|
DocumentLoadTiming& GetTiming() { return document_load_timing_; }
|
|
|