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

[AUTO] Patches auto-rebase

Browse Source
This commit is contained in:
uazo
2025-02-13 16:53:18 +00:00
committed by github-actions[bot]
parent 49a2ea400a
commit 71b942ec35
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/Add-menu-item-to-bookmark-all-tabs.patch
+5 -5
View File
@@ -225,7 +225,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
--- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
+++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
@@ -184,7 +184,7 @@ class FileBookmarksExportObserver: public BookmarksExportObserver {
@@ -185,7 +185,7 @@ class FileBookmarksExportObserver: public BookmarksExportObserver {
JNIEnv* env = AttachCurrentThread();
Java_BookmarkBridge_bookmarksExported(env, obj_, window_->GetJavaObject(),
@@ -234,7 +234,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
result == Result::kSuccess);
delete this;
}
@@ -356,6 +356,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) {
@@ -363,6 +363,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) {
return bookmark_model_->account_mobile_node() != nullptr;
}
@@ -268,7 +268,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
base::android::ScopedJavaLocalRef<jobject>
BookmarkBridge::GetMostRecentlyAddedUserBookmarkIdForUrl(JNIEnv* env,
const GURL& url) {
@@ -468,6 +495,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
@@ -475,6 +502,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
// Vector to temporarily contain all child bookmarks at same level for sorting
std::vector<const BookmarkNode*> bookmarks = {
bookmark_model_->mobile_node(),
@@ -276,7 +276,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
bookmark_model_->bookmark_bar_node(),
bookmark_model_->other_node(),
};
@@ -561,6 +589,9 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(
@@ -568,6 +596,9 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(
top_level_folders.push_back(other_node);
}
@@ -286,7 +286,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
const BookmarkNode* reading_list_node =
local_or_syncable_reading_list_manager_->GetRoot();
if (IsPermanentFolderVisible(ignore_visibility, reading_list_node)) {
@@ -1262,6 +1293,17 @@ void BookmarkBridge::GetBookmarksOfType(
@@ -1269,6 +1300,17 @@ void BookmarkBridge::GetBookmarksOfType(
AddBookmarkNodesToBookmarkIdList(env, j_list, results);
}
build/patches/Add-support-to-jxl.patch
+1 -1
View File
@@ -2215,7 +2215,7 @@ diff --git a/third_party/blink/tools/commit_stats/git-dirs.txt b/third_party/bli
diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
--- a/third_party/blink/web_tests/TestExpectations
+++ b/third_party/blink/web_tests/TestExpectations
@@ -5446,6 +5446,12 @@ crbug.com/1199522 http/tests/devtools/layers/layers-3d-view-hit-testing.js [ Fai
@@ -5454,6 +5454,12 @@ crbug.com/1199522 http/tests/devtools/layers/layers-3d-view-hit-testing.js [ Fai
# Started failing after rolling new version of check-layout-th.js
css3/flexbox/perpendicular-writing-modes-inside-flex-item.html [ Failure ]
build/patches/Allow-building-without-enable_reporting.patch
+1 -1
View File
@@ -125,7 +125,7 @@ diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browse
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
@@ -15257,12 +15257,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
@@ -15258,12 +15258,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
}
}
}
build/patches/Disable-conversion-measurement-api.patch
+2 -2
View File
@@ -367,7 +367,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/
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
@@ -9887,6 +9887,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed(
@@ -9888,6 +9888,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed(
return false;
}
@@ -375,7 +375,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
if (!IsActive()) {
// reportEvent is not allowed when this RenderFrameHost or one of its
// ancestors is not active.
@@ -13640,6 +13641,16 @@ void RenderFrameHostImpl::BindTrustTokenQueryAnswerer(
@@ -13641,6 +13642,16 @@ void RenderFrameHostImpl::BindTrustTokenQueryAnswerer(
return;
}
build/patches/Disable-crash-reporting.patch
+1 -1
View File
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
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
@@ -15205,6 +15205,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed(
@@ -15206,6 +15206,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed(
void RenderFrameHostImpl::MaybeGenerateCrashReport(
base::TerminationStatus status,
int exit_code) {
build/patches/Remove-binary-blob-integrations.patch
+1 -1
View File
@@ -4691,7 +4691,7 @@ diff --git a/third_party/androidx/customizations.gni b/third_party/androidx/cust
_androidx_prebuilt(target_name) {
forward_variables_from(invoker, "*")
target_type = "android_aar_prebuilt"
@@ -145,6 +145,17 @@ template("androidx_android_aar_prebuilt") {
@@ -152,6 +152,17 @@ template("androidx_android_aar_prebuilt") {
}
}
build/patches/add-browser-policy.patch
+1 -1
View File
@@ -42,7 +42,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/base/win/win_util.cc b/base/win/win_util.cc
--- a/base/win/win_util.cc
+++ b/base/win/win_util.cc
@@ -149,80 +149,18 @@ bool EnablePerMonitorV2() {
@@ -147,80 +147,18 @@ bool EnablePerMonitorV2() {
}
bool* GetDomainEnrollmentStateStorage() {
build/patches/ungoogled-chromium-no-special-hosts-domains.patch
+2 -2
View File
@@ -348,7 +348,7 @@ diff --git a/chrome/browser/feedback/BUILD.gn b/chrome/browser/feedback/BUILD.gn
diff --git a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
--- a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
+++ b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
@@ -121,7 +121,6 @@ constexpr char kOsVersionTag[] = "OS VERSION";
@@ -122,7 +122,6 @@ constexpr char kOsVersionTag[] = "OS VERSION";
#if BUILDFLAG(IS_WIN)
constexpr char kUsbKeyboardDetected[] = "usb_keyboard_detected";
constexpr char kIsEnrolledToDomain[] = "enrolled_to_domain";
@@ -356,7 +356,7 @@ diff --git a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
constexpr char kUpdateErrorCode[] = "update_error_code";
constexpr char kUpdateHresult[] = "update_hresult";
@@ -647,10 +646,6 @@ void ChromeInternalLogSource::PopulateEnrolledToDomain(
@@ -636,10 +635,6 @@ void ChromeInternalLogSource::PopulateEnrolledToDomain(
void ChromeInternalLogSource::PopulateInstallerBrandCode(
SystemLogsResponse* response) {
build/patches/webview-Hard-no-to-persistent-histograms.patch
+1 -1
View File
@@ -18,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/android_webview/browser/aw_field_trials.cc b/android_webview/browser/aw_field_trials.cc
--- a/android_webview/browser/aw_field_trials.cc
+++ b/android_webview/browser/aw_field_trials.cc
@@ -72,13 +72,6 @@ void AwFeatureOverrides::OverrideFeatureWithFieldTrial(
@@ -78,13 +78,6 @@ void AwFeatureOverrides::OverrideFeatureWithFieldTrial(
} // namespace internal
void AwFieldTrials::OnVariationsSetupComplete() {