From a5f1691b5b885dd228018740803075e7b6059e4b Mon Sep 17 00:00:00 2001 From: "stephan.szabo@sony.com" Date: Tue, 3 Nov 2020 20:06:15 +0000 Subject: [PATCH] [WinCairo/PlayStation] ICU 68.1 no longer exposes FALSE and TRUE macros by default https://bugs.webkit.org/show_bug.cgi?id=218522 Reviewed by Don Olmstead. Source/WebCore: * platform/text/TextCodecICU.cpp: Replace use of TRUE with true Source/WebKit: * UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp: Replace FALSE with false Source/WTF: Replace uses of FALSE and TRUE with false and true. * wtf/text/icu/UTextProvider.h: * wtf/text/icu/UTextProviderLatin1.cpp: * wtf/text/icu/UTextProviderUTF16.cpp: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269325 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WTF/wtf/text/icu/UTextProvider.h | 8 ++++---- Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp | 14 +++++++------- Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp | 4 ++-- Source/WebCore/platform/text/TextCodecICU.cpp | 2 +- .../DrawingAreaProxyCoordinatedGraphics.cpp | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Source/WTF/wtf/text/icu/UTextProvider.h b/Source/WTF/wtf/text/icu/UTextProvider.h index c8f28d6ed3da..3c6fbeab6a5c 100644 --- a/Source/WTF/wtf/text/icu/UTextProvider.h +++ b/Source/WTF/wtf/text/icu/UTextProvider.h @@ -79,12 +79,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int // Ensure chunk offset is well formed if computed offset exceeds int32_t range. ASSERT(offset < std::numeric_limits::max()); text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; - isAccessible = TRUE; + isAccessible = true; return true; } if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { text->chunkOffset = text->chunkLength; - isAccessible = FALSE; + isAccessible = false; return true; } } else { @@ -93,12 +93,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int // Ensure chunk offset is well formed if computed offset exceeds int32_t range. ASSERT(offset < std::numeric_limits::max()); text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; - isAccessible = TRUE; + isAccessible = true; return true; } if (nativeIndex <= 0 && !text->chunkNativeStart) { text->chunkOffset = 0; - isAccessible = FALSE; + isAccessible = false; return true; } } diff --git a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp b/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp index 0a646b7f390d..49980f95ba79 100644 --- a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp +++ b/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp @@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { // Already inside the buffer. Set the new offset. uText->chunkOffset = static_cast(index - uText->chunkNativeStart); - return TRUE; + return true; } if (index >= length && uText->chunkNativeLimit == length) { // Off the end of the buffer, but we can't get it. uText->chunkOffset = static_cast(index - uText->chunkNativeStart); - return FALSE; + return false; } } else { if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { // Already inside the buffer. Set the new offset. uText->chunkOffset = static_cast(index - uText->chunkNativeStart); - return TRUE; + return true; } if (!index && !uText->chunkNativeStart) { // Already at the beginning; can't go any farther. uText->chunkOffset = 0; - return FALSE; + return false; } } @@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) uText->nativeIndexingLimit = uText->chunkLength; - return TRUE; + return true; } static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) @@ -337,7 +337,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UText* text) static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) { if (!text->context) - return FALSE; + return false; int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); UBool isAccessible; if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) @@ -357,7 +357,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBo ASSERT(newContext == UTextProviderContext::PriorContext); textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); } - return TRUE; + return true; } static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) diff --git a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp b/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp index 69c8d091bd62..9c3fa709200a 100644 --- a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp +++ b/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp @@ -126,7 +126,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text) static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) { if (!text->context) - return FALSE; + return false; int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); UBool isAccessible; if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) @@ -146,7 +146,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBoo ASSERT(newContext == UTextProviderContext::PriorContext); textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); } - return TRUE; + return true; } static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp index 19b41eb7125f..2f7d1930b8d7 100644 --- a/Source/WebCore/platform/text/TextCodecICU.cpp +++ b/Source/WebCore/platform/text/TextCodecICU.cpp @@ -194,7 +194,7 @@ void TextCodecICU::createICUConverter() const UErrorCode error = U_ZERO_ERROR; m_converter = ICUConverterPtr { ucnv_open(m_canonicalConverterName, &error), ucnv_close }; if (m_converter) - ucnv_setFallback(m_converter.get(), TRUE); + ucnv_setFallback(m_converter.get(), true); } int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& error) diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp index 61e3f6050d7f..5a51b9ec1d68 100644 --- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp +++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp @@ -402,7 +402,7 @@ DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::~DrawingMonitor() int DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::webViewDrawCallback(DrawingAreaProxyCoordinatedGraphics::DrawingMonitor* monitor) { monitor->didDraw(); - return FALSE; + return false; } void DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::start(WTF::Function&& callback) -- 2.20.1