Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: third_party/WebKit/Source/wtf/text/StringMac.mm

Issue 2655853003: Replace StringImpl::empty{16Bit}() with a static member (Closed)
Patch Set: annotate race Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /** 1 /**
2 * Copyright (C) 2006 Apple Computer, Inc. 2 * Copyright (C) 2006 Apple Computer, Inc.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 12 matching lines...) Expand all
23 #include <CoreFoundation/CFString.h> 23 #include <CoreFoundation/CFString.h>
24 24
25 namespace WTF { 25 namespace WTF {
26 26
27 String::String(NSString* str) { 27 String::String(NSString* str) {
28 if (!str) 28 if (!str)
29 return; 29 return;
30 30
31 CFIndex size = CFStringGetLength(reinterpret_cast<CFStringRef>(str)); 31 CFIndex size = CFStringGetLength(reinterpret_cast<CFStringRef>(str));
32 if (size == 0) 32 if (size == 0)
33 m_impl = StringImpl::empty(); 33 m_impl = StringImpl::empty;
34 else { 34 else {
35 Vector<LChar, 1024> lcharBuffer(size); 35 Vector<LChar, 1024> lcharBuffer(size);
36 CFIndex usedBufLen; 36 CFIndex usedBufLen;
37 CFIndex convertedsize = 37 CFIndex convertedsize =
38 CFStringGetBytes(reinterpret_cast<CFStringRef>(str), 38 CFStringGetBytes(reinterpret_cast<CFStringRef>(str),
39 CFRangeMake(0, size), kCFStringEncodingISOLatin1, 0, 39 CFRangeMake(0, size), kCFStringEncodingISOLatin1, 0,
40 false, lcharBuffer.data(), size, &usedBufLen); 40 false, lcharBuffer.data(), size, &usedBufLen);
41 if ((convertedsize == size) && (usedBufLen == size)) { 41 if ((convertedsize == size) && (usedBufLen == size)) {
42 m_impl = StringImpl::create(lcharBuffer.data(), size); 42 m_impl = StringImpl::create(lcharBuffer.data(), size);
43 return; 43 return;
44 } 44 }
45 45
46 Vector<UChar, 1024> ucharBuffer(size); 46 Vector<UChar, 1024> ucharBuffer(size);
47 CFStringGetCharacters(reinterpret_cast<CFStringRef>(str), 47 CFStringGetCharacters(reinterpret_cast<CFStringRef>(str),
48 CFRangeMake(0, size), ucharBuffer.data()); 48 CFRangeMake(0, size), ucharBuffer.data());
49 m_impl = StringImpl::create(ucharBuffer.data(), size); 49 m_impl = StringImpl::create(ucharBuffer.data(), size);
50 } 50 }
51 } 51 }
52 52
53 } // namespace WTF 53 } // namespace WTF
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/wtf/text/StringImpl.cpp ('k') | third_party/WebKit/Source/wtf/text/StringStatics.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698