icu68.patch

   1 diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp
   2 index f6d16cb..f5c0f68 100644
   3 --- a/Source/WebCore/platform/text/TextCodecICU.cpp
   4 +++ b/Source/WebCore/platform/text/TextCodecICU.cpp
   5 @@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
   6      m_converterICU = ucnv_open(m_canonicalConverterName, &err);
   7      ASSERT(U_SUCCESS(err));
   8      if (m_converterICU)
   9 -        ucnv_setFallback(m_converterICU, TRUE);
  10 +        ucnv_setFallback(m_converterICU, true);
  11  }
  12
  13  int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
  14 diff --git a/Source/WebCore/platform/text/icu/UTextProvider.h b/Source/WebCore/platform/text/icu/UTextProvider.h
  15 index 81a025a..a77aa45 100644
  16 --- a/Source/WebCore/platform/text/icu/UTextProvider.h
  17 +++ b/Source/WebCore/platform/text/icu/UTextProvider.h
  18 @@ -81,12 +81,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int
  19              // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
  20              ASSERT(offset < std::numeric_limits<int32_t>::max());
  21              text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
  22 -            isAccessible = TRUE;
  23 +            isAccessible = true;
  24              return true;
  25          }
  26          if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
  27              text->chunkOffset = text->chunkLength;
  28 -            isAccessible = FALSE;
  29 +            isAccessible = false;
  30              return true;
  31          }
  32      } else {
  33 @@ -95,12 +95,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int
  34              // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
  35              ASSERT(offset < std::numeric_limits<int32_t>::max());
  36              text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
  37 -            isAccessible = TRUE;
  38 +            isAccessible = true;
  39              return true;
  40          }
  41          if (nativeIndex <= 0 && !text->chunkNativeStart) {
  42              text->chunkOffset = 0;
  43 -            isAccessible = FALSE;
  44 +            isAccessible = false;
  45              return true;
  46          }
  47      }
  48 diff --git a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
  49 index ee02763..48ba1eb 100644
  50 --- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
  51 +++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
  52 @@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward)
  53          if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
  54              // Already inside the buffer. Set the new offset.
  55              uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
  56 -            return TRUE;
  57 +            return true;
  58          }
  59          if (index >= length && uText->chunkNativeLimit == length) {
  60              // Off the end of the buffer, but we can't get it.
  61              uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
  62 -            return FALSE;
  63 +            return false;
  64          }
  65      } else {
  66          if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
  67              // Already inside the buffer. Set the new offset.
  68              uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
  69 -            return TRUE;
  70 +            return true;
  71          }
  72          if (!index && !uText->chunkNativeStart) {
  73              // Already at the beginning; can't go any farther.
  74              uText->chunkOffset = 0;
  75 -            return FALSE;
  76 +            return false;
  77          }
  78      }
  79
  80 @@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward)
  81
  82      uText->nativeIndexingLimit = uText->chunkLength;
  83
  84 -    return TRUE;
  85 +    return true;
  86  }
  87
  88  static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
  89 @@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UText* text)
  90  static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
  91  {
  92      if (!text->context)
  93 -        return FALSE;
  94 +        return false;
  95      int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
  96      UBool isAccessible;
  97      if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
  98 @@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBo
  99          ASSERT(newContext == UTextProviderContext::PriorContext);
 100          textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
 101      }
 102 -    return TRUE;
 103 +    return true;
 104  }
 105
 106  static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
 107 diff --git a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
 108 index 7aaac48..9ae0d36 100644
 109 --- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
 110 +++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
 111 @@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text)
 112  static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
 113  {
 114      if (!text->context)
 115 -        return FALSE;
 116 +        return false;
 117      int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
 118      UBool isAccessible;
 119      if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
 120 @@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBoo
 121          ASSERT(newContext == UTextProviderContext::PriorContext);
 122          textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
 123      }
 124 -    return TRUE;
 125 +    return true;
 126  }
 127
 128  static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)