diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ebb04fb0393ced912e04f7315c67295ef54e9d9..dcb56fc6f74ae616003b57bfcec239efe180e2b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,8 +49,7 @@ build-cromite-x64: stage: filters rules: - if: $CI_PIPELINE_SOURCE == "schedule" - - if: $CI_COMMIT_BRANCH == "master" - - when: manual + - if: $CI_PIPELINE_SOURCE != "merge_request_event" update-filters: stage: filters diff --git a/build/cromite_patches/Add-cromite-flags-support.patch b/build/cromite_patches/Add-cromite-flags-support.patch index 30619cba6b9b5b3949c1aab643b608e282f6653b..9189fa16c11db31316f742a9951e17f33c2db21b 100644 --- a/build/cromite_patches/Add-cromite-flags-support.patch +++ b/build/cromite_patches/Add-cromite-flags-support.patch @@ -665,7 +665,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc namespace about_flags { namespace { -@@ -4966,6 +4970,10 @@ const FeatureEntry::FeatureVariation kSeamlessSigninPromoTypes[] = { +@@ -4977,6 +4981,10 @@ const FeatureEntry::FeatureVariation kSeamlessSigninPromoTypes[] = { std::size(kSeamlessSigninPromoTypeTwoButtons), nullptr}}; #endif // BUILDFLAG(IS_ANDROID) @@ -676,7 +676,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc // RECORDING USER METRICS FOR FLAGS: // ----------------------------------------------------------------------------- // The first line of the entry is the internal name. -@@ -4992,6 +5000,9 @@ const FeatureEntry::FeatureVariation kSeamlessSigninPromoTypes[] = { +@@ -5003,6 +5011,9 @@ const FeatureEntry::FeatureVariation kSeamlessSigninPromoTypes[] = { const FeatureEntry kFeatureEntries[] = { // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and // //tools/flags/generate_unexpire_flags.py. @@ -1010,7 +1010,7 @@ diff --git a/chrome/browser/unexpire_flags.cc b/chrome/browser/unexpire_flags.cc diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -1696,5 +1696,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT); +@@ -1694,5 +1694,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT); // happen silently without prompting an updating dialog. BASE_FEATURE(kSilentPolicyAndDefaultAppUpdating, base::FEATURE_DISABLED_BY_DEFAULT); @@ -2024,18 +2024,18 @@ diff --git a/media/base/media_switches.h b/media/base/media_switches.h diff --git a/net/base/features.cc b/net/base/features.cc --- a/net/base/features.cc +++ b/net/base/features.cc -@@ -839,4 +839,5 @@ BASE_FEATURE_PARAM(size_t, - "cache_size", - 64); +@@ -852,4 +852,5 @@ BASE_FEATURE_PARAM(std::string, + "quic_options", + ""); +#include "cromite_flags/net_base_features_cc.inc" } // namespace net::features diff --git a/net/base/features.h b/net/base/features.h --- a/net/base/features.h +++ b/net/base/features.h -@@ -935,6 +935,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kDnsFilteringDetails); - NET_EXPORT BASE_DECLARE_FEATURE(kUpdateIsMainFrameOriginRecentlyAccessed); - NET_EXPORT BASE_DECLARE_FEATURE_PARAM(size_t, kRecentlyAccessedOriginCacheSize); +@@ -946,6 +946,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kTryQuicByDefault); + // separate the values with a comma (e.g. "ABCD,EFGH"). + NET_EXPORT BASE_DECLARE_FEATURE_PARAM(std::string, kQuicOptions); +#include "cromite_flags/net_base_features_h.inc" } // namespace net::features diff --git a/build/cromite_patches/Add-option-to-force-tablet-UI.patch b/build/cromite_patches/Add-option-to-force-tablet-UI.patch index 930d9de0136111960cba587e7670c6145186c4fc..2834c2bff0523e63bdd3fef93b7326c4ef09a3db 100644 --- a/build/cromite_patches/Add-option-to-force-tablet-UI.patch +++ b/build/cromite_patches/Add-option-to-force-tablet-UI.patch @@ -192,7 +192,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over import org.chromium.ui.base.LocalizationUtils; import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.util.ColorUtils; -@@ -5039,8 +5040,13 @@ public class StripLayoutHelper +@@ -5040,8 +5041,13 @@ public class StripLayoutHelper mCloseButtonMenu.setAnchorView(tabView); // 3. Set the vertical offset to align the close button menu with bottom of the tab strip int tabHeight = mManagerHost.getHeight(); diff --git a/build/cromite_patches/Add-option-to-not-persist-tabs-across-sessions.patch b/build/cromite_patches/Add-option-to-not-persist-tabs-across-sessions.patch index cf0e4938d6827e434f61f0e99861f1c253ae5cfd..935f1a261282884bf815618200b668ec2bab174f 100644 --- a/build/cromite_patches/Add-option-to-not-persist-tabs-across-sessions.patch +++ b/build/cromite_patches/Add-option-to-not-persist-tabs-across-sessions.patch @@ -7,8 +7,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../android/java/res/xml/privacy_preferences.xml | 5 +++++ .../chrome/browser/ChromeTabbedActivity.java | 5 ++++- .../browser/privacy/settings/PrivacySettings.java | 15 ++++++++++++++- + .../browser/tab_group_sync/StartupHelper.java | 6 ++++++ .../ui/android/strings/android_chrome_strings.grd | 6 ++++++ - 4 files changed, 29 insertions(+), 2 deletions(-) + 5 files changed, 35 insertions(+), 2 deletions(-) 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 @@ -101,6 +102,29 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting Preference secureDnsPref = findPreference(PREF_SECURE_DNS); if (secureDnsPref != null && secureDnsPref.isVisible()) { secureDnsPref.setSummary(SecureDnsSettings.getSummary(getContext())); +diff --git a/chrome/browser/tab_group_sync/android/java/src/org/chromium/chrome/browser/tab_group_sync/StartupHelper.java b/chrome/browser/tab_group_sync/android/java/src/org/chromium/chrome/browser/tab_group_sync/StartupHelper.java +--- a/chrome/browser/tab_group_sync/android/java/src/org/chromium/chrome/browser/tab_group_sync/StartupHelper.java ++++ b/chrome/browser/tab_group_sync/android/java/src/org/chromium/chrome/browser/tab_group_sync/StartupHelper.java +@@ -4,6 +4,7 @@ + + package org.chromium.chrome.browser.tab_group_sync; + ++import org.chromium.base.ContextUtils; + import org.chromium.base.metrics.RecordHistogram; + import org.chromium.build.annotations.NullMarked; + import org.chromium.chrome.browser.preferences.Pref; +@@ -74,6 +75,11 @@ public class StartupHelper { + */ + public void initializeTabGroupSync() { + LogUtils.log(TAG, "initializeTabGroupSync"); ++ if (ContextUtils.getAppSharedPreferences().getBoolean("close_tabs_on_exit", false)) { ++ for (String tabGroupId : mTabGroupSyncService.getAllGroupIds()) { ++ mTabGroupSyncService.removeGroup(tabGroupId); ++ } ++ } + // First close the groups that were deleted remotely when the activity was not running. + closeDeletedGroupsFromTabModel(); + diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd diff --git a/build/cromite_patches/Add-site-engagement-flag.patch b/build/cromite_patches/Add-site-engagement-flag.patch index e005b42cc9013c0733454d8cb9801a7e3d8377d0..e65dfc18ba51b17f883038879a571a27123e58f5 100644 --- a/build/cromite_patches/Add-site-engagement-flag.patch +++ b/build/cromite_patches/Add-site-engagement-flag.patch @@ -10,6 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html chrome/browser/about_flags.cc | 1 + .../engagement/important_sites_util.cc | 9 +++++ .../browser/media/media_engagement_service.cc | 4 ++- + .../auto_picture_in_picture_tab_helper.cc | 2 +- .../internal/tracker_impl.cc | 3 ++ .../public/feature_configurations.cc | 7 ++++ .../content/site_engagement_score.cc | 5 +++ @@ -17,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/site_engagement/core/features.cc | 30 ++++++++++++++++ components/site_engagement/core/features.h | 34 +++++++++++++++++++ .../Add-site-engagement-flag.inc | 10 ++++++ - 10 files changed, 108 insertions(+), 1 deletion(-) + 11 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 components/site_engagement/core/features.cc create mode 100644 components/site_engagement/core/features.h create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-site-engagement-flag.inc @@ -87,6 +88,18 @@ diff --git a/chrome/browser/media/media_engagement_service.cc b/chrome/browser/m } // static +diff --git a/chrome/browser/picture_in_picture/auto_picture_in_picture_tab_helper.cc b/chrome/browser/picture_in_picture/auto_picture_in_picture_tab_helper.cc +--- a/chrome/browser/picture_in_picture/auto_picture_in_picture_tab_helper.cc ++++ b/chrome/browser/picture_in_picture/auto_picture_in_picture_tab_helper.cc +@@ -42,7 +42,7 @@ AutoPictureInPictureTabHelper::AutoPictureInPictureTabHelper( + Profile::FromBrowserContext(web_contents->GetBrowserContext()))), + auto_blocker_(PermissionDecisionAutoBlockerFactory::GetForProfile( + Profile::FromBrowserContext(web_contents->GetBrowserContext()))), +- media_engagement_service_(MediaEngagementService::Get( ++ media_engagement_service_(!MediaEngagementService::IsEnabled() ? nullptr : MediaEngagementService::Get( + Profile::FromBrowserContext(web_contents->GetBrowserContext()))), + clock_(base::DefaultTickClock::GetInstance()) { + // `base::Unretained` is safe here since we own `tab_observer_helper_`. diff --git a/components/feature_engagement/internal/tracker_impl.cc b/components/feature_engagement/internal/tracker_impl.cc --- a/components/feature_engagement/internal/tracker_impl.cc +++ b/components/feature_engagement/internal/tracker_impl.cc diff --git a/build/cromite_patches/Client-hints-overrides.patch b/build/cromite_patches/Client-hints-overrides.patch index 164a1641862b1e429c4d50b669cde55699b749cf..6c55ae482faf598b7f63fe5ca1b7efcf94bdeb67 100644 --- a/build/cromite_patches/Client-hints-overrides.patch +++ b/build/cromite_patches/Client-hints-overrides.patch @@ -7,26 +7,48 @@ Use Google Chrome branding for client hints License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - components/embedder_support/user_agent_utils.cc | 4 +--- - content/browser/client_hints/client_hints.cc | 15 ++++++++++----- - .../browser/loader/navigation_url_loader_impl.cc | 5 +++++ - .../about_flags_cc/Client-hints-overrides.inc | 9 +++++++++ - .../common/features_cc/Client-hints-overrides.inc | 1 + - .../cpp/features_cc/Client-hints-overrides.inc | 1 + - net/http/http_network_transaction.cc | 1 + - services/network/public/cpp/client_hints.cc | 1 + - .../blink/common/client_hints/client_hints.cc | 6 ++++-- - .../common/client_hints/enabled_client_hints.cc | 6 ++++++ - .../blink/renderer/core/frame/navigator_ua.idl | 4 +++- - .../renderer/core/frame/navigator_ua_data.cc | 1 + - .../renderer/core/frame/navigator_ua_data.idl | 5 ++++- - .../renderer/core/loader/frame_fetch_context.cc | 4 +++- - .../platform/runtime_enabled_features.json5 | 8 ++++++-- - 15 files changed, 56 insertions(+), 15 deletions(-) + components/client_hints/browser/client_hints.cc | 5 +++-- + components/embedder_support/user_agent_utils.cc | 5 ++--- + content/browser/client_hints/client_hints.cc | 17 +++++++++++++++-- + .../about_flags_cc/Client-hints-overrides.inc | 9 +++++++++ + .../features_cc/Client-hints-overrides.inc | 1 + + .../cpp/features_cc/Client-hints-overrides.inc | 1 + + net/http/http_network_transaction.cc | 1 + + services/network/public/cpp/client_hints.cc | 2 +- + .../blink/common/client_hints/client_hints.cc | 6 ++++-- + .../common/client_hints/enabled_client_hints.cc | 8 ++++++++ + .../blink/renderer/core/frame/navigator_ua.idl | 4 +++- + .../renderer/core/frame/navigator_ua_data.cc | 1 + + .../renderer/core/frame/navigator_ua_data.idl | 5 ++++- + .../renderer/core/loader/frame_fetch_context.cc | 4 +++- + .../platform/runtime_enabled_features.json5 | 8 ++++++-- + 15 files changed, 62 insertions(+), 15 deletions(-) create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Client-hints-overrides.inc create mode 100644 cromite_flags/content/common/features_cc/Client-hints-overrides.inc create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Client-hints-overrides.inc +diff --git a/components/client_hints/browser/client_hints.cc b/components/client_hints/browser/client_hints.cc +--- a/components/client_hints/browser/client_hints.cc ++++ b/components/client_hints/browser/client_hints.cc +@@ -35,7 +35,7 @@ ParseInitializeClientHintsStorage() { + auto results = + base::flat_map>(); +- ++ if ((true)) return results; + std::string raw_client_hint_json = + base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( + switches::kInitializeClientHintsStorage); +@@ -200,7 +200,8 @@ void ClientHints::PersistClientHints( + // TODO(tbansal): crbug.com/735518. Disable updates to client hints settings + // when cookies are disabled for |primary_origin|. + content_settings::ContentSettingConstraints constraints; +- constraints.set_session_model(content_settings::mojom::SessionModel::DURABLE); ++ constraints.set_session_model(content_settings::mojom::SessionModel::USER_SESSION); ++ constraints.set_lifetime(base::Minutes(1)); + settings_map_->SetWebsiteSettingDefaultScope( + primary_url, GURL(), ContentSettingsType::CLIENT_HINTS, + base::Value(std::move(client_hints_dictionary)), constraints); diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedder_support/user_agent_utils.cc --- a/components/embedder_support/user_agent_utils.cc +++ b/components/embedder_support/user_agent_utils.cc @@ -41,6 +63,14 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd std::string brand_version = output_version_type == blink::UserAgentBrandVersionType::kFullVersion +@@ -698,6 +696,7 @@ blink::UserAgentMetadata GetUserAgentMetadata(const PrefService* pref_service, + } + + // High entropy client hints. ++ if ((true)) return metadata; + metadata.brand_full_version_list = + GetUserAgentBrandFullVersionListInternal(std::nullopt); + metadata.full_version = std::string(version_info::GetVersionNumber()); diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/client_hints/client_hints.cc --- a/content/browser/client_hints/client_hints.cc +++ b/content/browser/client_hints/client_hints.cc @@ -52,56 +82,38 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie #include "ui/display/display.h" #include "ui/display/screen.h" #include "url/origin.h" -@@ -706,7 +707,8 @@ void UpdateNavigationRequestClientUaHeadersImpl( - // value, disable them. This overwrites previous decision from UI. - disable_due_to_custom_ua = !ua_metadata.has_value(); - } -- -+ if (!blink::RuntimeEnabledFeatures::UserAgentClientHintEnabled()) -+ disable_due_to_custom_ua = true; - if (!disable_due_to_custom_ua) { - if (!ua_metadata.has_value()) - ua_metadata = delegate->GetUserAgentMetadata(); -@@ -898,10 +900,12 @@ void AddRequestClientHintsHeaders( - AddEctHeader(headers, network_quality_tracker, url); - } +@@ -602,10 +603,21 @@ bool IsClientHintEnabled(const ClientHintsExtendedData& data, -- UpdateNavigationRequestClientUaHeadersImpl( -- delegate, is_ua_override_on, frame_tree_node, -- ClientUaHeaderCallType::kDuringCreation, headers, container_policy, data, -- ftn_for_devtools_override); -+ if (blink::RuntimeEnabledFeatures::UserAgentClientHintEnabled()) { -+ UpdateNavigationRequestClientUaHeadersImpl( -+ delegate, is_ua_override_on, frame_tree_node, -+ ClientUaHeaderCallType::kDuringCreation, headers, container_policy, data, -+ ftn_for_devtools_override); + bool IsClientHintAllowed(const ClientHintsExtendedData& data, + WebClientHintsType type) { ++ if (!blink::RuntimeEnabledFeatures::UserAgentClientHintEnabled()) ++ return false; ++ ++ bool allowed = false; ++ if (type == WebClientHintsType::kUA || ++ type == WebClientHintsType::kUAMobile || ++ type == WebClientHintsType::kUAPlatform || ++ type == WebClientHintsType::kUAModel || ++ type == WebClientHintsType::kUAPlatformVersion) { ++ allowed = true; + } - - if (ShouldAddClientHint(data, WebClientHintsType::kPrefersColorScheme)) { - AddPrefersColorSchemeHeader(headers, frame_tree_node); -@@ -989,6 +993,7 @@ ParseAndPersistAcceptCHForNavigation( - BrowserContext* context, - ClientHintsControllerDelegate* delegate, - FrameTreeNode* frame_tree_node) { -+ if ((true)) return std::nullopt; - DCHECK_CURRENTLY_ON(BrowserThread::UI); - DCHECK(context); - DCHECK(parsed_headers); -diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc ---- a/content/browser/loader/navigation_url_loader_impl.cc -+++ b/content/browser/loader/navigation_url_loader_impl.cc -@@ -1744,6 +1744,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived( + if (data.is_outermost_main_frame) { +- return true; ++ return allowed; + } +- return (data.permissions_policy->IsFeatureEnabledForOrigin( ++ return ((false)) && (data.permissions_policy->IsFeatureEnabledForOrigin( + network::GetClientHintToPolicyFeatureMap().at(type), + data.resource_origin)); + } +@@ -630,6 +642,7 @@ bool IsJavascriptEnabled(FrameTreeNode* frame_tree_node) { + void UpdateIFramePermissionsPolicyWithDelegationSupportForClientHints( + ClientHintsExtendedData& data, + const network::ParsedPermissionsPolicy& container_policy) { ++ if ((true)) return; + if (container_policy.empty()) { return; } - -+ if (!base::FeatureList::IsEnabled(network::features::kAcceptCHFrame)) { -+ std::move(callback).Run(net::OK); -+ return; -+ } -+ - LogAcceptCHFrameStatus(AcceptCHFrameRestart::kFramePresent); - - // Given that this is happening in the middle of navigation, there should diff --git a/cromite_flags/chrome/browser/about_flags_cc/Client-hints-overrides.inc b/cromite_flags/chrome/browser/about_flags_cc/Client-hints-overrides.inc new file mode 100644 --- /dev/null @@ -121,13 +133,13 @@ new file mode 100644 --- /dev/null +++ b/cromite_flags/content/common/features_cc/Client-hints-overrides.inc @@ -0,0 +1 @@ -+SET_CROMITE_FEATURE_DISABLED(kCriticalClientHint); ++SET_CROMITE_FEATURE_ENABLED(kCriticalClientHint); diff --git a/cromite_flags/services/network/public/cpp/features_cc/Client-hints-overrides.inc b/cromite_flags/services/network/public/cpp/features_cc/Client-hints-overrides.inc new file mode 100644 --- /dev/null +++ b/cromite_flags/services/network/public/cpp/features_cc/Client-hints-overrides.inc @@ -0,0 +1 @@ -+SET_CROMITE_FEATURE_DISABLED(kAcceptCHFrame); ++SET_CROMITE_FEATURE_ENABLED(kAcceptCHFrame); diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -142,11 +154,12 @@ diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transa diff --git a/services/network/public/cpp/client_hints.cc b/services/network/public/cpp/client_hints.cc --- a/services/network/public/cpp/client_hints.cc +++ b/services/network/public/cpp/client_hints.cc -@@ -112,6 +112,7 @@ const DecodeMap& GetDecodeMap() { +@@ -111,7 +111,7 @@ const DecodeMap& GetDecodeMap() { + } // namespace std::optional> - ParseClientHintsHeader(const std::string& header) { -+ if ((true)) return std::nullopt; +-ParseClientHintsHeader(const std::string& header) { ++ParseClientHintsHeader(const std::string& header) { // Parse Client Hints Header // Accept-CH is an sh-list of tokens; see: // https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-header-structure-19#section-3.1 std::optional maybe_list = @@ -179,13 +192,15 @@ diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party diff --git a/third_party/blink/common/client_hints/enabled_client_hints.cc b/third_party/blink/common/client_hints/enabled_client_hints.cc --- a/third_party/blink/common/client_hints/enabled_client_hints.cc +++ b/third_party/blink/common/client_hints/enabled_client_hints.cc -@@ -15,6 +15,12 @@ namespace { +@@ -15,6 +15,14 @@ namespace { using ::network::mojom::WebClientHintsType; bool IsDisabledByFeature(const WebClientHintsType type) { + if (type == WebClientHintsType::kUA || + type == WebClientHintsType::kUAMobile || -+ type == WebClientHintsType::kUAPlatform) { ++ type == WebClientHintsType::kUAPlatform || ++ type == WebClientHintsType::kUAModel || ++ type == WebClientHintsType::kUAPlatformVersion) { + return false; + } + if ((true)) return true; @@ -243,7 +258,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi // For subresource requests, sending the hint in the fetch request based on // the permissions policy. if (!policy.IsFeatureEnabledForOrigin( -@@ -713,7 +715,7 @@ void FrameFetchContext::AddClientHintsIfNecessary( +@@ -715,7 +717,7 @@ void FrameFetchContext::AddClientHintsIfNecessary( } // Only send User Agent hints if the info is available diff --git a/build/cromite_patches/Disable-TLS-resumption.patch b/build/cromite_patches/Disable-TLS-resumption.patch index c0e4e3843c958887a81e3ed6f0ddf4b5cc1aa76b..282f15f1312fd16849b0d1beabce1d7bf5a89a35 100644 --- a/build/cromite_patches/Disable-TLS-resumption.patch +++ b/build/cromite_patches/Disable-TLS-resumption.patch @@ -137,7 +137,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc QuicSessionRequest::QuicSessionRequest(QuicSessionPool* pool) : pool_(pool) {} QuicSessionRequest::~QuicSessionRequest() { -@@ -2404,7 +2437,7 @@ QuicSessionPool::CreateCryptoConfigHandle(QuicCryptoClientConfigKey key) { +@@ -2409,7 +2442,7 @@ QuicSessionPool::CreateCryptoConfigHandle(QuicCryptoClientConfigKey key) { cert_verifier_, transport_security_state_, sct_auditing_delegate_, std::move(hostnames_to_allow_unknown_roots), key.network_anonymization_key), diff --git a/build/cromite_patches/Disable-all-predictors-code.patch b/build/cromite_patches/Disable-all-predictors-code.patch index ac10b20cb86f1b4c9f61fb085a16a3bf9ed193d3..8e2f443b4d83211830d3ded3e82549b9419cd222 100644 --- a/build/cromite_patches/Disable-all-predictors-code.patch +++ b/build/cromite_patches/Disable-all-predictors-code.patch @@ -1444,7 +1444,7 @@ diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculat diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -3844,7 +3844,7 @@ +@@ -3851,7 +3851,7 @@ // // It also has some feature params defined throughout the codebase. name: "Prerender2", diff --git a/build/cromite_patches/Disable-conversion-measurement-api.patch b/build/cromite_patches/Disable-conversion-measurement-api.patch index c0b665e5fa44352f38b3d0cba85ff29536c31931..946d64056c60ecda169fa46bbb2856bd0ebaf1bd 100644 --- a/build/cromite_patches/Disable-conversion-measurement-api.patch +++ b/build/cromite_patches/Disable-conversion-measurement-api.patch @@ -1114,7 +1114,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 base_feature: "none", public: true, }, -@@ -3886,8 +3886,8 @@ +@@ -3893,8 +3893,8 @@ base_feature: "none", }, { @@ -1125,7 +1125,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 base_feature: "none", public: true, }, -@@ -5143,16 +5143,16 @@ +@@ -5149,16 +5149,16 @@ status: "stable", }, { diff --git a/build/cromite_patches/Disable-media-router-and-remoting-by-default.patch b/build/cromite_patches/Disable-media-router-and-remoting-by-default.patch index e88096d12921cc96c73954d15b4e0831cd7113ca..37f21b1d0daef14f02e48550e3ec94a787586496 100644 --- a/build/cromite_patches/Disable-media-router-and-remoting-by-default.patch +++ b/build/cromite_patches/Disable-media-router-and-remoting-by-default.patch @@ -79,7 +79,7 @@ diff --git a/third_party/blink/renderer/modules/remoteplayback/remote_playback.c diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -4088,14 +4088,10 @@ +@@ -4095,14 +4095,10 @@ base_feature: "none", }, { diff --git a/build/cromite_patches/Disable-text-fragments-by-default.patch b/build/cromite_patches/Disable-text-fragments-by-default.patch index a020ba36129a18e3c59a565f12fac39e4f9e35e1..3d936daa93edb0c2a56437f4130edba6992f5f7e 100644 --- a/build/cromite_patches/Disable-text-fragments-by-default.patch +++ b/build/cromite_patches/Disable-text-fragments-by-default.patch @@ -92,7 +92,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -5071,10 +5071,9 @@ +@@ -5077,10 +5077,9 @@ }, { name: "TextFragmentIdentifiers", diff --git a/build/cromite_patches/Fix-chromium-build-bugs.patch b/build/cromite_patches/Fix-chromium-build-bugs.patch index 33d9a314967158dc51fd62d1022cf57b82a12d72..d0135c270a742c6d9920d2be8210fb76aadb1ea0 100644 --- a/build/cromite_patches/Fix-chromium-build-bugs.patch +++ b/build/cromite_patches/Fix-chromium-build-bugs.patch @@ -78,7 +78,7 @@ diff --git a/components/omnibox/browser/autocomplete_classifier.cc b/components/ 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 -@@ -860,11 +860,11 @@ MLConfig& MLConfig::operator=(const MLConfig& other) = default; +@@ -861,11 +861,11 @@ MLConfig& MLConfig::operator=(const MLConfig& other) = default; ScopedMLConfigForTesting::ScopedMLConfigForTesting() : original_config_(std::make_unique(GetMLConfig())) { diff --git a/build/cromite_patches/Move-navigation-bar-to-bottom.patch b/build/cromite_patches/Move-navigation-bar-to-bottom.patch index e9ec41f38097c46c9b0e96fe67d30d73fbb91306..1bc0518ac523f02704ed94a2cd8f6fa4757736f3 100644 --- a/build/cromite_patches/Move-navigation-bar-to-bottom.patch +++ b/build/cromite_patches/Move-navigation-bar-to-bottom.patch @@ -102,7 +102,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/viz/common/features.cc | 2 + .../render_widget_host_view_android.cc | 3 + .../Move-navigation-bar-to-bottom.inc | 17 ++ - 89 files changed, 1068 insertions(+), 88 deletions(-) + .../renderer/core/frame/viewport_data.cc | 1 + + 90 files changed, 1069 insertions(+), 88 deletions(-) create mode 100644 chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/ReversedLinearLayout.java create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Move-navigation-bar-to-bottom.inc @@ -3210,7 +3211,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/ #include "cc/base/math_util.h" #include "cc/slim/layer.h" #include "components/input/cursor_manager.h" -@@ -938,6 +939,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation( +@@ -939,6 +940,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation( // factor. Thus, |top_content_offset| in CSS pixels is also in DIPs. float top_content_offset = metadata.top_controls_height * metadata.top_controls_shown_ratio; @@ -3241,4 +3242,15 @@ new file mode 100644 +#endif + +#endif +diff --git a/third_party/blink/renderer/core/frame/viewport_data.cc b/third_party/blink/renderer/core/frame/viewport_data.cc +--- a/third_party/blink/renderer/core/frame/viewport_data.cc ++++ b/third_party/blink/renderer/core/frame/viewport_data.cc +@@ -175,6 +175,7 @@ void ViewportData::SetExpandIntoDisplayCutout(bool expand) { + } + + void ViewportData::SetVirtualKeyboardOverlaysContent(bool overlays_content) { ++ overlays_content = false; + if (virtual_keyboard_overlays_content_ == overlays_content) + return; + -- diff --git a/build/cromite_patches/Partition-Blink-memory-cache.patch b/build/cromite_patches/Partition-Blink-memory-cache.patch index ce720db33cdc821669d86971c43a5e51625b5c81..776fb62c066af716675085dd9ba26d90b3fe7656 100644 --- a/build/cromite_patches/Partition-Blink-memory-cache.patch +++ b/build/cromite_patches/Partition-Blink-memory-cache.patch @@ -261,7 +261,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -4886,7 +4886,7 @@ +@@ -4892,7 +4892,7 @@ }, { name: "SvgPartitionSVGDocumentResourcesInMemoryCache", diff --git a/build/cromite_patches/Restore-Simplified-NTP-launch.patch b/build/cromite_patches/Restore-Simplified-NTP-launch.patch index 4d4aa72c778090284523c42a32966b82357676c3..edc03b179a0ff3e7b96555ec6bb6e872e6994e03 100644 --- a/build/cromite_patches/Restore-Simplified-NTP-launch.patch +++ b/build/cromite_patches/Restore-Simplified-NTP-launch.patch @@ -1597,7 +1597,7 @@ diff --git a/components/ntp_tiles/custom_links_store.cc b/components/ntp_tiles/c diff --git a/components/omnibox/common/omnibox_features.cc b/components/omnibox/common/omnibox_features.cc --- a/components/omnibox/common/omnibox_features.cc +++ b/components/omnibox/common/omnibox_features.cc -@@ -206,6 +206,7 @@ BASE_FEATURE(kRemoveSearchReadyOmnibox, DISABLED); +@@ -219,6 +219,7 @@ BASE_FEATURE(kRemoveSearchReadyOmnibox, DISABLED); BASE_FEATURE(kDefaultTypedNavigationsToHttps, "OmniboxDefaultTypedNavigationsToHttps", enable_if(IS_IOS)); @@ -1605,7 +1605,7 @@ diff --git a/components/omnibox/common/omnibox_features.cc b/components/omnibox/ // Override the delay to create a spare renderer when the omnibox is focused // on Android. -@@ -292,6 +293,7 @@ BASE_FEATURE(kOmniboxMobileParityUpdate, ENABLED); +@@ -305,6 +306,7 @@ BASE_FEATURE(kOmniboxMobileParityUpdate, ENABLED); // Updates various NTP/Omnibox assets and descriptions for visual alignment on // Android and iOS, V2. BASE_FEATURE(kOmniboxMobileParityUpdateV2, ENABLED); diff --git a/build/cromite_patches/Restore-chrome-password-store.patch b/build/cromite_patches/Restore-chrome-password-store.patch index 0689054d421cf04d3627b088f4645a260b2d729e..4d0a4d7e72fc9cf54a3fbece84f5fdca446acca6 100644 --- a/build/cromite_patches/Restore-chrome-password-store.patch +++ b/build/cromite_patches/Restore-chrome-password-store.patch @@ -66,6 +66,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../android/pwm_disabled/BUILD.gn | 2 - .../password_store_backend_factory.cc | 14 +- ...ssword_manager_settings_service_factory.cc | 4 +- + chrome/browser/prefs/browser_prefs.cc | 7 - .../strings/android_chrome_strings.grd | 123 +++- .../Import-Password-Android.grdp | 9 + .../autofill/core/common/autofill_features.cc | 1 + @@ -83,7 +84,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../core/common/password_manager_pref_names.h | 2 - components/sync/service/sync_prefs.cc | 2 +- .../Restore-chrome-password-store.inc | 1 + - 75 files changed, 5536 insertions(+), 64 deletions(-) + 76 files changed, 5536 insertions(+), 71 deletions(-) create mode 100644 chrome/android/java/res/layout/password_no_result.xml create mode 100644 chrome/android/java/res/menu/save_password_preferences_action_bar_menu.xml create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java @@ -5993,6 +5994,23 @@ diff --git a/chrome/browser/password_manager/password_manager_settings_service_f profile->GetPrefs()); -#endif } +diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc +--- a/chrome/browser/prefs/browser_prefs.cc ++++ b/chrome/browser/prefs/browser_prefs.cc +@@ -3064,13 +3064,6 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs, + profile_prefs->ClearPref(kObsoletePasswordsUseUPMLocalAndSeparateStores); + profile_prefs->ClearPref(kObsoleteEmptyProfileStoreLoginDatabase); + profile_prefs->ClearPref(kObsoleteUpmAutoExportCsvNeedsDeletion); +- base::DeleteFile(profile_path.Append(FILE_PATH_LITERAL("Login Data"))); +- base::DeleteFile( +- profile_path.Append(FILE_PATH_LITERAL("Login Data For Account"))); +- base::DeleteFile( +- profile_path.Append(FILE_PATH_LITERAL("Login Data-journal"))); +- base::DeleteFile( +- profile_path.Append(FILE_PATH_LITERAL("Login Data For Account-journal"))); + #endif // BUILDFLAG(IS_ANDROID) + + // Added 09/2025. diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd diff --git a/build/cromite_patches/Revert-remove-allowscript-content-setting-secondary-url.patch b/build/cromite_patches/Revert-remove-allowscript-content-setting-secondary-url.patch index 56c6d50426fcd0e298ddfb8934b6ab350eb46704..a695120aa435dc01e1b542e730a2d3576202f8d1 100644 --- a/build/cromite_patches/Revert-remove-allowscript-content-setting-secondary-url.patch +++ b/build/cromite_patches/Revert-remove-allowscript-content-setting-secondary-url.patch @@ -288,7 +288,7 @@ diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc -@@ -623,7 +623,8 @@ void FrameFetchContext::AddClientHintsIfNecessary( +@@ -625,7 +625,8 @@ void FrameFetchContext::AddClientHintsIfNecessary( // Check if |url| is allowed to run JavaScript. If not, client hints are not // attached to the requests that initiate on the render side. @@ -298,7 +298,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi return; } -@@ -1086,15 +1087,26 @@ void FrameFetchContext::SetFirstPartyCookie(ResourceRequest& request) { +@@ -1088,15 +1089,26 @@ void FrameFetchContext::SetFirstPartyCookie(ResourceRequest& request) { } } diff --git a/build/cromite_patches/Site-setting-for-images.patch b/build/cromite_patches/Site-setting-for-images.patch index 59bd12775defbe1be0914ddb9163b2e7032389a1..e37d9734a3552d364945cdeb2f8f4d3eb9405b09 100644 --- a/build/cromite_patches/Site-setting-for-images.patch +++ b/build/cromite_patches/Site-setting-for-images.patch @@ -390,7 +390,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi fetcher->SetAutoLoadImages( frame->GetSettings()->GetLoadsImagesAutomatically()); fetcher->SetEarlyHintsPreloadedResources( -@@ -505,16 +506,13 @@ void FrameFetchContext::AddResourceTiming( +@@ -507,16 +508,13 @@ void FrameFetchContext::AddResourceTiming( ->AddResourceTiming(std::move(info), initiator_type); } diff --git a/build/cromite_patches/eyeo-133.0.6943.49-chrome_integration.patch b/build/cromite_patches/eyeo-133.0.6943.49-chrome_integration.patch index 01e118e538939741cbfa426151d7389abf55815e..6cd535225b072c110d899de065cf0709978608a7 100644 --- a/build/cromite_patches/eyeo-133.0.6943.49-chrome_integration.patch +++ b/build/cromite_patches/eyeo-133.0.6943.49-chrome_integration.patch @@ -4006,7 +4006,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn "../browser/after_startup_task_utils_unittest.cc", "../browser/apps/icon_standardizer_unittest.cc", "../browser/apps/user_type_filter_unittest.cc", -@@ -10867,6 +10878,7 @@ if (!is_android) { +@@ -10868,6 +10879,7 @@ if (!is_android) { "//chrome/browser/ui/views/frame:toolbar_button_provider", "//chrome/browser/ui/views/interaction", "//chrome/browser/ui/views/side_panel", diff --git a/build/e_patches/Browser-Modify-default-search-engines.patch b/build/e_patches/Browser-Modify-default-search-engines.patch index bc5934fa553b6e7298bd8161941c416bca503bde..7765124386659b8b95486db16f9b2296182cf3ca 100644 --- a/build/e_patches/Browser-Modify-default-search-engines.patch +++ b/build/e_patches/Browser-Modify-default-search-engines.patch @@ -1,4 +1,4 @@ -From a08ff33c2de8dce39e1998f22a2d08ae9681c2db Mon Sep 17 00:00:00 2001 +From e57560717bda51b705127676008ca14f06ef31a4 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Thu, 18 Mar 2021 13:42:44 +0100 Subject: Browser: Modify default search engines @@ -151,7 +151,7 @@ index 26c187bbcff33..60a32065acd26 100644 } } diff --git a/components/regional_capabilities/regional_capabilities_service.cc b/components/regional_capabilities/regional_capabilities_service.cc -index 3bf139c816ff7..8d7b5d7c2dd63 100644 +index c235574e0b469..bbf31224ca5de 100644 --- a/components/regional_capabilities/regional_capabilities_service.cc +++ b/components/regional_capabilities/regional_capabilities_service.cc @@ -271,6 +271,10 @@ RegionalCapabilitiesService::~RegionalCapabilitiesService() { diff --git a/build/e_patches/Multiple-fingerprinting-mitigations.patch b/build/e_patches/Multiple-fingerprinting-mitigations.patch index e54e810e04f97e43924b17a4af1cd4ed7357e684..421553174bb1d2cb72894fc7ca2b9b3ae966a8b9 100644 --- a/build/e_patches/Multiple-fingerprinting-mitigations.patch +++ b/build/e_patches/Multiple-fingerprinting-mitigations.patch @@ -1,4 +1,4 @@ -From 7964e88ac2d2b9dbcf1f348585efe46be7b303d8 Mon Sep 17 00:00:00 2001 +From 0e4d03920ed50b7032e7fcc0dd3be08e418a3b66 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Fri, 30 Mar 2018 10:09:03 +0200 Subject: Multiple fingerprinting mitigations @@ -66,7 +66,7 @@ index 1dca41c54804f..6b2fb381cbd40 100644 "//services/device/public/mojom:usb", "//services/image_annotation:service", diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 0144d94281cfc..2be1364863813 100644 +index 463034bd99d35..9b79899e3aa38 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -268,6 +268,8 @@ @@ -704,10 +704,10 @@ index 2c016b0cd581d..3e84dfeae63ab 100644 // Methods overridden by all sub-classes diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -index 4e9817aacb041..bac5907f64b1b 100644 +index 8a20854d95660..4b2127483fb0d 100644 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -3417,6 +3417,12 @@ +@@ -3424,6 +3424,12 @@ status: {"Mac": "test", "default": "stable"}, base_feature: "none", }, @@ -781,5 +781,5 @@ index 0000000000000..f1db5dba46d93 + +#endif // THIRD_PARTY_UNGOOGLED_FINGERPRINTING_SWITCHES_H_ -- -2.34.1 +2.51.2 diff --git a/build/e_patches/Update-i18n-zhCN-support.patch b/build/e_patches/Update-i18n-zhCN-support.patch index a401250e8eaa28975baa4bd8ac82085bd0c02f88..e1ce4fe88b3830a00ce9c38d5a849d5767ccc871 100644 --- a/build/e_patches/Update-i18n-zhCN-support.patch +++ b/build/e_patches/Update-i18n-zhCN-support.patch @@ -1,4 +1,4 @@ -From 54636d8a65b45747448c0a7b09b2d70b9f7ff20a Mon Sep 17 00:00:00 2001 +From 17891a400a2d0e83d31a7b903a17d8ee7e590344 Mon Sep 17 00:00:00 2001 From: mars Date: Sun, 2 Aug 2020 00:37:49 +0800 Subject: Update i18n zh_CN support @@ -15,10 +15,10 @@ Signed-off-by: Saalim Quadri 6 files changed, 133 insertions(+), 6 deletions(-) diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb -index 2f60b583fee1d..d5e65d40fa962 100644 +index 538e84e6c0ce2..d6eb8171b0dda 100644 --- a/chrome/app/resources/generated_resources_zh-CN.xtb +++ b/chrome/app/resources/generated_resources_zh-CN.xtb -@@ -11985,4 +11985,6 @@ +@@ -11984,4 +11984,6 @@ 您需要开启 Chrome 同步才能使用 Wi-Fi 同步功能。了解详情 同步标签页分组 检查(&N) @@ -121,7 +121,7 @@ index e8bd68419fb0e..40465e82fce32 100644 +全选 + diff --git a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb -index 06ca91210c145..3f5bef0e0bbad 100644 +index 9d3078e1fab52..22fdef4bf0bdc 100644 --- a/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb +++ b/components/browser_ui/strings/android/translations/browser_ui_strings_zh-CN.xtb @@ -734,4 +734,28 @@ @@ -156,7 +156,7 @@ index 06ca91210c145..3f5bef0e0bbad 100644 +WebRTC + diff --git a/components/strings/components_strings_zh-CN.xtb b/components/strings/components_strings_zh-CN.xtb -index db0782707ffff..0f37cdfe7e094 100644 +index 0f2f0ddde59fe..d0dcf3e91a0fa 100644 --- a/components/strings/components_strings_zh-CN.xtb +++ b/components/strings/components_strings_zh-CN.xtb @@ -5034,4 +5034,33 @@ @@ -208,5 +208,5 @@ index 5259e751b21cd..44cc7f0f184cd 100644 +无法保存到所选文件 + -- -2.34.1 +2.51.2 diff --git a/domain_substitution/domain_substitution.list b/domain_substitution/domain_substitution.list index 9ad808450c9c5cba96b6bf8628c7df089e62ee59..728abc736da3c28589136c26dd9e8ab27046533c 100644 --- a/domain_substitution/domain_substitution.list +++ b/domain_substitution/domain_substitution.list @@ -5690,8 +5690,10 @@ third_party/blink/renderer/core/html/forms/html_input_element.idl third_party/blink/renderer/core/html/forms/html_input_element_test.cc third_party/blink/renderer/core/html/forms/html_label_element.idl third_party/blink/renderer/core/html/forms/html_legend_element.idl +third_party/blink/renderer/core/html/forms/html_option_element.cc third_party/blink/renderer/core/html/forms/html_option_element.idl third_party/blink/renderer/core/html/forms/html_options_collection.idl +third_party/blink/renderer/core/html/forms/html_select_element.cc third_party/blink/renderer/core/html/forms/html_select_element.idl third_party/blink/renderer/core/html/forms/html_text_area_element.idl third_party/blink/renderer/core/html/forms/select_type.cc diff --git a/versions.txt b/versions.txt index 1cb9ba9a259eabaa4b37f37f9c025ed77fd0953b..32da5131f386139aed09ccc3418eac9f6d0854b9 100644 --- a/versions.txt +++ b/versions.txt @@ -1,3 +1,3 @@ -chromium_version="142.0.7444.48" -cromite_branch="v142.0.7444.60-28351d970456ac78902df4463190a35a7106df6c" -ungoogled_chromium_branch="142.0.7444.59-1" +chromium_version="142.0.7444.171" +cromite_branch="v142.0.7444.176-2124fd8aa7d29dd6e1b38d5514916881d7566992" +ungoogled_chromium_branch="142.0.7444.162-1"