summaryrefslogtreecommitdiff
path: root/dev-qt/qtwebengine/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-03-27 06:06:27 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-03-27 06:06:27 +0000
commit8d5dbd847cbc704a6a06405856e94b461011afe3 (patch)
tree4d26462d027b14926335894749d2e01d982234d0 /dev-qt/qtwebengine/files
parent5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (diff)
gentoo resync : 27.03.2021
Diffstat (limited to 'dev-qt/qtwebengine/files')
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch37
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.15.2-icu-68-v8-runtime-fix.patch170
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.15.2-icu-68.patch302
3 files changed, 37 insertions, 472 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch
new file mode 100644
index 000000000000..4fb19ccdd2e5
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch
@@ -0,0 +1,37 @@
+From 463f1234c57a36e78ff666bd55094a9d4e68f296 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 18 Jan 2020 23:52:55 +0100
+Subject: [PATCH 1/3] Enable ppc64 builds
+
+---
+ configure.pri | 1 +
+ mkspecs/features/functions.prf | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/configure.pri b/configure.pri
+index 3a144e3f8..cabe8b24a 100644
+--- a/configure.pri 2021-02-24 10:45:58.000000000 +0100
++++ - 2021-03-07 21:18:43.124754796 +0100
+@@ -144,6 +144,7 @@
+ contains(QT_ARCH, "arm")|contains(QT_ARCH, "arm64"): return(true)
+ contains(QT_ARCH, "mips"): return(true)
+ contains(QT_ARCH, "mips64"): return(true)
++ contains(QT_ARCH, "power64"): return(true)
+ qtLog("Architecture not supported.")
+ return(false)
+ }
+diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
+index 512e2523b..e31123654 100644
+--- a/mkspecs/features/functions.prf 2021-02-24 10:45:58.000000000 +0100
++++ - 2021-03-07 21:19:21.345036293 +0100
+@@ -107,6 +107,7 @@
+ contains(qtArch, "mips"): return(mipsel)
+ contains(qtArch, "mips64"): return(mips64el)
+ contains(qtArch, "mips64el"): return(mips64el)
++ contains(qtArch, "power64"): return(ppc64)
+ return(unknown)
+ }
+
+--
+2.26.0
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-icu-68-v8-runtime-fix.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-icu-68-v8-runtime-fix.patch
deleted file mode 100644
index 7d6401759a78..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-icu-68-v8-runtime-fix.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From b0a7f5691113534c2cf771f2dd3cece5e93bc7d4 Mon Sep 17 00:00:00 2001
-From: Frank Tang <ftang@chromium.org>
-Date: Tue, 03 Nov 2020 23:20:37 -0800
-Subject: [PATCH] Update to ICU68-1
-
-ICU68-1 change the output skeleton format. So we need to change
-resolvedOptions code for 68 migration.
-
-Chromium roll
-https://chromium-review.googlesource.com/c/chromium/src/+/2474093
-
-Bug: v8:10945
-Change-Id: I3b2c7fbe8abb22df8fa51287c498ca3245b8c55b
-Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2477431
-Commit-Queue: Frank Tang <ftang@chromium.org>
-Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
-Reviewed-by: Shu-yu Guo <syg@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#70972}
-
-(ported to work with <ICU-68.1 and rebased to qtwebengine)
----
-
-diff --git a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
-index 6f3d97a619..83cf021fb1 100644
---- a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
-+++ b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
-@@ -390,17 +390,20 @@ Handle<String> CurrencySignString(Isolate* isolate,
- Handle<String> UnitDisplayString(Isolate* isolate,
- const icu::UnicodeString& skeleton) {
- // Ex: skeleton as
-- // "measure-unit/length-meter .### rounding-mode-half-up unit-width-full-name"
-+ // <ICU-68.1: "measure-unit/length-meter .### rounding-mode-half-up unit-width-full-name".
-+ // >=ICU-68.1: "unit/length-meter .### rounding-mode-half-up unit-width-full-name"
- if (skeleton.indexOf("unit-width-full-name") >= 0) {
- return ReadOnlyRoots(isolate).long_string_handle();
- }
- // Ex: skeleton as
-- // "measure-unit/length-meter .### rounding-mode-half-up unit-width-narrow".
-+ // <ICU-68.1: "measure-unit/length-meter .### rounding-mode-half-up unit-width-narrow".
-+ // >=ICU-68.1: "unit/length-meter .### rounding-mode-half-up unit-width-narrow".
- if (skeleton.indexOf("unit-width-narrow") >= 0) {
- return ReadOnlyRoots(isolate).narrow_string_handle();
- }
- // Ex: skeleton as
-- // "measure-unit/length-foot .### rounding-mode-half-up"
-+ // <ICU-68.1: "measure-unit/length-foot .### rounding-mode-half-up"
-+ // >=ICU-68.1: "unit/length-foot .### rounding-mode-half-up"
- return ReadOnlyRoots(isolate).short_string_handle();
- }
-
-@@ -423,7 +426,8 @@ Notation NotationFromSkeleton(const icu::UnicodeString& skeleton) {
- return Notation::COMPACT;
- }
- // Ex: skeleton as
-- // "measure-unit/length-foot .### rounding-mode-half-up"
-+ // <ICU-68.1: "measure-unit/length-foot .### rounding-mode-half-up"
-+ // >=ICU-68.1: "unit/length-foot .### rounding-mode-half-up"
- return Notation::STANDARD;
- }
-
-@@ -563,14 +567,23 @@ namespace {
-
- // Ex: percent .### rounding-mode-half-up
- // Special case for "percent"
--// Ex: "measure-unit/length-kilometer per-measure-unit/duration-hour .###
--// rounding-mode-half-up" should return "kilometer-per-unit".
--// Ex: "measure-unit/duration-year .### rounding-mode-half-up" should return
--// "year".
-+// <ICU-68.1:
-+// Ex: "measure-unit/length-kilometer per-measure-unit/duration-hour .###
-+// rounding-mode-half-up" should return "kilometer-per-unit".
-+// Ex: "measure-unit/duration-year .### rounding-mode-half-up" should return
-+// >=ICU-68.1:
-+// Ex: "unit/milliliter-per-acre .### rounding-mode-half-up"
-+// should return "milliliter-per-acre".
-+// Ex: "unit/year .### rounding-mode-half-up" should return
-+// "year".
- std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) {
- std::string str;
- str = skeleton.toUTF8String<std::string>(str);
-+#if U_ICU_VERSION_MAJOR_NUM < 68
- std::string search("measure-unit/");
-+#else
-+ std::string search("unit/");
-+#endif
- size_t begin = str.find(search);
- if (begin == str.npos) {
- // Special case for "percent".
-@@ -579,20 +592,41 @@ std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) {
- }
- return "";
- }
-+#if U_ICU_VERSION_MAJOR_NUM < 68
- // Skip the type (ex: "length").
- // "measure-unit/length-kilometer per-measure-unit/duration-hour"
- // b
- begin = str.find("-", begin + search.size());
-+#else
-+ // Ex:
-+ // "unit/acre .### rounding-mode-half-up"
-+ // b
-+ // Ex:
-+ // "unit/milliliter-per-acre .### rounding-mode-half-up"
-+ // b
-+ begin += search.size();
-+#endif
- if (begin == str.npos) {
- return "";
- }
-+#if U_ICU_VERSION_MAJOR_NUM < 68
- begin++; // Skip the '-'.
-+#endif
- // Find the end of the subtype.
- size_t end = str.find(" ", begin);
-- // "measure-unit/length-kilometer per-measure-unit/duration-hour"
-- // b e
-+ // <ICU-68.1:
-+ // "measure-unit/length-kilometer per-measure-unit/duration-hour"
-+ // b e
-+ // >=ICU-68.1:
-+ // Ex:
-+ // "unit/acre .### rounding-mode-half-up"
-+ // b e
-+ // Ex:
-+ // "unit/milliliter-per-acre .### rounding-mode-half-up"
-+ // b e
- if (end == str.npos) {
- end = str.size();
-+#if U_ICU_VERSION_MAJOR_NUM < 68
- return str.substr(begin, end - begin);
- }
- // "measure-unit/length-kilometer per-measure-unit/duration-hour"
-@@ -626,18 +660,37 @@ std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) {
- // "measure-unit/length-kilometer per-measure-unit/duration-hour"
- // [result ] b e
- return result + "-per-" + str.substr(begin, end - begin);
-+#else
-+ }
-+ return str.substr(begin, end - begin);
-+#endif
- }
-
- Style StyleFromSkeleton(const icu::UnicodeString& skeleton) {
- if (skeleton.indexOf("currency/") >= 0) {
- return Style::CURRENCY;
- }
-+#if U_ICU_VERSION_MAJOR_NUM < 68
- if (skeleton.indexOf("measure-unit/") >= 0) {
-+#else
-+ if (skeleton.indexOf("unit/") >= 0) {
-+#endif
- return Style::UNIT;
- }
-+#if U_ICU_VERSION_MAJOR_NUM < 68
- if (skeleton.indexOf("percent ") >= 0) {
- return Style::PERCENT;
- }
-+#else
-+ if (skeleton.indexOf("percent") >= 0) {
-+ // percent precision-integer rounding-mode-half-up scale/100
-+ if (skeleton.indexOf("scale/100") >= 0) {
-+ return Style::PERCENT;
-+ } else {
-+ return Style::UNIT;
-+ }
-+ }
-+#endif
- return Style::DECIMAL;
- }
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-icu-68.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-icu-68.patch
deleted file mode 100644
index 4b31703090fe..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-icu-68.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-From 9236b21c883360482bd2c06929bfdecbc47f186c Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Mon, 16 Nov 2020 13:16:13 +0100
-Subject: Fix build with system ICU 68
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes: QTBUG-88116
-Change-Id: I935babf51c2670fad7cc7950a2fe07eb2829c4cb
-Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
----
- chromium/base/i18n/string_compare.cc | 4 ++--
- chromium/base/i18n/time_formatting.cc | 2 +-
- .../components/autofill/core/common/autofill_regexes.cc | 8 ++++----
- .../spellcheck/renderer/spellcheck_worditerator.cc | 2 +-
- .../url_formatter/spoof_checks/idn_spoof_checker.cc | 4 ++--
- .../url_formatter/spoof_checks/skeleton_generator.cc | 2 +-
- chromium/services/service_manager/zygote/zygote_linux.cc | 2 +-
- .../blink/renderer/platform/text/locale_icu.cc | 4 ++--
- .../renderer/platform/text/text_break_iterator_icu.cc | 16 ++++++++--------
- .../blink/renderer/platform/text/unicode_utilities.cc | 2 +-
- .../blink/renderer/platform/wtf/text/text_codec_icu.cc | 2 +-
- chromium/ui/base/l10n/formatter.cc | 6 +++---
- 12 files changed, 27 insertions(+), 27 deletions(-)
-
-diff --git a/chromium/base/i18n/string_compare.cc b/chromium/base/i18n/string_compare.cc
-index 6cd59b98f49..a5fa502b53f 100644
---- a/src/3rdparty/chromium/base/i18n/string_compare.cc
-+++ b/src/3rdparty/chromium/base/i18n/string_compare.cc
-@@ -18,8 +18,8 @@ UCollationResult CompareString16WithCollator(const icu::Collator& collator,
- StringPiece16 rhs) {
- UErrorCode error = U_ZERO_ERROR;
- UCollationResult result = collator.compare(
-- icu::UnicodeString(FALSE, lhs.data(), static_cast<int>(lhs.length())),
-- icu::UnicodeString(FALSE, rhs.data(), static_cast<int>(rhs.length())),
-+ icu::UnicodeString(false, lhs.data(), static_cast<int>(lhs.length())),
-+ icu::UnicodeString(false, rhs.data(), static_cast<int>(rhs.length())),
- error);
- DCHECK(U_SUCCESS(error));
- return result;
-diff --git a/chromium/base/i18n/time_formatting.cc b/chromium/base/i18n/time_formatting.cc
-index 1a6c1389ba0..106dd0e5b47 100644
---- a/src/3rdparty/chromium/base/i18n/time_formatting.cc
-+++ b/src/3rdparty/chromium/base/i18n/time_formatting.cc
-@@ -236,7 +236,7 @@ bool TimeDurationFormatWithSeconds(const TimeDelta time,
- icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE);
- measure_format.formatMeasures(measures, 3, formatted, ignore, status);
- *out = i18n::UnicodeStringToString16(formatted);
-- return U_SUCCESS(status) == TRUE;
-+ return U_SUCCESS(status) == true;
- }
-
- string16 DateIntervalFormat(const Time& begin_time,
-diff --git a/chromium/components/autofill/core/common/autofill_regexes.cc b/chromium/components/autofill/core/common/autofill_regexes.cc
-index b141cb2d0f6..a8a688d50c7 100644
---- a/src/3rdparty/chromium/components/autofill/core/common/autofill_regexes.cc
-+++ b/src/3rdparty/chromium/components/autofill/core/common/autofill_regexes.cc
-@@ -43,7 +43,7 @@ class AutofillRegexes {
- icu::RegexMatcher* AutofillRegexes::GetMatcher(const base::string16& pattern) {
- auto it = matchers_.find(pattern);
- if (it == matchers_.end()) {
-- const icu::UnicodeString icu_pattern(FALSE, pattern.data(),
-+ const icu::UnicodeString icu_pattern(false, pattern.data(),
- pattern.length());
-
- UErrorCode status = U_ZERO_ERROR;
-@@ -70,20 +70,20 @@ bool MatchesPattern(const base::string16& input,
- base::AutoLock lock(*g_lock);
-
- icu::RegexMatcher* matcher = g_autofill_regexes->GetMatcher(pattern);
-- icu::UnicodeString icu_input(FALSE, input.data(), input.length());
-+ icu::UnicodeString icu_input(false, input.data(), input.length());
- matcher->reset(icu_input);
-
- UErrorCode status = U_ZERO_ERROR;
- UBool matched = matcher->find(0, status);
- DCHECK(U_SUCCESS(status));
-
-- if (matched == TRUE && match) {
-+ if (matched == true && match) {
- icu::UnicodeString match_unicode = matcher->group(0, status);
- DCHECK(U_SUCCESS(status));
- *match = base::i18n::UnicodeStringToString16(match_unicode);
- }
-
-- return matched == TRUE;
-+ return matched == true;
- }
-
- } // namespace autofill
-diff --git a/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc b/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc
-index 8fe8a6df381..e3a65580c08 100644
---- a/src/3rdparty/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc
-+++ b/src/3rdparty/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc
-@@ -424,7 +424,7 @@ bool SpellcheckWordIterator::Normalize(size_t input_start,
- // spellchecker and we need manual normalization as well. The normalized
- // text does not have to be NUL-terminated since its characters are copied to
- // string16, which adds a NUL character when we need.
-- icu::UnicodeString input(FALSE, &text_[input_start],
-+ icu::UnicodeString input(false, &text_[input_start],
- base::checked_cast<int32_t>(input_length));
- UErrorCode status = U_ZERO_ERROR;
- icu::UnicodeString output;
-diff --git a/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc b/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc
-index 1964793fd3e..c4e01026c38 100644
---- a/src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc
-+++ b/src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc
-@@ -347,7 +347,7 @@ bool IDNSpoofChecker::SafeToDisplayAsUnicode(
- if (U_FAILURE(status) || (result & USPOOF_ALL_CHECKS))
- return false;
-
-- icu::UnicodeString label_string(FALSE /* isTerminated */, label.data(),
-+ icu::UnicodeString label_string(false /* isTerminated */, label.data(),
- base::checked_cast<int32_t>(label.size()));
-
- // A punycode label with 'xn--' prefix is not subject to the URL
-@@ -677,7 +677,7 @@ bool IDNSpoofChecker::IsWholeScriptConfusableAllowedForTLD(
- base::StringPiece tld,
- base::StringPiece16 tld_unicode) {
- icu::UnicodeString tld_string(
-- FALSE /* isTerminated */, tld_unicode.data(),
-+ false /* isTerminated */, tld_unicode.data(),
- base::checked_cast<int32_t>(tld_unicode.size()));
- // Allow if the TLD contains any letter from the script, in which case it's
- // likely to be a TLD in that script.
-diff --git a/chromium/components/url_formatter/spoof_checks/skeleton_generator.cc b/chromium/components/url_formatter/spoof_checks/skeleton_generator.cc
-index 41485914007..b8c1c2f547a 100644
---- a/src/3rdparty/chromium/components/url_formatter/spoof_checks/skeleton_generator.cc
-+++ b/src/3rdparty/chromium/components/url_formatter/spoof_checks/skeleton_generator.cc
-@@ -117,7 +117,7 @@ SkeletonGenerator::~SkeletonGenerator() = default;
- Skeletons SkeletonGenerator::GetSkeletons(base::StringPiece16 hostname) {
- Skeletons skeletons;
- size_t hostname_length = hostname.length() - (hostname.back() == '.' ? 1 : 0);
-- icu::UnicodeString host(FALSE, hostname.data(), hostname_length);
-+ icu::UnicodeString host(false, hostname.data(), hostname_length);
- // If input has any characters outside Latin-Greek-Cyrillic and [0-9._-],
- // there is no point in getting rid of diacritics because combining marks
- // attached to non-LGC characters are already blocked.
-diff --git a/chromium/services/service_manager/zygote/zygote_linux.cc b/chromium/services/service_manager/zygote/zygote_linux.cc
-index aa601ab28d7..920438e5b50 100644
---- a/src/3rdparty/chromium/services/service_manager/zygote/zygote_linux.cc
-+++ b/src/3rdparty/chromium/services/service_manager/zygote/zygote_linux.cc
-@@ -564,7 +564,7 @@ base::ProcessId Zygote::ReadArgsAndFork(base::PickleIterator iter,
- if (!iter.ReadString16(&timezone_id))
- return -1;
- icu::TimeZone::adoptDefault(icu::TimeZone::createTimeZone(
-- icu::UnicodeString(FALSE, timezone_id.data(), timezone_id.length())));
-+ icu::UnicodeString(false, timezone_id.data(), timezone_id.length())));
-
- if (!iter.ReadInt(&numfds))
- return -1;
-diff --git a/chromium/third_party/blink/renderer/platform/text/locale_icu.cc b/chromium/third_party/blink/renderer/platform/text/locale_icu.cc
-index abff1b1d809..57f1286d4e4 100644
---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/locale_icu.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/locale_icu.cc
-@@ -169,12 +169,12 @@ static String GetDateFormatPattern(const UDateFormat* date_format) {
- return g_empty_string;
-
- UErrorCode status = U_ZERO_ERROR;
-- int32_t length = udat_toPattern(date_format, TRUE, nullptr, 0, &status);
-+ int32_t length = udat_toPattern(date_format, true, nullptr, 0, &status);
- if (status != U_BUFFER_OVERFLOW_ERROR || !length)
- return g_empty_string;
- StringBuffer<UChar> buffer(length);
- status = U_ZERO_ERROR;
-- udat_toPattern(date_format, TRUE, buffer.Characters(), length, &status);
-+ udat_toPattern(date_format, true, buffer.Characters(), length, &status);
- if (U_FAILURE(status))
- return g_empty_string;
- return String::Adopt(buffer);
-diff --git a/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc b/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
-index a257cd75ccf..898d0c47bb1 100644
---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
-@@ -311,13 +311,13 @@ static inline bool TextInChunkOrOutOfRange(UText* text,
- text->chunkOffset = offset <= std::numeric_limits<int32_t>::max()
- ? static_cast<int32_t>(offset)
- : 0;
-- is_accessible = TRUE;
-+ is_accessible = true;
- return true;
- }
- if (native_index >= native_length &&
- text->chunkNativeLimit == native_length) {
- text->chunkOffset = text->chunkLength;
-- is_accessible = FALSE;
-+ is_accessible = false;
- return true;
- }
- } else {
-@@ -330,12 +330,12 @@ static inline bool TextInChunkOrOutOfRange(UText* text,
- text->chunkOffset = offset <= std::numeric_limits<int32_t>::max()
- ? static_cast<int32_t>(offset)
- : 0;
-- is_accessible = TRUE;
-+ is_accessible = true;
- return true;
- }
- if (native_index <= 0 && !text->chunkNativeStart) {
- text->chunkOffset = 0;
-- is_accessible = FALSE;
-+ is_accessible = false;
- return true;
- }
- }
-@@ -346,7 +346,7 @@ static UBool TextLatin1Access(UText* text,
- int64_t native_index,
- UBool forward) {
- if (!text->context)
-- return FALSE;
-+ return false;
- int64_t native_length = TextNativeLength(text);
- UBool is_accessible;
- if (TextInChunkOrOutOfRange(text, native_index, native_length, forward,
-@@ -370,7 +370,7 @@ static UBool TextLatin1Access(UText* text,
- DCHECK_EQ(new_context, kPriorContext);
- TextLatin1SwitchToPriorContext(text, native_index, native_length, forward);
- }
-- return TRUE;
-+ return true;
- }
-
- static const struct UTextFuncs kTextLatin1Funcs = {
-@@ -510,7 +510,7 @@ static void TextUTF16SwitchToPriorContext(UText* text,
-
- static UBool TextUTF16Access(UText* text, int64_t native_index, UBool forward) {
- if (!text->context)
-- return FALSE;
-+ return false;
- int64_t native_length = TextNativeLength(text);
- UBool is_accessible;
- if (TextInChunkOrOutOfRange(text, native_index, native_length, forward,
-@@ -532,7 +532,7 @@ static UBool TextUTF16Access(UText* text, int64_t native_index, UBool forward) {
- DCHECK_EQ(new_context, kPriorContext);
- TextUTF16SwitchToPriorContext(text, native_index, native_length, forward);
- }
-- return TRUE;
-+ return true;
- }
-
- static const struct UTextFuncs kTextUTF16Funcs = {
-diff --git a/chromium/third_party/blink/renderer/platform/text/unicode_utilities.cc b/chromium/third_party/blink/renderer/platform/text/unicode_utilities.cc
-index 2cefd5390b6..b8c4515dc13 100644
---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/unicode_utilities.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/unicode_utilities.cc
-@@ -300,7 +300,7 @@ void NormalizeCharactersIntoNFCForm(const UChar* characters,
- DCHECK(U_SUCCESS(status));
- int32_t input_length = static_cast<int32_t>(length);
- // copy-on-write.
-- icu::UnicodeString normalized(FALSE, characters, input_length);
-+ icu::UnicodeString normalized(false, characters, input_length);
- // In the vast majority of cases, input is already NFC. Run a quick check
- // to avoid normalizing the entire input unnecessarily.
- int32_t normalized_prefix_length =
-diff --git a/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc b/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
-index 810d1cd9181..9074b640fff 100644
---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
-@@ -326,7 +326,7 @@ void TextCodecICU::CreateICUConverter() const {
- DLOG_IF(ERROR, err == U_AMBIGUOUS_ALIAS_WARNING)
- << "ICU ambiguous alias warning for encoding: " << encoding_.GetName();
- if (converter_icu_)
-- ucnv_setFallback(converter_icu_, TRUE);
-+ ucnv_setFallback(converter_icu_, true);
- }
-
- int TextCodecICU::DecodeToBuffer(UChar* target,
-diff --git a/chromium/ui/base/l10n/formatter.cc b/chromium/ui/base/l10n/formatter.cc
-index 486a3a029cb..d7a41724628 100644
---- a/src/3rdparty/chromium/ui/base/l10n/formatter.cc
-+++ b/src/3rdparty/chromium/ui/base/l10n/formatter.cc
-@@ -232,7 +232,7 @@ void Formatter::Format(Unit unit,
- int value,
- icu::UnicodeString* formatted_string) const {
- DCHECK(simple_format_[unit]);
-- DCHECK(formatted_string->isEmpty() == TRUE);
-+ DCHECK(formatted_string->isEmpty() == true);
- UErrorCode error = U_ZERO_ERROR;
- FormatNumberInPlural(*simple_format_[unit],
- value, formatted_string, &error);
-@@ -248,7 +248,7 @@ void Formatter::Format(TwoUnits units,
- << "Detailed() not implemented for your (format, length) combination!";
- DCHECK(detailed_format_[units][1])
- << "Detailed() not implemented for your (format, length) combination!";
-- DCHECK(formatted_string->isEmpty() == TRUE);
-+ DCHECK(formatted_string->isEmpty() == true);
- UErrorCode error = U_ZERO_ERROR;
- FormatNumberInPlural(*detailed_format_[units][0], value_1,
- formatted_string, &error);
-@@ -281,7 +281,7 @@ std::unique_ptr<icu::MessageFormat> Formatter::InitFormat(
- base::string16 pattern = l10n_util::GetStringUTF16(pluralities.id);
- UErrorCode error = U_ZERO_ERROR;
- std::unique_ptr<icu::MessageFormat> format(new icu::MessageFormat(
-- icu::UnicodeString(FALSE, pattern.data(), pattern.length()), error));
-+ icu::UnicodeString(false, pattern.data(), pattern.length()), error));
- DCHECK(U_SUCCESS(error));
- if (format.get())
- return format;
---
-cgit v1.2.1
-