Title: [161848] trunk/Source/WebCore
- Revision
- 161848
- Author
- [email protected]
- Date
- 2014-01-12 18:07:18 -0800 (Sun, 12 Jan 2014)
Log Message
Try to fix the 32-bit build.
* platform/text/icu/UTextProviderLatin1.cpp:
(WebCore::uTextLatin1Clone):
(WebCore::uTextLatin1Extract):
(WebCore::uTextLatin1MapNativeIndexToUTF16):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161847 => 161848)
--- trunk/Source/WebCore/ChangeLog 2014-01-13 02:01:51 UTC (rev 161847)
+++ trunk/Source/WebCore/ChangeLog 2014-01-13 02:07:18 UTC (rev 161848)
@@ -1,5 +1,14 @@
2014-01-12 Anders Carlsson <[email protected]>
+ Try to fix the 32-bit build.
+
+ * platform/text/icu/UTextProviderLatin1.cpp:
+ (WebCore::uTextLatin1Clone):
+ (WebCore::uTextLatin1Extract):
+ (WebCore::uTextLatin1MapNativeIndexToUTF16):
+
+2014-01-12 Anders Carlsson <[email protected]>
+
Remove all uses of AtomicallyInitializedStatic from WebCore
https://bugs.webkit.org/show_bug.cgi?id=126861
Modified: trunk/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp (161847 => 161848)
--- trunk/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp 2014-01-13 02:01:51 UTC (rev 161847)
+++ trunk/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp 2014-01-13 02:07:18 UTC (rev 161848)
@@ -76,7 +76,7 @@
// Point at the same position, but with an empty buffer.
result->chunkNativeStart = source->chunkNativeStart;
result->chunkNativeLimit = source->chunkNativeStart;
- result->nativeIndexingLimit = source->chunkNativeStart;
+ result->nativeIndexingLimit = static_cast<int32_t>(source->chunkNativeStart);
result->chunkOffset = 0;
result->context = source->context;
result->a = source->a;
@@ -174,7 +174,7 @@
return 0;
if (destCapacity > 0 && !dest) {
- int32_t trimmedLength = length;
+ int32_t trimmedLength = static_cast<int32_t>(length);
if (trimmedLength > destCapacity)
trimmedLength = destCapacity;
@@ -190,7 +190,7 @@
else
*status = U_BUFFER_OVERFLOW_ERROR;
- return length;
+ return static_cast<int32_t>(length);
}
static int64_t uTextLatin1MapOffsetToNative(const UText* uText)
@@ -202,7 +202,7 @@
{
ASSERT_UNUSED(uText, uText->chunkNativeStart >= nativeIndex);
ASSERT_UNUSED(uText, nativeIndex < uText->chunkNativeLimit);
- return nativeIndex;
+ return static_cast<int32_t>(nativeIndex);
}
static void uTextLatin1Close(UText* uText)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
