mirror of
https://github.com/electron/electron.git
synced 2026-01-09 15:38:08 -05:00
* chore: bump chromium in DEPS to 95.0.4630.0
* 3133701: Fix chrome root store codegen for cross-compile builds.
https://chromium-review.googlesource.com/c/chromium/src/+/3133701
* 49125: Include SHA512-256 in EVP_get_digestbyname and EVP_MD_do_all.
https://boringssl-review.googlesource.com/c/boringssl/+/49125
* chore: fixup patch indices
* 3131662: [Code Health] Remove ListValue::Append(Integer|Boolean)
https://chromium-review.googlesource.com/c/chromium/src/+/3131662
* chore: bump chromium in DEPS to 95.0.4631.0
* chore: update patches
* chore: bump chromium in DEPS to 95.0.4635.0
* chore: update patches
* chore: bump chromium in DEPS to 95.0.4636.0
* chore: bump chromium in DEPS to 95.0.4637.0
* chore: update patches
* refactor: move PlatformNotificationService into BrowserContext
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3137256
* refactor: ListValue::GetSize and ListValue::AppendString were removed
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3144540
* chore: bump chromium in DEPS to 95.0.4638.0
* chore: bump chromium in DEPS to 95.0.4638.4
* chore: bump chromium in DEPS to 96.0.4640.0
* chore: bump chromium in DEPS to 96.0.4641.0
* chore: bump chromium in DEPS to 96.0.4642.0
* chore: update patches
Co-authored-by: Michaela Laurencin <mlaurencin@electronjs.org>
* 3134756: Move extensions/browser/value_store to components/value_store.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3134756
* 3150092: [Autofill] Allow aligning Autofill suggestions to the field's center
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3150092
* chore: bump chromium in DEPS to 96.0.4643.0
* chore: update patches
* chore: bump chromium in DEPS to 96.0.4644.0
* chore: update patches
* chore: bump chromium in DEPS to 96.0.4645.0
* chore: update patches
* chore: bump chromium in DEPS to 96.0.4646.0
* chore: bump chromium in DEPS to 96.0.4647.0
* chore: update patches
Ref (for chromium): https://chromium-review.googlesource.com/c/chromium/src/+/3165772
* 3162087: Reland "Ensure Branch Target Identification is enabled for executable pages."
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3162087
* chore: update evert_add_inline_and_inline_origin_records_to_symbol_file.patch
Xref: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3166678
Xref: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3166674
* chore: update Allocator construction
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3135195
Change RefCount::kAllowed/Disallowed semantics into BackupRefPtr::kEnabled/Disabled
* chore: add UseConfigurablePool to v8::ArrayBuffer::Allocator invocation
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3090845
* chore: do not set network_context_params.context_name
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3155743
Remove name field from mojom::NetworkContext
* fix: use ForEachRenderFrameHost to iterate frames.
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3163336
New implementation partially cribbed from
https://source.chromium.org/chromium/chromium/src/+/main:extensions/browser/script_executor.cc;drc=f894f106c6d5fac8e0b75158f622256e0f34f593;l=109
* [Blink Cleanup] Remove WebLocalFrame::RequestExecuteScriptAndReturnValue()
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3149699
ExecuteJavaScript's RequestExecuteScript() new params are cribbed from
https://chromium-review.googlesource.com/c/chromium/src/+/3149699/4/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
* Remove IsDescendantOf API on RenderFrameHost.
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3165357
function is trivial to implement, so make a local copy in anon namespace
* Rewrite IsDescendantOf check to check GetParentOrOuterDocument.
https://chromium-review.googlesource.com/c/chromium/src/+/3160061
* Remove GetFramesInSubtree from RenderFrameHost
https://chromium-review.googlesource.com/c/chromium/src/+/3163336
* fix: dump_syms for macOS
* chore: update patches
* [Code Health] Remove ListValue::AppendString and ListValue::GetSize
https://chromium-review.googlesource.com/c/chromium/src/+/3144540
* fix: gn check
https://chromium-review.googlesource.com/c/chromium/src/+/3163890
* fix: crash with Isolate::GetHeapCodeAndMetadataStatistics
https://chromium-review.googlesource.com/c/v8/v8/+/3175820
* chore: update patches
* chore: fix windows build
* Add kPrintWithPostScriptType42Fonts feature.
https://chromium-review.googlesource.com/c/chromium/src/+/3150776
* chore: update patches
* chore: fix tests
* ozone/x11: fix VA-API.
https://chromium-review.googlesource.com/c/chromium/src/+/3141878
* Revert "ozone/x11: fix VA-API."
This reverts commit 23e742acb1.
* Reland "Make Ozone/X11 default."
https://chromium-review.googlesource.com/c/chromium/src/+/3114071
* fixup Reland "Make Ozone/X11 default."
* fixup Reland "Make Ozone/X11 default." for clipboard
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: Michaela Laurencin <mlaurencin@electronjs.org>
Co-authored-by: VerteDinde <keeleymhammond@gmail.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
65 lines
2.7 KiB
Diff
65 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
Date: Sat, 24 Apr 2021 18:07:09 -0700
|
|
Subject: web_contents.patch
|
|
|
|
This allows overriding the RenderViewHostDelegateView of a WebContents, which
|
|
is needed for OSR.
|
|
|
|
Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
|
|
|
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
|
index d3593a6f3e9f6cba5823169d36fd93a6f97608ae..4ee081242ecf0725b43c95dfd1032bd3e6ce8771 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -2884,6 +2884,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
|
|
frame_tree_.Init(site_instance.get(), params.renderer_initiated_creation,
|
|
params.main_frame_name);
|
|
|
|
+ if (params.view && params.delegate_view) {
|
|
+ view_.reset(params.view);
|
|
+ render_view_host_delegate_view_ = params.delegate_view;
|
|
+ }
|
|
+
|
|
+ if (!view_) {
|
|
WebContentsViewDelegate* delegate =
|
|
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
|
|
|
@@ -2894,6 +2900,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
|
|
view_.reset(CreateWebContentsView(this, delegate,
|
|
&render_view_host_delegate_view_));
|
|
}
|
|
+ } // !view_
|
|
CHECK(render_view_host_delegate_view_);
|
|
CHECK(view_.get());
|
|
|
|
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
|
|
index b55e80c0f32ee4cc0e5d168c79d7e480fbb1c6bc..95bcea15ea704f11e8daab49de6d958fb2d15127 100644
|
|
--- a/content/public/browser/web_contents.h
|
|
+++ b/content/public/browser/web_contents.h
|
|
@@ -86,10 +86,13 @@ class BrowserContext;
|
|
class BrowserPluginGuestDelegate;
|
|
class RenderFrameHost;
|
|
class RenderViewHost;
|
|
+class RenderViewHostDelegateView;
|
|
class RenderWidgetHostView;
|
|
+class RenderWidgetHostViewBase;
|
|
class ScreenOrientationDelegate;
|
|
class SiteInstance;
|
|
class WebContentsDelegate;
|
|
+class WebContentsView;
|
|
class WebUI;
|
|
struct DropData;
|
|
struct MHTMLGenerationParams;
|
|
@@ -222,6 +225,10 @@ class WebContents : public PageNavigator,
|
|
// Sandboxing flags set on the new WebContents.
|
|
network::mojom::WebSandboxFlags starting_sandbox_flags;
|
|
|
|
+ // Optionally specify the view and delegate view.
|
|
+ content::WebContentsView* view = nullptr;
|
|
+ content::RenderViewHostDelegateView* delegate_view = nullptr;
|
|
+
|
|
// Value used to set the last time the WebContents was made active, this is
|
|
// the value that'll be returned by GetLastActiveTime(). If this is left
|
|
// default initialized then the value is not passed on to the WebContents
|