You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
124 lines
6.0 KiB
124 lines
6.0 KiB
diff -Nur qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/icu/UTextProvider.h qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/icu/UTextProvider.h |
|
--- qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/icu/UTextProvider.h 2020-03-04 18:16:37.000000000 +0100 |
|
+++ qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/icu/UTextProvider.h 2021-05-31 22:02:56.974163189 +0200 |
|
@@ -80,12 +80,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 { |
|
@@ -94,12 +94,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; |
|
} |
|
} |
|
diff -Nur qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp |
|
--- qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp 2020-03-04 18:16:37.000000000 +0100 |
|
+++ qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp 2021-05-31 22:02:56.974163189 +0200 |
|
@@ -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) |
|
@@ -336,7 +336,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)) |
|
@@ -356,7 +356,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) |
|
diff -Nur qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp |
|
--- qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp 2020-03-04 18:16:37.000000000 +0100 |
|
+++ qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp 2021-05-31 22:02:56.974163189 +0200 |
|
@@ -125,7 +125,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)) |
|
@@ -145,7 +145,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) |
|
diff -Nur qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/TextCodecICU.cpp qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/TextCodecICU.cpp |
|
--- qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/TextCodecICU.cpp 2020-03-04 18:16:37.000000000 +0100 |
|
+++ qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/TextCodecICU.cpp 2021-05-31 22:02:56.974163189 +0200 |
|
@@ -308,7 +308,7 @@ |
|
m_converterICU = ucnv_open(m_canonicalConverterName, &err); |
|
ASSERT(U_SUCCESS(err)); |
|
if (m_converterICU) |
|
- ucnv_setFallback(m_converterICU, TRUE); |
|
+ ucnv_setFallback(m_converterICU, true); |
|
} |
|
|
|
int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
|
|
|