summaryrefslogtreecommitdiff
path: root/webkitgtk/bug-218522.patch
blob: 87d71948941639d502caa09b3c7728696f557319 (plain)
    1 --- a/Source/WTF/wtf/text/icu/UTextProvider.h	
    2 +++ a/Source/WTF/wtf/text/icu/UTextProvider.h	
    3 @@ -79,12 +79,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int
    4              // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
    5              ASSERT(offset < std::numeric_limits<int32_t>::max());
    6              text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
    7 -            isAccessible = TRUE;
    8 +            isAccessible = true;
    9              return true;
   10          }
   11          if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
   12              text->chunkOffset = text->chunkLength;
   13 -            isAccessible = FALSE;
   14 +            isAccessible = false;
   15              return true;
   16          }
   17      } else {
   18 @@ -93,12 +93,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 <= 0 && !text->chunkNativeStart) {
   27              text->chunkOffset = 0;
   28 -            isAccessible = FALSE;
   29 +            isAccessible = false;
   30              return true;
   31          }
   32      }
   33 --- a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp	
   34 +++ a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp	
   35 @@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward)
   36          if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
   37              // Already inside the buffer. Set the new offset.
   38              uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
   39 -            return TRUE;
   40 +            return true;
   41          }
   42          if (index >= length && uText->chunkNativeLimit == length) {
   43              // Off the end of the buffer, but we can't get it.
   44              uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
   45 -            return FALSE;
   46 +            return false;
   47          }
   48      } else {
   49          if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
   50              // Already inside the buffer. Set the new offset.
   51              uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
   52 -            return TRUE;
   53 +            return true;
   54          }
   55          if (!index && !uText->chunkNativeStart) {
   56              // Already at the beginning; can't go any farther.
   57              uText->chunkOffset = 0;
   58 -            return FALSE;
   59 +            return false;
   60          }
   61      }
   62      
   63 @@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward)
   64  
   65      uText->nativeIndexingLimit = uText->chunkLength;
   66  
   67 -    return TRUE;
   68 +    return true;
   69  }
   70  
   71  static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
   72 @@ -337,7 +337,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UText* text)
   73  static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
   74  {
   75      if (!text->context)
   76 -        return FALSE;
   77 +        return false;
   78      int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
   79      UBool isAccessible;
   80      if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
   81 @@ -357,7 +357,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBo
   82          ASSERT(newContext == UTextProviderContext::PriorContext);
   83          textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
   84      }
   85 -    return TRUE;
   86 +    return true;
   87  }
   88  
   89  static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
   90 --- a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp	
   91 +++ a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp	
   92 @@ -126,7 +126,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text)
   93  static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
   94  {
   95      if (!text->context)
   96 -        return FALSE;
   97 +        return false;
   98      int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
   99      UBool isAccessible;
  100      if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
  101 @@ -146,7 +146,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBoo
  102          ASSERT(newContext == UTextProviderContext::PriorContext);
  103          textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
  104      }
  105 -    return TRUE;
  106 +    return true;
  107  }
  108  
  109  static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
  110 --- a/Source/WebCore/platform/text/TextCodecICU.cpp	
  111 +++ a/Source/WebCore/platform/text/TextCodecICU.cpp	
  112 @@ -194,7 +194,7 @@ void TextCodecICU::createICUConverter() const
  113      UErrorCode error = U_ZERO_ERROR;
  114      m_converter = ICUConverterPtr { ucnv_open(m_canonicalConverterName, &error), ucnv_close };
  115      if (m_converter)
  116 -        ucnv_setFallback(m_converter.get(), TRUE);
  117 +        ucnv_setFallback(m_converter.get(), true);
  118  }
  119  
  120  int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& error)
  121 --- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp	
  122 +++ a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp	
  123 @@ -402,7 +402,7 @@ DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::~DrawingMonitor()
  124  int DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::webViewDrawCallback(DrawingAreaProxyCoordinatedGraphics::DrawingMonitor* monitor)
  125  {
  126      monitor->didDraw();
  127 -    return FALSE;
  128 +    return false;
  129  }
  130  
  131  void DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::start(WTF::Function<void(CallbackBase::Error)>&& callback)

Generated by cgit