Patches for 120.0.6099.115

uazo · Dec 14, 2023 · 957d6e4 · 957d6e4
1 parent 0182aaf
commit 957d6e4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch b/build/patches/00Partitioning-all-cookies-by-top-frame-domain.patch
@@ -62,9 +62,9 @@ diff --git a/components/content_settings/core/browser/cookie_settings.cc b/compo
      base::TimeDelta ttl,
      bool use_schemeless_patterns) {
 +  if ((true)) return;
-   // If the new grant has an earlier TTL than the existing setting, keep the
-   // existing TTL.
-   SettingInfo info;
+   if (url.is_empty() || first_party_url.is_empty()) {
+     return;
+   }
 diff --git a/components/content_settings/core/common/cookie_settings_base.cc b/components/content_settings/core/common/cookie_settings_base.cc
 --- a/components/content_settings/core/common/cookie_settings_base.cc
 +++ b/components/content_settings/core/common/cookie_settings_base.cc

diff --git a/build/patches/Dictionary-suggestions-for-the-Omnibox.patch b/build/patches/Dictionary-suggestions-for-the-Omnibox.patch
@@ -59,14 +59,14 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
  import android.text.Editable;
  import android.text.InputType;
 @@ -104,6 +105,7 @@ public abstract class UrlBar extends AutocompleteEditText {
+     private boolean mFocused;
      private boolean mAllowFocus = true;
 
-     private boolean mPendingScroll;
 +    private boolean mPendingSelectAll;
-     private int mPreviousWidth;
+     private boolean mPendingScroll;
 
-     @ScrollType private int mPreviousScrollType;
-@@ -301,6 +303,27 @@ public abstract class UrlBar extends AutocompleteEditText {
+     // Captures the current intended text scroll type.
+@@ -304,6 +306,27 @@ public abstract class UrlBar extends AutocompleteEditText {
              mPendingScroll = false;
          }
          fixupTextDirection();