diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/wtf/text/StringConcatenate.h')
-rw-r--r-- | chromium/third_party/WebKit/Source/wtf/text/StringConcatenate.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/third_party/WebKit/Source/wtf/text/StringConcatenate.h b/chromium/third_party/WebKit/Source/wtf/text/StringConcatenate.h index f70efb536dd..9c7dd8839a1 100644 --- a/chromium/third_party/WebKit/Source/wtf/text/StringConcatenate.h +++ b/chromium/third_party/WebKit/Source/wtf/text/StringConcatenate.h @@ -405,13 +405,13 @@ PassRefPtr<StringImpl> makeString(StringType1 string1, StringType2 string2) unsigned length = adapter1.length(); sumWithOverflow(length, adapter2.length(), overflow); if (overflow) - return 0; + return nullptr; if (adapter1.is8Bit() && adapter2.is8Bit()) { LChar* buffer; RefPtr<StringImpl> resultImpl = StringImpl::createUninitialized(length, buffer); if (!resultImpl) - return 0; + return nullptr; LChar* result = buffer; adapter1.writeTo(result); @@ -424,7 +424,7 @@ PassRefPtr<StringImpl> makeString(StringType1 string1, StringType2 string2) UChar* buffer; RefPtr<StringImpl> resultImpl = StringImpl::createUninitialized(length, buffer); if (!resultImpl) - return 0; + return nullptr; UChar* result = buffer; adapter1.writeTo(result); |