mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
b847299f19
* chore: bump chromium in DEPS to 146.0.7650.0 * 7496671: WaaP: Control hung delay for Initial WebUI Refs https://chromium-review.googlesource.com/c/chromium/src/+/7496671 * 7494302: [//media] Rename renderable_gpu_memory_buffer_video_frame_pool* Refs https://chromium-review.googlesource.com/c/chromium/src/+/7494302 * chore: update patches * 7502996: [DevTools] Add ability to toggle Chromium feature flags from DevTools Refs https://chromium-review.googlesource.com/c/chromium/src/+/7502996 * 7456200: Vectorize StringImpl::CopyChars and EqualIgnoringASCIICase using Highway. Refs https://chromium-review.googlesource.com/c/chromium/src/+/7456200 * 7236627: spellcheck: supply full spelling marker info, incld. marker type Refs https://chromium-review.googlesource.com/c/chromium/src/+/7236627 * chore: rm dependency on wtf::string from blink public headers Refs https://chromium-review.googlesource.com/c/chromium/src/+/7456200 added a public dependency on //third_party/highway for //third_party/blink/renderer/platform/wtf:wtf which will not be inherited by //content/renderer since wtf is internal dependency of blink leading to the following compilation error ``` In file included from ../../content/public/renderer/window_features_converter.cc:5: In file included from ../../content/public/renderer/window_features_converter.h:10: In file included from ../../third_party/blink/public/web/web_window_features.h:38: In file included from ../../third_party/blink/renderer/platform/wtf/text/wtf_string.h:40: ../../third_party/blink/renderer/platform/wtf/text/string_impl.h:27:10: fatal error: 'hwy/highway.h' file not found 27 | #include <hwy/highway.h> | ^~~~~~~~~~~~~~~ 1 error generated. ``` Use `gn desc out/Testing content/renderer:renderer_sources --blame` to verify the inherited config and dependency list. * 7493995: Restore directive part of wasm-eval error message Refs https://chromium-review.googlesource.com/c/chromium/src/+/7493995 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
38 lines
1.7 KiB
Diff
38 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
Date: Mon, 3 Jun 2019 14:20:05 -0700
|
|
Subject: frame_host_manager.patch
|
|
|
|
Allows embedder to intercept site instances created by chromium.
|
|
|
|
diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
|
|
index 581d86c4ec4f437d7195c003d8776795f59cf696..632d2645d4ed3a8e83070f08320b2252ad3c6e18 100644
|
|
--- a/content/browser/renderer_host/render_frame_host_manager.cc
|
|
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
|
|
@@ -4851,6 +4851,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
|
request->ResetStateForSiteInstanceChange();
|
|
}
|
|
|
|
+ GetContentClient()->browser()->RegisterPendingSiteInstance(
|
|
+ render_frame_host_.get(), dest_site_instance.get());
|
|
+
|
|
return dest_site_instance;
|
|
}
|
|
|
|
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
|
|
index ef0171853547a4172f2bd933abb043963923390b..862552caa208fe1b5fa8453c71aaad4aad8842f0 100644
|
|
--- a/content/public/browser/content_browser_client.h
|
|
+++ b/content/public/browser/content_browser_client.h
|
|
@@ -350,6 +350,11 @@ class CONTENT_EXPORT ContentBrowserClient {
|
|
|
|
virtual ~ContentBrowserClient() = default;
|
|
|
|
+ // Electron: Registers a pending site instance during a navigation.
|
|
+ virtual void RegisterPendingSiteInstance(
|
|
+ content::RenderFrameHost* rfh,
|
|
+ content::SiteInstance* pending_site_instance) {}
|
|
+
|
|
// Allows the embedder to set any number of custom BrowserMainParts
|
|
// implementations for the browser startup code. See comments in
|
|
// browser_main_parts.h.
|