From 957d6e46296c7eeac4e0d91082d63f0fbeb518fc Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Thu, 14 Dec 2023 17:54:53 +0100 Subject: [PATCH] Patches for 120.0.6099.115 --- .../00Partitioning-all-cookies-by-top-frame-domain.patch | 6 +++--- .../patches/Dictionary-suggestions-for-the-Omnibox.patch | 8 ++++---- 2 files changed, 7 insertions(+), 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 index f9fee088b..99eb09561 100644 --- 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 index b570c19f1..561705d01 100644 --- 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();