Update googleurl from upstream This updates googleurl to use the Chromium upstream version d503e75e0fb4786a746b33025e1d43e381b904b4 from Wed Dec 28 11:36:46 2022. Change-Id: I688b004619ba0edda986fa031ac979f83e5f89e7
diff --git a/AUTHORS b/AUTHORS index 0e64013..a2016b0 100644 --- a/AUTHORS +++ b/AUTHORS
@@ -335,6 +335,7 @@ Dongyu Lin <l2d4y3@gmail.com> Donna Wu <donna.wu@intel.com> Douglas F. Turner <doug.turner@gmail.com> +Drew Blaisdell <drew.blaisdell@gmail.com> Dustin Doloff <doloffd@amazon.com> Ebrahim Byagowi <ebrahim@gnu.org> Ebrahim Byagowi <ebraminio@gmail.com> @@ -1056,6 +1057,7 @@ Ryuan Choi <ryuan.choi@samsung.com> Saikrishna Arcot <saiarcot895@gmail.com> Sajal Khandelwal <skhandelwa22@bloomberg.net> +Saksham Mittal <gotlouemail@gmail.com> Salvatore Iovene <salvatore.iovene@intel.com> Sam Larison <qufighter@gmail.com> Sam McDonald <sam@sammcd.com>
diff --git a/base/numerics/safe_conversions.h b/base/numerics/safe_conversions.h index 3e04bf4..4a9494e 100644 --- a/base/numerics/safe_conversions.h +++ b/base/numerics/safe_conversions.h
@@ -20,6 +20,10 @@ #define BASE_HAS_OPTIMIZED_SAFE_CONVERSIONS (0) #endif +#if !BASE_NUMERICS_DISABLE_OSTREAM_OPERATORS +#include <ostream> +#endif + namespace gurl_base { namespace internal {
diff --git a/url/url_canon_internal.cc b/url/url_canon_internal.cc index 393fc4b..dd19af2 100644 --- a/url/url_canon_internal.cc +++ b/url/url_canon_internal.cc
@@ -49,11 +49,11 @@ auto mask = b >= 0x24 && b <= 0x7e && b != 0x27 && b != 0x3c && b != 0x3e; #ifdef __SSE2__ - if (_mm_movemask_epi8(mask) != 0xffff) { + if (_mm_movemask_epi8(reinterpret_cast<__m128i>(mask)) != 0xffff) { return i; } #else - if (vminvq_u8(mask) == 0) { + if (vminvq_u8(reinterpret_cast<uint8x16_t>(mask)) == 0) { return i; } #endif
diff --git a/url/url_features.cc b/url/url_features.cc index 149cd4a..877d846 100644 --- a/url/url_features.cc +++ b/url/url_features.cc
@@ -10,7 +10,17 @@ "UseIDNA2008NonTransitional", gurl_base::FEATURE_ENABLED_BY_DEFAULT); +// Kill switch for crbug.com/1362507. +BASE_FEATURE(kRecordIDNA2008Metrics, + "RecordIDNA2008Metrics", + gurl_base::FEATURE_ENABLED_BY_DEFAULT); + bool IsUsingIDNA2008NonTransitional() { return gurl_base::FeatureList::IsEnabled(kUseIDNA2008NonTransitional); } + +bool IsRecordingIDNA2008Metrics() { + return gurl_base::FeatureList::IsEnabled(kRecordIDNA2008Metrics); +} + } // namespace url
diff --git a/url/url_features.h b/url/url_features.h index 3fed085..e1b62be 100644 --- a/url/url_features.h +++ b/url/url_features.h
@@ -14,6 +14,10 @@ // Returns true if Chrome is using IDNA 2008 in Non-Transitional mode. COMPONENT_EXPORT(URL) bool IsUsingIDNA2008NonTransitional(); + +// Returns true if Chrome is recording IDNA 2008 related metrics. +COMPONENT_EXPORT(URL) bool IsRecordingIDNA2008Metrics(); + } // namespace url #endif // URL_URL_FEATURES_H_