Skip to content

Commit 625c295

Browse files
committed
[REBASE] Patches for 131.0.6778.140
1 parent b6ece29 commit 625c295

7 files changed

+13
-13
lines changed

build/patches/Add-an-always-incognito-mode.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
478478
import org.chromium.chrome.browser.DefaultBrowserInfo;
479479
import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;
480480
import org.chromium.chrome.browser.app.appmenu.DividerLineMenuItemViewBinder;
481-
@@ -211,6 +212,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
481+
@@ -213,6 +214,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
482482
openInChromeItemVisible = false;
483483
tryAddingReadAloud = false;
484484
}

build/patches/Add-menu-item-to-view-source.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
104104
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
105105
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
106106
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
107-
@@ -285,6 +285,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
107+
@@ -293,6 +293,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
108108

109109
updateRequestDesktopSiteMenuItem(
110110
menu, currentTab, requestDesktopSiteVisible, isNativePage);

build/patches/Add-support-to-jxl.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ diff --git a/third_party/blink/renderer/modules/webcodecs/image_decoder_fuzzer.c
605605
diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
606606
--- a/third_party/blink/renderer/platform/BUILD.gn
607607
+++ b/third_party/blink/renderer/platform/BUILD.gn
608-
@@ -2380,6 +2380,10 @@ source_set("blink_platform_unittests_sources") {
608+
@@ -2383,6 +2383,10 @@ source_set("blink_platform_unittests_sources") {
609609
sources += [ "text/locale_icu_test.cc" ]
610610
}
611611

@@ -616,7 +616,7 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
616616
sources += [ "testing/run_all_tests.cc" ]
617617

618618
configs += [
619-
@@ -2426,6 +2430,7 @@ source_set("blink_platform_unittests_sources") {
619+
@@ -2429,6 +2433,7 @@ source_set("blink_platform_unittests_sources") {
620620
"//third_party/blink/renderer/platform/wtf",
621621
"//third_party/dawn/src/dawn/native",
622622
"//third_party/dawn/src/dawn/wire",

build/patches/Disable-conversion-measurement-api.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
914914
},
915915
{
916916
// This only exists so we can use RuntimeEnabled in the IDL file
917-
@@ -4268,15 +4268,15 @@
917+
@@ -4273,15 +4273,15 @@
918918
},
919919
{
920920
name: "TopicsAPI",

build/patches/Fonts-fingerprinting-mitigation.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ diff --git a/third_party/blink/public/common/features.h b/third_party/blink/publ
128128
diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
129129
--- a/third_party/blink/renderer/platform/BUILD.gn
130130
+++ b/third_party/blink/renderer/platform/BUILD.gn
131-
@@ -792,6 +792,7 @@ component("platform") {
131+
@@ -794,6 +794,7 @@ component("platform") {
132132
"fonts/simple_font_data.cc",
133133
"fonts/simple_font_data.h",
134134
"fonts/skia/font_cache_skia.cc",

build/patches/Multiple-fingerprinting-mitigations.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c
519519
diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
520520
--- a/third_party/blink/renderer/platform/BUILD.gn
521521
+++ b/third_party/blink/renderer/platform/BUILD.gn
522-
@@ -1709,7 +1709,9 @@ component("platform") {
522+
@@ -1711,7 +1711,9 @@ component("platform") {
523523
"//third_party/blink/renderer:non_test_config",
524524
]
525525

@@ -530,7 +530,7 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
530530

531531
allow_circular_includes_from = [
532532
"//third_party/blink/renderer/platform/blob",
533-
@@ -1791,6 +1793,7 @@ component("platform") {
533+
@@ -1793,6 +1795,7 @@ component("platform") {
534534
"//third_party/blink/public/strings",
535535
"//third_party/blink/renderer/platform/wtf",
536536
"//third_party/ced",

build/patches/ungoogled-chromium-no-special-hosts-domains.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -93,25 +93,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
9393
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
9494
--- a/chrome/browser/BUILD.gn
9595
+++ b/chrome/browser/BUILD.gn
96-
@@ -890,8 +890,6 @@ static_library("browser") {
96+
@@ -890,10 +890,6 @@ static_library("browser") {
9797
"page_info/page_info_features.h",
9898
"page_load_metrics/observers/bookmark_bar_page_load_metrics_observer.cc",
9999
"page_load_metrics/observers/bookmark_bar_page_load_metrics_observer.h",
100100
- "page_load_metrics/observers/chrome_gws_abandoned_page_load_metrics_observer.cc",
101101
- "page_load_metrics/observers/chrome_gws_abandoned_page_load_metrics_observer.h",
102+
- "page_load_metrics/observers/chrome_gws_page_load_metrics_observer.cc",
103+
- "page_load_metrics/observers/chrome_gws_page_load_metrics_observer.h",
102104
"page_load_metrics/observers/core/amp_page_load_metrics_observer.cc",
103105
"page_load_metrics/observers/core/amp_page_load_metrics_observer.h",
104106
"page_load_metrics/observers/core/ukm_page_load_metrics_observer.cc",
105-
@@ -900,12 +898,6 @@ static_library("browser") {
107+
@@ -902,10 +898,6 @@ static_library("browser") {
106108
"page_load_metrics/observers/document_write_page_load_metrics_observer.h",
107109
"page_load_metrics/observers/foreground_duration_ukm_observer.cc",
108110
"page_load_metrics/observers/foreground_duration_ukm_observer.h",
109111
- "page_load_metrics/observers/from_gws_page_load_metrics_observer.cc",
110112
- "page_load_metrics/observers/from_gws_page_load_metrics_observer.h",
111113
- "page_load_metrics/observers/gws_hp_page_load_metrics_observer.cc",
112114
- "page_load_metrics/observers/gws_hp_page_load_metrics_observer.h",
113-
- "page_load_metrics/observers/gws_page_load_metrics_observer.cc",
114-
- "page_load_metrics/observers/gws_page_load_metrics_observer.h",
115115
"page_load_metrics/observers/histogram_suffixes.cc",
116116
"page_load_metrics/observers/histogram_suffixes.h",
117117
"page_load_metrics/observers/https_engagement_metrics/https_engagement_page_load_metrics_observer.cc",
@@ -643,7 +643,7 @@ diff --git a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc b/
643643
tracker->AddObserver(std::make_unique<JavascriptFrameworksUkmObserver>());
644644
tracker->AddObserver(std::make_unique<SchemePageLoadMetricsObserver>());
645645
- tracker->AddObserver(std::make_unique<FromGWSPageLoadMetricsObserver>());
646-
- tracker->AddObserver(std::make_unique<GWSPageLoadMetricsObserver>());
646+
- tracker->AddObserver(std::make_unique<ChromeGWSPageLoadMetricsObserver>());
647647
tracker->AddObserver(std::make_unique<AbandonedPageLoadMetricsObserver>());
648648
- tracker->AddObserver(
649649
- std::make_unique<ChromeGWSAbandonedPageLoadMetricsObserver>());

0 commit comments

Comments
 (0)