chore: bump chromium to 124.0.6353.0 (main) (#41566)
* chore: bump chromium in DEPS to 124.0.6353.0 * chore: update patches * 5365462: Add missing perfetto::Flow and TRACE_EVENT includes5365462
* 5356336: Ensure destruction of mojo channel when destructing KeySystemsImpl5356336
* 5332839: [Extensions] Register NativeHandlers with the RendererAPIProvider5332839
* 5148827: Add permission types for keyboard lock and pointer lock [1/N]5148827
* 5358818: Revert "[object] Fast path for adding props with existing transition"5358818
--------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
parent
80f34ecd2c
commit
26752d3a06
37 changed files with 195 additions and 203 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 4ff3ebc93cc68cc9988d6c31b349dfd24c332ebe..311822c3d9f7b1a60e9feacf95dcd795090ec8a9 100644
|
||||
index 11ed98cbe928b4c1efe1b34feec1a79cbe06a00a..9ec976ec797838e4a4e3e30524f82948c884dc96 100644
|
||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||
@@ -3497,6 +3497,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
@@ -3516,6 +3516,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 4ff3ebc93cc68cc9988d6c31b349dfd24c332ebe..311822c3d9f7b1a60e9feacf95dcd795
|
|||
std::unique_ptr<WebContentsViewDelegate> delegate =
|
||||
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
||||
|
||||
@@ -3507,6 +3514,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
@@ -3526,6 +3533,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
view_ = CreateWebContentsView(this, std::move(delegate),
|
||||
&render_view_host_delegate_view_);
|
||||
}
|
||||
|
@ -35,10 +35,10 @@ index 4ff3ebc93cc68cc9988d6c31b349dfd24c332ebe..311822c3d9f7b1a60e9feacf95dcd795
|
|||
CHECK(view_.get());
|
||||
|
||||
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
|
||||
index 2c0e05853d1b9b8b28c502edaf76f15e96aea415..e7f24decd89855b1bd338f13810760d680071ddb 100644
|
||||
index 11504e08e61ecc1fe2747b60818b3e3f520655f7..30362796b3f3a9c3a955fe6f38af63bdb3a4ff80 100644
|
||||
--- a/content/public/browser/web_contents.h
|
||||
+++ b/content/public/browser/web_contents.h
|
||||
@@ -102,10 +102,13 @@ class BrowserContext;
|
||||
@@ -103,10 +103,13 @@ class BrowserContext;
|
||||
class BrowserPluginGuestDelegate;
|
||||
class RenderFrameHost;
|
||||
class RenderViewHost;
|
||||
|
@ -52,7 +52,7 @@ index 2c0e05853d1b9b8b28c502edaf76f15e96aea415..e7f24decd89855b1bd338f13810760d6
|
|||
class WebUI;
|
||||
struct DropData;
|
||||
struct MHTMLGenerationParams;
|
||||
@@ -252,6 +255,10 @@ class WebContents : public PageNavigator,
|
||||
@@ -253,6 +256,10 @@ class WebContents : public PageNavigator,
|
||||
network::mojom::WebSandboxFlags starting_sandbox_flags =
|
||||
network::mojom::WebSandboxFlags::kNone;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue