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

fix extra-semi warning in frame_host_manager.patch

Browse source
This commit is contained in:
Jeremy Apthorp 2019-02-26 17:43:34 -08:00 committed by Samuel Attard
parent 7245546274
commit 0bae707995
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
patches/common/chromium/cross_site_document_resource_handler.patch
View file

@ -37,12 +37,12 @@ index fb1f74b71c9e51c5d8c12adfff586bb57a7b6407..07afb123e6d2bdad4d1e15fdc7fe24bf
const MainFunctionParams& parameters) { const MainFunctionParams& parameters) {
return nullptr; return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 08089579500c860880b9c1bd32816095ca05ed27..e2ab0b2c7819bb437b50d25909ef915373b21de7 100644 index a4f8b7ee7563e2390ef34ebce94b7c0a7967ad4d..8f4ee8f612311b8ff4c07ba1fbef8e3258fc9fb8 100644
--- a/content/public/browser/content_browser_client.h --- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h
@@ -241,6 +241,9 @@ class CONTENT_EXPORT ContentBrowserClient { @@ -241,6 +241,9 @@ class CONTENT_EXPORT ContentBrowserClient {
content::RenderFrameHost* rfh, content::RenderFrameHost* rfh,
content::SiteInstance* pending_site_instance){}; content::SiteInstance* pending_site_instance) {}
+ // Electron: Allows bypassing CORB checks for a renderer process. + // Electron: Allows bypassing CORB checks for a renderer process.
+ virtual bool ShouldBypassCORB(int render_process_id) const; + virtual bool ShouldBypassCORB(int render_process_id) const;

4
patches/common/chromium/frame_host_manager.patch
View file

@ -129,7 +129,7 @@ index 09a2a50fdbd76d24d547bf5e22f9a0a93bd9a126..fb1f74b71c9e51c5d8c12adfff586bb5
const MainFunctionParams& parameters) { const MainFunctionParams& parameters) {
return nullptr; return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index a70f357b97da1a24b02e9a7b29504c63b2c780fb..08089579500c860880b9c1bd32816095ca05ed27 100644 index a70f357b97da1a24b02e9a7b29504c63b2c780fb..a4f8b7ee7563e2390ef34ebce94b7c0a7967ad4d 100644
--- a/content/public/browser/content_browser_client.h --- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h
@@ -210,8 +210,37 @@ CONTENT_EXPORT void OverrideOnBindInterface( @@ -210,8 +210,37 @@ CONTENT_EXPORT void OverrideOnBindInterface(
@ -165,7 +165,7 @@ index a70f357b97da1a24b02e9a7b29504c63b2c780fb..08089579500c860880b9c1bd32816095
+ // Electron: Registers a pending site instance during a navigation. + // Electron: Registers a pending site instance during a navigation.
+ virtual void RegisterPendingSiteInstance( + virtual void RegisterPendingSiteInstance(
+ content::RenderFrameHost* rfh, + content::RenderFrameHost* rfh,
+ content::SiteInstance* pending_site_instance){}; + content::SiteInstance* pending_site_instance) {}
+ +
// Allows the embedder to set any number of custom BrowserMainParts // Allows the embedder to set any number of custom BrowserMainParts
// implementations for the browser startup code. See comments in // implementations for the browser startup code. See comments in