chore: bump chromium to 117.0.5897.0 (main) (#39147)
* chore: bump chromium in DEPS to 117.0.5896.0 * chore: update patches * 4622260: [Service Workers] Allow fetches from workers to use auto-picked certs4622260
* chore: bump chromium in DEPS to 117.0.5897.0 * 4665672: [ProfileSelections] Transition extension keyed factories to use Profile Selections4665672
* chore: fixup patch indices --------- 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
3e7c904f02
commit
e02cf8674d
41 changed files with 139 additions and 124 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 a96bc70457ab3bb7339361ab82e5643382fd364f..bdeae59df3ff1ece1505086410c6ff1ea6c83386 100644
|
||||
index f30fed3d18b215f0f0315bfe723791611aeb12fb..1d80b423f5a3d5bdabb1195532fa78a6e5b2f1f7 100644
|
||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||
@@ -3269,6 +3269,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
@@ -3274,6 +3274,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 a96bc70457ab3bb7339361ab82e5643382fd364f..bdeae59df3ff1ece1505086410c6ff1e
|
|||
std::unique_ptr<WebContentsViewDelegate> delegate =
|
||||
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
||||
|
||||
@@ -3279,6 +3286,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
@@ -3284,6 +3291,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
view_ = CreateWebContentsView(this, std::move(delegate),
|
||||
&render_view_host_delegate_view_);
|
||||
}
|
||||
|
@ -35,10 +35,10 @@ index a96bc70457ab3bb7339361ab82e5643382fd364f..bdeae59df3ff1ece1505086410c6ff1e
|
|||
CHECK(view_.get());
|
||||
|
||||
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
|
||||
index 71466f62c10d1000dfcc6c4e1fc256ded1e7f897..2267a97ba8e2f2c8cbc8a5cdb3584b5be25b9c18 100644
|
||||
index 31a816804ebb81089c8fee6e3a00420b786e0632..42cb935abb67d9c4ede682bbb3c87277d95ad93b 100644
|
||||
--- a/content/public/browser/web_contents.h
|
||||
+++ b/content/public/browser/web_contents.h
|
||||
@@ -97,10 +97,13 @@ class BrowserContext;
|
||||
@@ -98,10 +98,13 @@ class BrowserContext;
|
||||
class BrowserPluginGuestDelegate;
|
||||
class RenderFrameHost;
|
||||
class RenderViewHost;
|
||||
|
@ -52,7 +52,7 @@ index 71466f62c10d1000dfcc6c4e1fc256ded1e7f897..2267a97ba8e2f2c8cbc8a5cdb3584b5b
|
|||
class WebUI;
|
||||
struct DropData;
|
||||
struct MHTMLGenerationParams;
|
||||
@@ -243,6 +246,10 @@ class WebContents : public PageNavigator,
|
||||
@@ -244,6 +247,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