[REBASE] Patches for 131.0.6778.140

uazo · Dec 11, 2024 · 625c295 · 625c295
1 parent b6ece29
commit 625c295
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch
@@ -478,7 +478,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
  import org.chromium.chrome.browser.DefaultBrowserInfo;
  import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;
  import org.chromium.chrome.browser.app.appmenu.DividerLineMenuItemViewBinder;
-@@ -211,6 +212,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -213,6 +214,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
                  openInChromeItemVisible = false;
                  tryAddingReadAloud = false;
              }

diff --git a/build/patches/Add-menu-item-to-view-source.patch b/build/patches/Add-menu-item-to-view-source.patch
@@ -104,7 +104,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
 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
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
-@@ -285,6 +285,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -293,6 +293,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
 
              updateRequestDesktopSiteMenuItem(
                      menu, currentTab, requestDesktopSiteVisible, isNativePage);

diff --git a/build/patches/Add-support-to-jxl.patch b/build/patches/Add-support-to-jxl.patch
@@ -605,7 +605,7 @@ diff --git a/third_party/blink/renderer/modules/webcodecs/image_decoder_fuzzer.c
 diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -2380,6 +2380,10 @@ source_set("blink_platform_unittests_sources") {
+@@ -2383,6 +2383,10 @@ source_set("blink_platform_unittests_sources") {
      sources += [ "text/locale_icu_test.cc" ]
    }
 
@@ -616,7 +616,7 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
    sources += [ "testing/run_all_tests.cc" ]
 
    configs += [
-@@ -2426,6 +2430,7 @@ source_set("blink_platform_unittests_sources") {
+@@ -2429,6 +2433,7 @@ source_set("blink_platform_unittests_sources") {
      "//third_party/blink/renderer/platform/wtf",
      "//third_party/dawn/src/dawn/native",
      "//third_party/dawn/src/dawn/wire",

diff --git a/build/patches/Disable-conversion-measurement-api.patch b/build/patches/Disable-conversion-measurement-api.patch
@@ -914,7 +914,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
      },
      {
        // This only exists so we can use RuntimeEnabled in the IDL file
-@@ -4268,15 +4268,15 @@
+@@ -4273,15 +4273,15 @@
      },
      {
        name: "TopicsAPI",

diff --git a/build/patches/Fonts-fingerprinting-mitigation.patch b/build/patches/Fonts-fingerprinting-mitigation.patch
@@ -128,7 +128,7 @@ diff --git a/third_party/blink/public/common/features.h b/third_party/blink/publ
 diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -792,6 +792,7 @@ component("platform") {
+@@ -794,6 +794,7 @@ component("platform") {
      "fonts/simple_font_data.cc",
      "fonts/simple_font_data.h",
      "fonts/skia/font_cache_skia.cc",

diff --git a/build/patches/Multiple-fingerprinting-mitigations.patch b/build/patches/Multiple-fingerprinting-mitigations.patch
@@ -519,7 +519,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_c
 diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1709,7 +1709,9 @@ component("platform") {
+@@ -1711,7 +1711,9 @@ component("platform") {
      "//third_party/blink/renderer:non_test_config",
    ]
 
@@ -530,7 +530,7 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
 
    allow_circular_includes_from = [
      "//third_party/blink/renderer/platform/blob",
-@@ -1791,6 +1793,7 @@ component("platform") {
+@@ -1793,6 +1795,7 @@ component("platform") {
      "//third_party/blink/public/strings",
      "//third_party/blink/renderer/platform/wtf",
      "//third_party/ced",

diff --git a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch
@@ -93,25 +93,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -890,8 +890,6 @@ static_library("browser") {
+@@ -890,10 +890,6 @@ static_library("browser") {
      "page_info/page_info_features.h",
      "page_load_metrics/observers/bookmark_bar_page_load_metrics_observer.cc",
      "page_load_metrics/observers/bookmark_bar_page_load_metrics_observer.h",
 -    "page_load_metrics/observers/chrome_gws_abandoned_page_load_metrics_observer.cc",
 -    "page_load_metrics/observers/chrome_gws_abandoned_page_load_metrics_observer.h",
+-    "page_load_metrics/observers/chrome_gws_page_load_metrics_observer.cc",
+-    "page_load_metrics/observers/chrome_gws_page_load_metrics_observer.h",
      "page_load_metrics/observers/core/amp_page_load_metrics_observer.cc",
      "page_load_metrics/observers/core/amp_page_load_metrics_observer.h",
      "page_load_metrics/observers/core/ukm_page_load_metrics_observer.cc",
-@@ -900,12 +898,6 @@ static_library("browser") {
+@@ -902,10 +898,6 @@ static_library("browser") {
      "page_load_metrics/observers/document_write_page_load_metrics_observer.h",
      "page_load_metrics/observers/foreground_duration_ukm_observer.cc",
      "page_load_metrics/observers/foreground_duration_ukm_observer.h",
 -    "page_load_metrics/observers/from_gws_page_load_metrics_observer.cc",
 -    "page_load_metrics/observers/from_gws_page_load_metrics_observer.h",
 -    "page_load_metrics/observers/gws_hp_page_load_metrics_observer.cc",
 -    "page_load_metrics/observers/gws_hp_page_load_metrics_observer.h",
--    "page_load_metrics/observers/gws_page_load_metrics_observer.cc",
--    "page_load_metrics/observers/gws_page_load_metrics_observer.h",
      "page_load_metrics/observers/histogram_suffixes.cc",
      "page_load_metrics/observers/histogram_suffixes.h",
      "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/
      tracker->AddObserver(std::make_unique<JavascriptFrameworksUkmObserver>());
      tracker->AddObserver(std::make_unique<SchemePageLoadMetricsObserver>());
 -    tracker->AddObserver(std::make_unique<FromGWSPageLoadMetricsObserver>());
--    tracker->AddObserver(std::make_unique<GWSPageLoadMetricsObserver>());
+-    tracker->AddObserver(std::make_unique<ChromeGWSPageLoadMetricsObserver>());
      tracker->AddObserver(std::make_unique<AbandonedPageLoadMetricsObserver>());
 -    tracker->AddObserver(
 -        std::make_unique<ChromeGWSAbandonedPageLoadMetricsObserver>());