Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / wtf / text / StringImpl.cpp

diff --git a/src/third_party/WebKit/Source/wtf/text/StringImpl.cpp b/src/third_party/WebKit/Source/wtf/text/StringImpl.cpp
index 79d878d..fcb64d3 100644 (file)
--- a/src/third_party/WebKit/Source/wtf/text/StringImpl.cpp
+++ b/src/third_party/WebKit/Source/wtf/text/StringImpl.cpp
@@ -608,7 +608,7 @@ PassRefPtr<StringImpl> StringImpl::upper()
             LChar c = characters8()[i];
             if (UNLIKELY(c == smallLetterSharpS))
                 ++numberSharpSCharacters;
-            UChar upper = Unicode::toUpper(c);
+            UChar upper = static_cast<UChar>(Unicode::toUpper(c));
             if (UNLIKELY(upper > 0xff)) {
                 // Since this upper-cased character does not fit in an 8-bit string, we need to take the 16-bit path.
                 goto upconvert;
@@ -776,7 +776,7 @@ PassRefPtr<StringImpl> StringImpl::fill(UChar character)
         LChar* data;
         RefPtr<StringImpl> newImpl = createUninitialized(m_length, data);
         for (unsigned i = 0; i < m_length; ++i)
-            data[i] = character;
+            data[i] = static_cast<LChar>(character);
         return newImpl.release();
     }
     UChar* data;
@@ -1027,13 +1027,6 @@ uint64_t StringImpl::toUInt64Strict(bool* ok, int base)
     return charactersToUInt64Strict(characters16(), m_length, ok, base);
 }
 
-intptr_t StringImpl::toIntPtrStrict(bool* ok, int base)
-{
-    if (is8Bit())
-        return charactersToIntPtrStrict(characters8(), m_length, ok, base);
-    return charactersToIntPtrStrict(characters16(), m_length, ok, base);
-}
-
 int StringImpl::toInt(bool* ok)
 {
     if (is8Bit())
@@ -1062,13 +1055,6 @@ uint64_t StringImpl::toUInt64(bool* ok)
     return charactersToUInt64(characters16(), m_length, ok);
 }
 
-intptr_t StringImpl::toIntPtr(bool* ok)
-{
-    if (is8Bit())
-        return charactersToIntPtr(characters8(), m_length, ok);
-    return charactersToIntPtr(characters16(), m_length, ok);
-}
-
 double StringImpl::toDouble(bool* ok)
 {
     if (is8Bit())