v120 final patches

uazo · Dec 2, 2023 · 86bb267 · 86bb267
1 parent b441c2a
commit 86bb267
Show file tree

Hide file tree

Showing 30 changed files with 489 additions and 259 deletions.
diff --git a/build/patches/00Add-cromite-flags-support.patch b/build/patches/00Add-cromite-flags-support.patch
@@ -28,8 +28,8 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  chrome/common/chrome_features.cc              |   1 +
  .../content_settings/core/common/features.cc  |   1 +
  components/flags_ui/flags_state.cc            |  21 +++
- components/flags_ui/resources/app.html        |  33 +++-
- components/flags_ui/resources/app.ts          |  37 ++++-
+ components/flags_ui/resources/app.html        |  42 ++++-
+ components/flags_ui/resources/app.ts          |  41 ++++-
  components/flags_ui/resources/experiment.html |   7 +-
  components/flags_ui/resources/experiment.ts   |  16 ++
  .../flags_ui/resources/flags_browser_proxy.ts |   5 +
@@ -70,7 +70,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  services/network/public/cpp/features.h        |   1 +
  third_party/blink/common/features.cc          |   1 +
  third_party/blink/public/common/features.h    |   1 +
- 56 files changed, 475 insertions(+), 13 deletions(-)
+ 56 files changed, 488 insertions(+), 13 deletions(-)
  create mode 100755 cromite_flags/BUILD.gn
  create mode 100755 cromite_flags/chrome/browser/about_flags_cc/placeholder.txt
  create mode 100755 cromite_flags/chrome/browser/browser_features_cc/placeholder.txt
@@ -483,10 +483,13 @@ diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_stat
 diff --git a/components/flags_ui/resources/app.html b/components/flags_ui/resources/app.html
 --- a/components/flags_ui/resources/app.html
 +++ b/components/flags_ui/resources/app.html
-@@ -473,6 +473,24 @@
+@@ -473,7 +473,32 @@
        padding-top: 1.5rem;
      }
    }
++  #appcontainer {
++    overflow-y: scroll;
++  }
 +  .cromite #header {
 +    display: none;
 +  }
@@ -504,11 +507,16 @@ diff --git a/components/flags_ui/resources/app.html b/components/flags_ui/resour
 +  }
 +  .cromite #tab-content-cromite {
 +    display: block !important;
++  }
++  .cromite .section-header-title {
++    display: none;
 +  }
  </style>
++<div id="appcontainer">
  <div id="header">
    <div class="flex-container">
-@@ -545,6 +563,11 @@
+     <div class="flex search-container">
+@@ -545,6 +570,11 @@
            aria-selected="false" aria-controls="panel2"
            tabindex="-1">$i18n{unavailable}</a>
  </if>
@@ -520,7 +528,7 @@ diff --git a/components/flags_ui/resources/app.html b/components/flags_ui/resour
      </div>
      <div id="tabpanels">
        <div id="tab-content-available" class="tab-content selected"
-@@ -564,6 +587,14 @@
+@@ -564,6 +594,14 @@
          </div>
        </div>
  </if>
@@ -535,17 +543,27 @@ diff --git a/components/flags_ui/resources/app.html b/components/flags_ui/resour
      </div>
      <div id="needs-restart">
        <div class="flex-container">
-@@ -578,4 +609,4 @@
+@@ -578,4 +616,6 @@
        </div>
      </div>
    </div>
 -</div>
 \ No newline at end of file
 +</div>
++
++</div>
 diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resources/app.ts
 --- a/components/flags_ui/resources/app.ts
 +++ b/components/flags_ui/resources/app.ts
-@@ -204,6 +204,10 @@ export class FlagsAppElement extends CustomElement {
+@@ -193,6 +193,7 @@ export class FlagsAppElement extends CustomElement {
+     return getTemplate();
+   }
+
++  private onlyCromiteFlags: boolean = false;
+   private announceStatusDelayMs: number = 100;
+   private featuresResolver: PromiseResolver<void> = new PromiseResolver();
+   private flagSearch: FlagSearch = new FlagSearch(this);
+@@ -204,6 +205,10 @@ export class FlagsAppElement extends CustomElement {
    // </if>
 
    tabs: Tab[] = [
@@ -556,20 +574,23 @@ diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resource
      {
        tabEl: this.getRequiredElement('#tab-available'),
        panelEl: this.getRequiredElement('#tab-content-available'),
-@@ -217,6 +221,8 @@ export class FlagsAppElement extends CustomElement {
+@@ -217,6 +222,11 @@ export class FlagsAppElement extends CustomElement {
    ];
 
    connectedCallback() {
-+    if (location.pathname == '/cromite')
-+      document.body.classList.add('cromite');
++    if (location.pathname == '/cromite') {
++      this.onlyCromiteFlags = true;
++      this.getRequiredElement("#appcontainer").classList.add('cromite');
++      document.title = "Cromite Flags List";
++    }
      // Get and display the data upon loading.
      this.requestExperimentalFeaturesData();
      // There is no restart button on iOS.
-@@ -277,20 +283,29 @@ export class FlagsAppElement extends CustomElement {
+@@ -277,20 +287,29 @@ export class FlagsAppElement extends CustomElement {
      const defaultFeatures: Feature[] = [];
      const nonDefaultFeatures: Feature[] = [];
 
-+    if (document.body.classList.contains("cromite")) {
++    if (this.onlyCromiteFlags) {
 +      experimentalFeaturesData.supportedFeatures =
 +        experimentalFeaturesData.supportedFeatures.filter(item => item.is_new);
 +    }
@@ -582,12 +603,12 @@ diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resource
          nonDefaultFeatures,
 -        this.getRequiredElement('#non-default-experiments'));
 +        this.getRequiredElement('#non-default-experiments'),
-+        this.getRequiredElement('non-default-cromite-experiments'), false);
++        this.getRequiredElement('#non-default-cromite-experiments'), false);
 
      this.renderExperiments(
 -        defaultFeatures, this.getRequiredElement('#default-experiments'));
 +        defaultFeatures, this.getRequiredElement('#default-experiments'),
-+        this.getRequiredElement('cromite-experiments'), false);
++        this.getRequiredElement('#cromite-experiments'), false);
 
      // <if expr="not is_ios">
      this.renderExperiments(
@@ -598,7 +619,7 @@ diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resource
      // </if>
 
      this.showRestartToast(experimentalFeaturesData.needsRestart);
-@@ -401,16 +416,23 @@ export class FlagsAppElement extends CustomElement {
+@@ -401,16 +420,23 @@ export class FlagsAppElement extends CustomElement {
    }
 
    private renderExperiments(
@@ -623,7 +644,7 @@ diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resource
        if (select) {
          experiment.addEventListener('select-change', e => {
            e.preventDefault();
-@@ -434,9 +456,14 @@ export class FlagsAppElement extends CustomElement {
+@@ -434,9 +460,14 @@ export class FlagsAppElement extends CustomElement {
            this.showRestartToast(true);
          });
        }

diff --git a/build/patches/00Add-option-to-disable-snapshots.patch b/build/patches/00Add-option-to-disable-snapshots.patch
@@ -120,7 +120,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -65,6 +65,11 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
+@@ -66,6 +66,11 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
  import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
  import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
 
@@ -132,7 +132,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  import java.util.ArrayList;
  import java.util.List;
 
-@@ -72,7 +77,15 @@ import java.util.List;
+@@ -73,7 +78,15 @@ import java.util.List;
   * Fragment to keep track of the all the privacy related preferences.
   */
  public class PrivacySettings
@@ -149,7 +149,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
      private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
      private static final String PREF_PRELOAD_PAGES = "preload_pages";
      private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode";
-@@ -135,6 +148,21 @@ public class PrivacySettings
+@@ -136,6 +149,21 @@ public class PrivacySettings
              }
          }
 
@@ -171,15 +171,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
          Preference privacyGuidePreference = findPreference(PREF_PRIVACY_GUIDE);
          // Record the launch of PG from the S&P link-row entry point
          privacyGuidePreference.setOnPreferenceClickListener(preference -> {
-@@ -292,6 +320,7 @@ public class PrivacySettings
+@@ -293,6 +321,7 @@ public class PrivacySettings
 
      public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
      public static final String PREF_OPEN_EXTERNAL_LINKS_INCOGNITO = "open_external_links_incognito";
 +    public static final String PREF_TABGRID_USE_ICONS = "tabgrid_use_icons";
 
      @Override
      public boolean onPreferenceChange(Preference preference, Object newValue) {
-@@ -317,6 +346,13 @@ public class PrivacySettings
+@@ -318,6 +347,13 @@ public class PrivacySettings
              SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
              sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue);
              sharedPreferencesEditor.apply();
@@ -193,7 +193,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
          }
          return true;
      }
-@@ -359,6 +395,10 @@ public class PrivacySettings
+@@ -360,6 +396,10 @@ public class PrivacySettings
                              : R.string.text_off);
          }
 

diff --git a/build/patches/00Fix-chromium-build-bugs.patch b/build/patches/00Fix-chromium-build-bugs.patch
@@ -8,13 +8,14 @@ https://bugs.chromium.org/p/chromium/issues/detail?id=1491776#c10
  BUILD.gn                                           |  1 -
  .../navigation_predictor_metrics_document_data.h   |  2 ++
  chrome/browser/safe_browsing/BUILD.gn              |  1 +
+ .../omnibox/browser/autocomplete_classifier.cc     |  4 ++--
  components/omnibox/browser/omnibox_field_trial.cc  |  4 ++--
  .../phishing_classifier/phishing_image_embedder.cc | 14 +++-----------
  content/browser/browser_interface_binders.cc       |  1 +
  crypto/BUILD.gn                                    |  3 +++
  net/BUILD.gn                                       |  1 +
  third_party/libevent/BUILD.gn                      |  2 ++
- 9 files changed, 15 insertions(+), 14 deletions(-)
+ 10 files changed, 17 insertions(+), 16 deletions(-)
 
 diff --git a/BUILD.gn b/BUILD.gn
 --- a/BUILD.gn
@@ -50,6 +51,20 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin
      ]
      if (safe_browsing_mode == 1) {
        # "Safe Browsing Full" files in addition to the "basic" ones to use for
+diff --git a/components/omnibox/browser/autocomplete_classifier.cc b/components/omnibox/browser/autocomplete_classifier.cc
+--- a/components/omnibox/browser/autocomplete_classifier.cc
++++ b/components/omnibox/browser/autocomplete_classifier.cc
+@@ -95,8 +95,8 @@ void AutocompleteClassifier::Classify(
+     metrics::OmniboxEventProto::PageClassification page_classification,
+     AutocompleteMatch* match,
+     GURL* alternate_nav_url) {
+-  TRACE_EVENT1("omnibox", "AutocompleteClassifier::Classify", "text",
+-               base::UTF16ToUTF8(text));
++  // TRACE_EVENT1("omnibox", "AutocompleteClassifier::Classify", "text",
++  //              base::UTF16ToUTF8(text));
+   DCHECK(!inside_classify_);
+   base::AutoReset<bool> reset(&inside_classify_, true);
+   AutocompleteInput input(text, page_classification, *scheme_classifier_);
 diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc
 --- a/components/omnibox/browser/omnibox_field_trial.cc
 +++ b/components/omnibox/browser/omnibox_field_trial.cc

diff --git a/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch b/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch
@@ -20,12 +20,12 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  net/cookies/parsed_cookie.h                          |  7 ++++++-
  net/extras/sqlite/sqlite_persistent_cookie_store.cc  | 10 ++++++++++
  net/url_request/url_request_http_job.cc              |  2 +-
- services/network/restricted_cookie_manager.cc        |  3 +++
+ services/network/restricted_cookie_manager.cc        |  6 ++++++
  .../renderer/modules/cookie_store/cookie_init.idl    |  2 +-
  .../renderer/modules/cookie_store/cookie_store.cc    | 12 ++++++++++++
  .../cookie_store/cookie_store_delete_options.idl     |  2 +-
  ui/webui/webui_allowlist.cc                          |  1 +
- 16 files changed, 51 insertions(+), 21 deletions(-)
+ 16 files changed, 54 insertions(+), 21 deletions(-)
  create mode 100644 cromite_flags/components/content_settings/core/common/features_cc/Partitioning-all-cookies-by-top-frame-domain.inc
  create mode 100644 cromite_flags/components/permissions/features_cc/Partitioning-all-cookies-by-top-frame-domain.inc
  create mode 100644 cromite_flags/content/public/common/content_features_cc/Partitioning-all-cookies-by-top-frame-domain.inc
@@ -194,11 +194,14 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque
 diff --git a/services/network/restricted_cookie_manager.cc b/services/network/restricted_cookie_manager.cc
 --- a/services/network/restricted_cookie_manager.cc
 +++ b/services/network/restricted_cookie_manager.cc
-@@ -933,6 +933,9 @@ void RestrictedCookieManager::SetCookieFromString(
+@@ -933,6 +933,12 @@ void RestrictedCookieManager::SetCookieFromString(
 
    std::move(callback).Run();
 
 +  // https://bugs.chromium.org/p/chromium/issues/detail?id=911299
++  bool site_for_cookies_ok =
++      BoundSiteForCookies().IsEquivalent(site_for_cookies);
++  bool top_frame_origin_ok = top_frame_origin == BoundTopFrameOrigin();
 +  if (!site_for_cookies_ok || !top_frame_origin_ok) return;
 +
    net::CookieInclusionStatus status;

diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch
@@ -169,18 +169,18 @@ new file mode 100644
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -67,6 +67,11 @@ found in the LICENSE file.
+@@ -66,6 +66,11 @@ found in the LICENSE file.
+         android:key="secure_dns"
          android:title="@string/settings_secure_dns_title"
          android:fragment="org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings" />
-     <PreferenceCategory
++    <Preference
 +        android:key="incognito_settings"
 +        android:title="@string/incognito_settings_title"
 +        android:summary="@string/incognito_settings_summary"
 +        android:fragment="org.chromium.chrome.browser.privacy.settings.IncognitoSettings"/>
-+    <Preference
+     <PreferenceCategory
          android:key="services_category"
          android:title="@string/services_category_title">
-       <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java b/chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
 new file mode 100644
 --- /dev/null

diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch
@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../menu/bookmark_toolbar_menu_improved.xml   |  14 +
  .../browser/TabbedModeTabDelegateFactory.java |   5 +-
  .../app/bookmarks/BookmarkActivity.java       |  32 ++
- .../browser/bookmarks/BookmarkBridge.java     | 279 +++++++++++++++++
+ .../browser/bookmarks/BookmarkBridge.java     | 280 +++++++++++++++++
  .../browser/bookmarks/BookmarkDelegate.java   |  10 +
  .../bookmarks/BookmarkManagerCoordinator.java |   9 +
  .../bookmarks/BookmarkManagerMediator.java    |  23 ++
@@ -53,7 +53,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  ui/shell_dialogs/select_file_dialog_linux.cc  |   4 +
  ui/shell_dialogs/select_file_dialog_linux.h   |   2 +
  ui/shell_dialogs/select_file_dialog_win.cc    |   5 +
- 43 files changed, 919 insertions(+), 29 deletions(-)
+ 43 files changed, 920 insertions(+), 29 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-bookmark-import-export-actions.inc
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-bookmark-import-export-actions.inc
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/add-bookmark-import-export-actions.inc
@@ -242,7 +242,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  import android.text.TextUtils;
  import android.util.Pair;
 
-@@ -38,6 +51,32 @@ import org.chromium.url.GURL;
+@@ -38,6 +51,33 @@ import org.chromium.url.GURL;
  import java.util.ArrayList;
  import java.util.List;
 
@@ -251,7 +251,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 +import org.chromium.chrome.browser.IntentHandler;
 +import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
-+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
++import org.chromium.base.shared_preferences.SharedPreferencesManager;
++import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
 +import org.chromium.chrome.browser.flags.ChromeFeatureList;
 +import org.chromium.ui.base.PageTransition;
 +import org.chromium.ui.base.WindowAndroid;
@@ -275,7 +276,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  /**
   * Provides the communication channel for Android to fetch and manipulate the bookmark model stored
   * in native.
-@@ -451,6 +490,209 @@ class BookmarkBridge {
+@@ -451,6 +491,209 @@ class BookmarkBridge {
                  .getTotalBookmarkCount(mNativeBookmarkBridge, id.getId(), id.getType());
      }
 
@@ -317,7 +318,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +                                Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION);
 +
 +        // get last exported uri path, if any
-+        SharedPreferencesManager sharedPrefs = SharedPreferencesManager.getInstance();
++        SharedPreferencesManager sharedPrefs = ChromeSharedPreferences.getInstance();
 +        String bookmarksPath = sharedPrefs.readString(ChromePreferenceKeys.BOOKMARKS_LAST_EXPORT_URI, standardBoorkmarkName);
 +        Uri lastSelectedUri = Uri.parse(bookmarksPath);
 +
@@ -485,7 +486,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      /**
       * Synchronously gets a list of bookmarks that match the specified search query.
       *
-@@ -979,6 +1221,39 @@ class BookmarkBridge {
+@@ -979,6 +1222,39 @@ class BookmarkBridge {
          depthList.add(depth);
      }
 
@@ -500,7 +501,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +                }
 +            });
 +        } else {
-+            SharedPreferencesManager sharedPrefs = SharedPreferencesManager.getInstance();
++            SharedPreferencesManager sharedPrefs = ChromeSharedPreferences.getInstance();
 +            sharedPrefs.writeString(ChromePreferenceKeys.BOOKMARKS_LAST_EXPORT_URI, bookmarksPath);
 +
 +            Context context = ContextUtils.getApplicationContext();
@@ -525,7 +526,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      private static List<Pair<Integer, Integer>> createPairsList(int[] left, int[] right) {
          List<Pair<Integer, Integer>> pairList = new ArrayList<>();
          for (int i = 0; i < left.length; i++) {
-@@ -1024,6 +1299,10 @@ class BookmarkBridge {
+@@ -1024,6 +1300,10 @@ class BookmarkBridge {
          void getChildIds(
                  long nativeBookmarkBridge, long id, int type, List<BookmarkId> bookmarksList);