PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[AUTO] Patches auto-rebase

Browse Source
This commit is contained in:
uazo
2024-07-30 07:32:20 +00:00
committed by github-actions[bot]
parent f6b99fb27f
commit 99bb646781
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/Disable-GetInstalledRelatedApps-API.patch
+7 -8
View File
@@ -4,12 +4,12 @@ Subject: Disable GetInstalledRelatedApps API
License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
.../components/installedapp/InstalledAppProviderImpl.java | 1 +
.../browser/installedapp/installed_app_provider_impl.cc | 2 +-
.../features_cc/Disable-GetInstalledRelatedApps-API.inc | 8 ++++++++
.../Disable-GetInstalledRelatedApps-API.inc | 2 ++
.../renderer/platform/runtime_enabled_features.json5 | 2 +-
5 files changed, 13 insertions(+), 2 deletions(-)
.../components/installedapp/InstalledAppProviderImpl.java | 1 +
.../browser/installedapp/installed_app_provider_impl.cc | 2 +-
.../features_cc/Disable-GetInstalledRelatedApps-API.inc | 7 +++++++
.../Disable-GetInstalledRelatedApps-API.inc | 2 ++
.../blink/renderer/platform/runtime_enabled_features.json5 | 2 +-
5 files changed, 12 insertions(+), 2 deletions(-)
create mode 100644 cromite_flags/content/common/features_cc/Disable-GetInstalledRelatedApps-API.inc
create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-GetInstalledRelatedApps-API.inc
@@ -40,7 +40,7 @@ diff --git a/cromite_flags/content/common/features_cc/Disable-GetInstalledRelate
new file mode 100644
--- /dev/null
+++ b/cromite_flags/content/common/features_cc/Disable-GetInstalledRelatedApps-API.inc
@@ -0,0 +1,8 @@
@@ -0,0 +1,7 @@
+SET_CROMITE_FEATURE_DISABLED(kFilterInstalledAppsWebAppMatching);
+
+#if BUILDFLAG(IS_WIN)
@@ -48,7 +48,6 @@ new file mode 100644
+SET_CROMITE_FEATURE_DISABLED(kFilterInstalledAppsWinMatching);
+
+#endif
+
diff --git a/cromite_flags/content/public/common/content_features_cc/Disable-GetInstalledRelatedApps-API.inc b/cromite_flags/content/public/common/content_features_cc/Disable-GetInstalledRelatedApps-API.inc
new file mode 100644
--- /dev/null
build/patches/Downstream-validate-opaque-origins-checking-their-precursor.patch
+7 -7
View File
@@ -85,7 +85,7 @@ diff --git a/content/browser/renderer_host/ipc_utils.cc b/content/browser/render
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -2529,7 +2529,7 @@ void RenderFrameHostImpl::GetOpenGraphMetadata(
@@ -2525,7 +2525,7 @@ void RenderFrameHostImpl::GetOpenGraphMetadata(
}
}
@@ -94,7 +94,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
// This shouldn't be called before committing the document as this value is
// set during call to RenderFrameHostImpl::DidNavigate which happens after
// commit.
@@ -4606,6 +4606,16 @@ void RenderFrameHostImpl::SetOriginDependentStateOfNewFrame(
@@ -4596,6 +4596,16 @@ void RenderFrameHostImpl::SetOriginDependentStateOfNewFrame(
// object could be configured incorrectly if it were initialized before
// knowing the value of |last_committed_origin_|. More at crbug.com/1112959.
ResetPermissionsPolicy({});
@@ -111,7 +111,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
}
FrameTreeNode* RenderFrameHostImpl::AddChild(
@@ -10123,6 +10133,10 @@ void RenderFrameHostImpl::ResetWaitingState() {
@@ -10113,6 +10123,10 @@ void RenderFrameHostImpl::ResetWaitingState() {
page_close_state_ = PageCloseState::kNotClosing;
}
@@ -122,7 +122,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
CanCommitStatus RenderFrameHostImpl::CanCommitOriginAndUrl(
const url::Origin& origin,
const GURL& url,
@@ -10154,24 +10168,23 @@ CanCommitStatus RenderFrameHostImpl::CanCommitOriginAndUrl(
@@ -10144,24 +10158,23 @@ CanCommitStatus RenderFrameHostImpl::CanCommitOriginAndUrl(
// which the frame was at the time of generating the MHTML
// (e.g. "http://localhost"). In such cases, don't verify the URL, but require
// the URL to commit in the process of the main frame.
@@ -165,7 +165,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h
--- a/content/browser/renderer_host/render_frame_host_impl.h
+++ b/content/browser/renderer_host/render_frame_host_impl.h
@@ -564,7 +564,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
@@ -556,7 +556,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
void GetOpenGraphMetadata(
base::OnceCallback<void(blink::mojom::OpenGraphMetadataPtr)> callback)
override;
@@ -174,7 +174,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/br
DocumentRef GetDocumentRef() override;
WeakDocumentPtr GetWeakDocumentPtr() override;
void EnableMojoJsBindings(
@@ -1725,7 +1725,10 @@ class CONTENT_EXPORT RenderFrameHostImpl
@@ -1717,7 +1717,10 @@ class CONTENT_EXPORT RenderFrameHostImpl
network::mojom::WebSandboxFlags active_sandbox_flags() {
return policy_container_host_->sandbox_flags();
}
@@ -189,7 +189,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/br
diff --git a/content/public/browser/render_frame_host.h b/content/public/browser/render_frame_host.h
--- a/content/public/browser/render_frame_host.h
+++ b/content/public/browser/render_frame_host.h
@@ -1068,7 +1068,7 @@ class CONTENT_EXPORT RenderFrameHost : public IPC::Listener,
@@ -1061,7 +1061,7 @@ class CONTENT_EXPORT RenderFrameHost : public IPC::Listener,
// site can’t be reached".
// This can't be called for pending commit RFH because the value is set
// during call to RenderFrameHostImpl::DidNavigate which happens after commit.
build/patches/Temp-try-to-fix-DIPS-service.patch
+1 -1
View File
@@ -21,7 +21,7 @@ diff --git a/chrome/browser/dips/dips_service.cc b/chrome/browser/dips/dips_serv
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -515,7 +515,9 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
@@ -493,7 +493,9 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
PrefsTabHelper::CreateForWebContents(web_contents);
prerender::NoStatePrefetchTabHelper::CreateForWebContents(web_contents);
RecentlyAudibleHelper::CreateForWebContents(web_contents);