chore: bump chromium to 121.0.6104.0 (main) (#40418)
* chore: bump chromium in DEPS to 121.0.6101.0 * chore: update patches * Explictly use python3 to check patch diff * chore: bump chromium in DEPS to 121.0.6102.0 * chore: update patches * 4995136: [extensions] Enable Extension Mojo messaging4995136
* Bind the components interfaces to a RenderFrame4985961
Also: 3986427: Create RendererHost mojom interface for Extensions |3986427
* 4997024: Enum modernisation for resources_private.idl4997024
* 4997025: Enum modernisation for scripting.idl4997025
* chore: bump chromium in DEPS to 121.0.6103.0 * chore: update patches * chore: bump chromium in DEPS to 121.0.6104.0 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
This commit is contained in:
parent
5b18d90597
commit
ee108903a0
50 changed files with 203 additions and 181 deletions
|
@ -9,10 +9,10 @@ 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 93a0fba3b73c9569a148472d5acec7e2cdc4eaa6..52eb186a4b40f964c7633cdced8514089ec7b2a5 100644
|
||||
index 53726845fee76871cd5ddda8baa039d2dfeb89c7..96d503ae1cd7af461833cf643aef36b4455397a6 100644
|
||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||
@@ -3448,6 +3448,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
@@ -3457,6 +3457,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
params.main_frame_name, GetOpener(), primary_main_frame_policy,
|
||||
base::UnguessableToken::Create());
|
||||
|
||||
|
@ -26,7 +26,7 @@ index 93a0fba3b73c9569a148472d5acec7e2cdc4eaa6..52eb186a4b40f964c7633cdced851408
|
|||
std::unique_ptr<WebContentsViewDelegate> delegate =
|
||||
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
||||
|
||||
@@ -3458,6 +3465,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
@@ -3467,6 +3474,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
view_ = CreateWebContentsView(this, std::move(delegate),
|
||||
&render_view_host_delegate_view_);
|
||||
}
|
||||
|
@ -35,7 +35,7 @@ index 93a0fba3b73c9569a148472d5acec7e2cdc4eaa6..52eb186a4b40f964c7633cdced851408
|
|||
CHECK(view_.get());
|
||||
|
||||
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
|
||||
index 3707858d0af5909fce48fc5e2270fdcb660492cb..2e213048464416e23e5d57258e7cf901ddab5415 100644
|
||||
index eb5486a4e8c64163afc363d3cb3e4cd81fa43afe..87c7d68b08e0db9d6209f56163405caa7dceccac 100644
|
||||
--- a/content/public/browser/web_contents.h
|
||||
+++ b/content/public/browser/web_contents.h
|
||||
@@ -98,10 +98,13 @@ class BrowserContext;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue