mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: update patches

Browse source
This commit is contained in:
John Kleinschmidt 2021-03-15 14:32:18 -04:00
parent f933c249fe
commit 1e16606524
64 changed files with 423 additions and 465 deletions
Download patch file Download diff file Expand all files Collapse all files

12
patches/chromium/web_contents.patch
View file

@ -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 f3884caf2320fb17bed8d84f342b5f8cc3b0b4c1..0945a202580d6eba49e48d68921f2624fe481b43 100644
index 53f48964e6dfd0fb9b91762760b59a006ac7cc0c..ce9d64d9770e53e501d561af25094dd8f79bf331 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2745,6 +2745,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2764,6 +2764,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
frame_tree_.Init(site_instance.get(), params.renderer_initiated_creation,
params.main_frame_name, params.is_prerendering);
@ -25,7 +25,7 @@ index f3884caf2320fb17bed8d84f342b5f8cc3b0b4c1..0945a202580d6eba49e48d68921f2624
WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -2755,6 +2761,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2774,6 +2780,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
view_.reset(CreateWebContentsView(this, delegate,
&render_view_host_delegate_view_));
}
@ -34,10 +34,10 @@ index f3884caf2320fb17bed8d84f342b5f8cc3b0b4c1..0945a202580d6eba49e48d68921f2624
CHECK(view_.get());
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index f7c4564d7ab04ade8e85b4e4ebbf73cfe40bee66..dbbe18b2375112759d65bee0c53da0b58bad609c 100644
index 7c81ae0070db8d4ed8712efc56a6af7d3f6261cf..b46afaac2bfbf349e759522498a1cfd6f53091c5 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -87,8 +87,11 @@ class BrowserContext;
@@ -88,8 +88,11 @@ class BrowserContext;
class BrowserPluginGuestDelegate;
class RenderFrameHost;
class RenderViewHost;
@ -49,7 +49,7 @@ index f7c4564d7ab04ade8e85b4e4ebbf73cfe40bee66..dbbe18b2375112759d65bee0c53da0b5
class WebUI;
struct DropData;
struct MHTMLGenerationParams;
@@ -228,6 +231,10 @@ class WebContents : public PageNavigator,
@@ -229,6 +232,10 @@ class WebContents : public PageNavigator,
// Sandboxing flags set on the new WebContents.
network::mojom::WebSandboxFlags starting_sandbox_flags;