Diff
Modified: trunk/Source/WTF/ChangeLog (269324 => 269325)
--- trunk/Source/WTF/ChangeLog 2020-11-03 19:54:44 UTC (rev 269324)
+++ trunk/Source/WTF/ChangeLog 2020-11-03 20:06:15 UTC (rev 269325)
@@ -1,3 +1,16 @@
+2020-11-03 Stephan Szabo <[email protected]>
+
+ [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.
+
+ 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:
+
2020-10-30 Tim Horton <[email protected]>
REGRESSION (r267689): Rise of the Tomb Raider gets stuck while launching
Modified: trunk/Source/WTF/wtf/text/icu/UTextProvider.h (269324 => 269325)
--- trunk/Source/WTF/wtf/text/icu/UTextProvider.h 2020-11-03 19:54:44 UTC (rev 269324)
+++ trunk/Source/WTF/wtf/text/icu/UTextProvider.h 2020-11-03 20:06:15 UTC (rev 269325)
@@ -79,12 +79,12 @@
// Ensure chunk offset is well formed if computed offset exceeds int32_t range.
ASSERT(offset < std::numeric_limits<int32_t>::max());
text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(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 @@
// Ensure chunk offset is well formed if computed offset exceeds int32_t range.
ASSERT(offset < std::numeric_limits<int32_t>::max());
text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
- isAccessible = TRUE;
+ isAccessible = true;
return true;
}
if (nativeIndex <= 0 && !text->chunkNativeStart) {
text->chunkOffset = 0;
- isAccessible = FALSE;
+ isAccessible = false;
return true;
}
}
Modified: trunk/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp (269324 => 269325)
--- trunk/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp 2020-11-03 19:54:44 UTC (rev 269324)
+++ trunk/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp 2020-11-03 20:06:15 UTC (rev 269325)
@@ -100,23 +100,23 @@
if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
// Already inside the buffer. Set the new offset.
uText->chunkOffset = static_cast<int32_t>(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<int32_t>(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<int32_t>(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 @@
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 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 @@
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)
Modified: trunk/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp (269324 => 269325)
--- trunk/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp 2020-11-03 19:54:44 UTC (rev 269324)
+++ trunk/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp 2020-11-03 20:06:15 UTC (rev 269325)
@@ -126,7 +126,7 @@
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 @@
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)
Modified: trunk/Source/WebCore/ChangeLog (269324 => 269325)
--- trunk/Source/WebCore/ChangeLog 2020-11-03 19:54:44 UTC (rev 269324)
+++ trunk/Source/WebCore/ChangeLog 2020-11-03 20:06:15 UTC (rev 269325)
@@ -1,3 +1,12 @@
+2020-11-03 Stephan Szabo <[email protected]>
+
+ [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.
+
+ * platform/text/TextCodecICU.cpp: Replace use of TRUE with true
+
2020-11-03 Said Abou-Hallawa <[email protected]>
[GPU Process] Make ImageBuffer RefCounted
Modified: trunk/Source/WebCore/platform/text/TextCodecICU.cpp (269324 => 269325)
--- trunk/Source/WebCore/platform/text/TextCodecICU.cpp 2020-11-03 19:54:44 UTC (rev 269324)
+++ trunk/Source/WebCore/platform/text/TextCodecICU.cpp 2020-11-03 20:06:15 UTC (rev 269325)
@@ -194,7 +194,7 @@
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)
Modified: trunk/Source/WebKit/ChangeLog (269324 => 269325)
--- trunk/Source/WebKit/ChangeLog 2020-11-03 19:54:44 UTC (rev 269324)
+++ trunk/Source/WebKit/ChangeLog 2020-11-03 20:06:15 UTC (rev 269325)
@@ -1,3 +1,12 @@
+2020-11-03 Stephan Szabo <[email protected]>
+
+ [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.
+
+ * UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp: Replace FALSE with false
+
2020-11-03 Said Abou-Hallawa <[email protected]>
[GPU Process] Make ImageBuffer RefCounted
Modified: trunk/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp (269324 => 269325)
--- trunk/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp 2020-11-03 19:54:44 UTC (rev 269324)
+++ trunk/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp 2020-11-03 20:06:15 UTC (rev 269325)
@@ -402,7 +402,7 @@
int DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::webViewDrawCallback(DrawingAreaProxyCoordinatedGraphics::DrawingMonitor* monitor)
{
monitor->didDraw();
- return FALSE;
+ return false;
}
void DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::start(WTF::Function<void(CallbackBase::Error)>&& callback)
