From 94fb357b3e904414a3b075ba139fda941e53d37f Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Mon, 25 Jul 2022 03:32:52 +0200 Subject: [PATCH] Release 103.0.5060.140 --- CHANGELOG.md | 6 +- build/LASTCHANGE | 2 +- build/RELEASE | 2 +- build/RELEASE_COMMIT | 2 +- build/bromite_patches_list.txt | 1 + .../Add-bookmark-import-export-actions.patch | 16 +-- build/patches/Add-webGL-site-setting.patch | 4 +- build/patches/Add-webRTC-site-settings.patch | 4 +- .../Disable-feeds-support-by-default.patch | 2 +- .../Remove-navigator-connection-info.patch | 97 ------------------- .../Remove-navigator.connection-info.patch | 50 ++++++++++ ...moval-of-an-option-to-block-autoplay.patch | 4 +- 12 files changed, 74 insertions(+), 116 deletions(-) delete mode 100644 build/patches/Remove-navigator-connection-info.patch create mode 100644 build/patches/Remove-navigator.connection-info.patch diff --git a/CHANGELOG.md b/CHANGELOG.md index 4846f75b..1f1a1071 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,13 @@ +# 103.0.5060.140 +* fix timezone override not working correctly (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2133) +* never provide navigator.connection info (thanks to @uazo) +* fix management of custom User-Agent (thanks to @uazo) + # 103.0.5060.126 * fix malfunctioning sticky desktop mode (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2179) * fix non-working passwords manager (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2188) * fix crash when opening recent tabs (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2190) * fix autoplay not working correctly (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2096) -* fix timezone override not working correctly (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2133) * add GN flag for clangd builds (thanks to @uazo) # 103.0.5060.121 diff --git a/build/LASTCHANGE b/build/LASTCHANGE index e8ed7922..21bc755b 100644 --- a/build/LASTCHANGE +++ b/build/LASTCHANGE @@ -1 +1 @@ -83eeed453344b29deaef2d94cc6891fa6ac1a38c- \ No newline at end of file +51ecbe42916b78159bd646807da8580213ae2316- \ No newline at end of file diff --git a/build/RELEASE b/build/RELEASE index eb98cb45..e8e84fba 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -103.0.5060.126 \ No newline at end of file +103.0.5060.140 \ No newline at end of file diff --git a/build/RELEASE_COMMIT b/build/RELEASE_COMMIT index 28aef90d..cb0f34e9 100644 --- a/build/RELEASE_COMMIT +++ b/build/RELEASE_COMMIT @@ -1 +1 @@ -cf74dd45fea0e162e69c7cce1d6ccffa96aa3e62 \ No newline at end of file +e4e07e53c4ea2e8c573d029470ecfc244647fa98 \ No newline at end of file diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 9a0b2a31..2c315ac7 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -194,4 +194,5 @@ Remove-window-name-on-cross-origin-navigation.patch Remove-preload-of-com.google.android.gms.fonts.patch Partition-Blink-memory-cache.patch Add-gn-flag-for-clangd-builds.patch +Remove-navigator.connection-info.patch Automated-domain-substitution.patch diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index 4b0dc69c..135de476 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -1565,7 +1565,7 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.h b/chrome/utility/imp diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java --- a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java +++ b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java -@@ -39,6 +39,7 @@ import org.chromium.base.task.AsyncTask; +@@ -41,6 +41,7 @@ import org.chromium.base.task.AsyncTask; import org.chromium.base.task.PostTask; import org.chromium.base.task.TaskTraits; import org.chromium.ui.R; @@ -1573,7 +1573,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui import org.chromium.ui.UiUtils; import org.chromium.ui.permissions.PermissionConstants; -@@ -58,6 +59,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -63,6 +64,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick private static final String TAG = "SelectFileDialog"; private static final String IMAGE_TYPE = "image"; private static final String VIDEO_TYPE = "video"; @@ -1581,7 +1581,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui private static final String AUDIO_TYPE = "audio"; private static final String ALL_TYPES = "*/*"; -@@ -241,6 +243,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -246,6 +248,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick mFileTypes = fileTypes; } @@ -1593,7 +1593,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui /** * Creates and starts an intent based on the passed fileTypes and capture value. * @param fileTypes MIME types requested (i.e. "image/*") -@@ -267,7 +274,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -272,7 +279,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick List missingPermissions = new ArrayList<>(); String storagePermission = Manifest.permission.READ_EXTERNAL_STORAGE; boolean shouldUsePhotoPicker = shouldUsePhotoPicker(); @@ -1602,7 +1602,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui if (BuildInfo.isAtLeastT()) { if (!window.hasPermission(PermissionConstants.READ_MEDIA_IMAGES) && shouldShowImageTypes()) { -@@ -308,7 +315,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -313,7 +320,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick } // TODO(finnur): Remove once we figure out the cause of crbug.com/950024. @@ -1611,7 +1611,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui if (permissions.length != requestPermissions.length) { throw new RuntimeException( String.format("Permissions arrays misaligned: %d != %d", -@@ -322,7 +329,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -327,7 +334,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick } } @@ -1620,7 +1620,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui if (permissions[i].equals(storagePermission) || permissions[i].equals(PermissionConstants.READ_MEDIA_IMAGES) || permissions[i].equals( -@@ -523,6 +530,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -528,6 +535,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick } if (!mimeTypes.contains(mimeType)) mimeTypes.add(mimeType); } @@ -1628,7 +1628,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui return mimeTypes; } -@@ -828,6 +836,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick +@@ -851,6 +859,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick return countAcceptTypesFor(superType) == mFileTypes.size(); } diff --git a/build/patches/Add-webGL-site-setting.patch b/build/patches/Add-webGL-site-setting.patch index 989064e8..0421d203 100644 --- a/build/patches/Add-webGL-site-setting.patch +++ b/build/patches/Add-webGL-site-setting.patch @@ -339,7 +339,7 @@ diff --git a/components/content_settings/core/common/content_settings_types.h b/ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc --- a/components/content_settings/renderer/content_settings_agent_impl.cc +++ b/components/content_settings/renderer/content_settings_agent_impl.cc -@@ -455,6 +455,15 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() { +@@ -449,6 +449,15 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() { cached_script_permissions_.clear(); } @@ -358,7 +358,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc diff --git a/components/content_settings/renderer/content_settings_agent_impl.h b/components/content_settings/renderer/content_settings_agent_impl.h --- a/components/content_settings/renderer/content_settings_agent_impl.h +++ b/components/content_settings/renderer/content_settings_agent_impl.h -@@ -94,6 +94,7 @@ class ContentSettingsAgentImpl +@@ -99,6 +99,7 @@ class ContentSettingsAgentImpl bool AllowAutoplay(bool default_value) override; bool AllowPopupsAndRedirects(bool default_value) override; bool ShouldAutoupgradeMixedContent() override; diff --git a/build/patches/Add-webRTC-site-settings.patch b/build/patches/Add-webRTC-site-settings.patch index 068da13d..8619eb38 100644 --- a/build/patches/Add-webRTC-site-settings.patch +++ b/build/patches/Add-webRTC-site-settings.patch @@ -335,7 +335,7 @@ diff --git a/components/content_settings/core/common/content_settings_types.h b/ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc --- a/components/content_settings/renderer/content_settings_agent_impl.cc +++ b/components/content_settings/renderer/content_settings_agent_impl.cc -@@ -464,6 +464,15 @@ bool ContentSettingsAgentImpl::AllowWebgl(bool enabled_per_settings) { +@@ -458,6 +458,15 @@ bool ContentSettingsAgentImpl::AllowWebgl(bool enabled_per_settings) { url::Origin(frame->GetDocument().GetSecurityOrigin()).GetURL()); } @@ -354,7 +354,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc diff --git a/components/content_settings/renderer/content_settings_agent_impl.h b/components/content_settings/renderer/content_settings_agent_impl.h --- a/components/content_settings/renderer/content_settings_agent_impl.h +++ b/components/content_settings/renderer/content_settings_agent_impl.h -@@ -95,6 +95,7 @@ class ContentSettingsAgentImpl +@@ -100,6 +100,7 @@ class ContentSettingsAgentImpl bool AllowPopupsAndRedirects(bool default_value) override; bool ShouldAutoupgradeMixedContent() override; bool AllowWebgl(bool enabled_per_settings) override; diff --git a/build/patches/Disable-feeds-support-by-default.patch b/build/patches/Disable-feeds-support-by-default.patch index edc3893f..7590d5e9 100644 --- a/build/patches/Disable-feeds-support-by-default.patch +++ b/build/patches/Disable-feeds-support-by-default.patch @@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java --- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java +++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java -@@ -44,13 +44,7 @@ public final class FeedFeatures { +@@ -42,13 +42,7 @@ public final class FeedFeatures { * the user is signed in and confirms it's not a child profile. */ public static boolean isWebFeedUIEnabled() { diff --git a/build/patches/Remove-navigator-connection-info.patch b/build/patches/Remove-navigator-connection-info.patch deleted file mode 100644 index 2cbf9574..00000000 --- a/build/patches/Remove-navigator-connection-info.patch +++ /dev/null @@ -1,97 +0,0 @@ -From: uazo -Date: Thu, 14 Jul 2022 09:48:45 +0000 -Subject: Remove navigator.connection info - -Change the result of navigator.connection to default values -and disable observers ---- - .../renderer/modules/netinfo/network_information.cc | 7 ++++++- - .../renderer/modules/netinfo/network_information.h | 1 + - .../platform/network/network_state_notifier.cc | 11 +++++++++++ - .../platform/network/network_state_notifier.h | 2 +- - 4 files changed, 19 insertions(+), 2 deletions(-) - -diff --git a/third_party/blink/renderer/modules/netinfo/network_information.cc b/third_party/blink/renderer/modules/netinfo/network_information.cc ---- a/third_party/blink/renderer/modules/netinfo/network_information.cc -+++ b/third_party/blink/renderer/modules/netinfo/network_information.cc -@@ -61,7 +61,7 @@ NetworkInformation::~NetworkInformation() { - } - - bool NetworkInformation::IsObserving() const { -- return !!connection_observer_handle_; -+ return !!connection_observer_handle_ || is_fake_observing_; - } - - String NetworkInformation::type() const { -@@ -147,6 +147,7 @@ void NetworkInformation::ConnectionChange( - const absl::optional& transport_rtt, - const absl::optional& downlink_mbps, - bool save_data) { -+ if ((true)) return; - DCHECK(GetExecutionContext()->IsContextThread()); - - const String host = Host(); -@@ -242,6 +243,8 @@ void NetworkInformation::ContextDestroyed() { - } - - void NetworkInformation::StartObserving() { -+ is_fake_observing_ = true; -+ if ((true)) return; - if (!IsObserving() && !context_stopped_) { - type_ = GetNetworkStateNotifier().ConnectionType(); - DCHECK(!connection_observer_handle_); -@@ -252,6 +255,8 @@ void NetworkInformation::StartObserving() { - } - - void NetworkInformation::StopObserving() { -+ is_fake_observing_ = false; -+ if ((true)) return; - if (IsObserving()) { - DCHECK(connection_observer_handle_); - connection_observer_handle_ = nullptr; -diff --git a/third_party/blink/renderer/modules/netinfo/network_information.h b/third_party/blink/renderer/modules/netinfo/network_information.h ---- a/third_party/blink/renderer/modules/netinfo/network_information.h -+++ b/third_party/blink/renderer/modules/netinfo/network_information.h -@@ -118,6 +118,7 @@ class NetworkInformation final - - std::unique_ptr - connection_observer_handle_; -+ bool is_fake_observing_ = false; - }; - - } // namespace blink -diff --git a/third_party/blink/renderer/platform/network/network_state_notifier.cc b/third_party/blink/renderer/platform/network/network_state_notifier.cc ---- a/third_party/blink/renderer/platform/network/network_state_notifier.cc -+++ b/third_party/blink/renderer/platform/network/network_state_notifier.cc -@@ -522,6 +522,17 @@ NetworkStateNotifier::GetWebHoldbackDownlinkThroughputMbps() const { - return absl::nullopt; - } - -+NetworkStateNotifier::NetworkStateNotifier() : has_override_(false) { -+ // set default data -+ // see third_party/blink/renderer/platform/network/network_state_notifier_test.cc -+ SetNetworkConnectionInfoOverride( -+ /*on_line*/true, -+ /*type*/WebConnectionType::kWebConnectionTypeUnknown, -+ /*effective_type*/absl::nullopt, -+ /*http_rtt_msec*/0, -+ /*max_bandwidth_mbps*/0); -+} -+ - void NetworkStateNotifier::GetMetricsWithWebHoldback( - WebConnectionType* type, - double* downlink_max_mbps, -diff --git a/third_party/blink/renderer/platform/network/network_state_notifier.h b/third_party/blink/renderer/platform/network/network_state_notifier.h ---- a/third_party/blink/renderer/platform/network/network_state_notifier.h -+++ b/third_party/blink/renderer/platform/network/network_state_notifier.h -@@ -122,7 +122,7 @@ class PLATFORM_EXPORT NetworkStateNotifier { - scoped_refptr task_runner_; - }; - -- NetworkStateNotifier() : has_override_(false) {} -+ NetworkStateNotifier(); - NetworkStateNotifier(const NetworkStateNotifier&) = delete; - NetworkStateNotifier& operator=(const NetworkStateNotifier&) = delete; - --- -2.25.1 diff --git a/build/patches/Remove-navigator.connection-info.patch b/build/patches/Remove-navigator.connection-info.patch new file mode 100644 index 00000000..422b1835 --- /dev/null +++ b/build/patches/Remove-navigator.connection-info.patch @@ -0,0 +1,50 @@ +From: uazo +Date: Thu, 14 Jul 2022 09:48:45 +0000 +Subject: Remove navigator.connection info + +Change the result of navigator.connection to default values +and disable observers +--- + .../blink/renderer/modules/netinfo/network_information.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/third_party/blink/renderer/modules/netinfo/network_information.cc b/third_party/blink/renderer/modules/netinfo/network_information.cc +--- a/third_party/blink/renderer/modules/netinfo/network_information.cc ++++ b/third_party/blink/renderer/modules/netinfo/network_information.cc +@@ -61,7 +61,7 @@ NetworkInformation::~NetworkInformation() { + } + + bool NetworkInformation::IsObserving() const { +- return !!connection_observer_handle_; ++ return false; + } + + String NetworkInformation::type() const { +@@ -147,6 +147,7 @@ void NetworkInformation::ConnectionChange( + const absl::optional& transport_rtt, + const absl::optional& downlink_mbps, + bool save_data) { ++ if ((true)) return; + DCHECK(GetExecutionContext()->IsContextThread()); + + const String host = Host(); +@@ -242,6 +243,8 @@ void NetworkInformation::ContextDestroyed() { + } + + void NetworkInformation::StartObserving() { ++ //is_fake_observing_ = true; ++ if ((true)) return; + if (!IsObserving() && !context_stopped_) { + type_ = GetNetworkStateNotifier().ConnectionType(); + DCHECK(!connection_observer_handle_); +@@ -252,6 +255,8 @@ void NetworkInformation::StartObserving() { + } + + void NetworkInformation::StopObserving() { ++ //is_fake_observing_ = false; ++ if ((true)) return; + if (IsObserving()) { + DCHECK(connection_observer_handle_); + connection_observer_handle_ = nullptr; +-- +2.25.1 diff --git a/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch b/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch index 6c93c6a3..78840420 100644 --- a/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch +++ b/build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch @@ -458,7 +458,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc --- a/components/content_settings/renderer/content_settings_agent_impl.cc +++ b/components/content_settings/renderer/content_settings_agent_impl.cc -@@ -402,6 +402,17 @@ bool ContentSettingsAgentImpl::AllowRunningInsecureContent( +@@ -396,6 +396,17 @@ bool ContentSettingsAgentImpl::AllowRunningInsecureContent( return false; } @@ -479,7 +479,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc diff --git a/components/content_settings/renderer/content_settings_agent_impl.h b/components/content_settings/renderer/content_settings_agent_impl.h --- a/components/content_settings/renderer/content_settings_agent_impl.h +++ b/components/content_settings/renderer/content_settings_agent_impl.h -@@ -91,6 +91,7 @@ class ContentSettingsAgentImpl +@@ -96,6 +96,7 @@ class ContentSettingsAgentImpl void DidNotAllowScript() override; bool AllowRunningInsecureContent(bool allowed_per_settings, const blink::WebURL& url) override;