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

Side by Side Diff: Source/wtf/text/AtomicStringCF.cpp

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/wtf/text/AtomicString.cpp ('k') | Source/wtf/text/StringBuilder.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 18 matching lines...) Expand all
29 #if USE(CF) 29 #if USE(CF)
30 30
31 #include "wtf/text/CString.h" 31 #include "wtf/text/CString.h"
32 #include <CoreFoundation/CoreFoundation.h> 32 #include <CoreFoundation/CoreFoundation.h>
33 33
34 namespace WTF { 34 namespace WTF {
35 35
36 PassRefPtr<StringImpl> AtomicString::add(CFStringRef string) 36 PassRefPtr<StringImpl> AtomicString::add(CFStringRef string)
37 { 37 {
38 if (!string) 38 if (!string)
39 return 0; 39 return nullptr;
40 40
41 CFIndex length = CFStringGetLength(string); 41 CFIndex length = CFStringGetLength(string);
42 42
43 if (const LChar* ptr = reinterpret_cast<const LChar*>(CFStringGetCStringPtr( string, kCFStringEncodingISOLatin1))) 43 if (const LChar* ptr = reinterpret_cast<const LChar*>(CFStringGetCStringPtr( string, kCFStringEncodingISOLatin1)))
44 return add(ptr, length); 44 return add(ptr, length);
45 45
46 if (const UniChar* ptr = CFStringGetCharactersPtr(string)) 46 if (const UniChar* ptr = CFStringGetCharactersPtr(string))
47 return add(reinterpret_cast<const UChar*>(ptr), length); 47 return add(reinterpret_cast<const UChar*>(ptr), length);
48 48
49 Vector<UniChar, 1024> ucharBuffer(length); 49 Vector<UniChar, 1024> ucharBuffer(length);
50 CFStringGetCharacters(string, CFRangeMake(0, length), ucharBuffer.data()); 50 CFStringGetCharacters(string, CFRangeMake(0, length), ucharBuffer.data());
51 return add(reinterpret_cast<const UChar*>(ucharBuffer.data()), length); 51 return add(reinterpret_cast<const UChar*>(ucharBuffer.data()), length);
52 } 52 }
53 53
54 } // namespace WTF 54 } // namespace WTF
55 55
56 #endif // USE(CF) 56 #endif // USE(CF)
OLDNEW
« no previous file with comments | « Source/wtf/text/AtomicString.cpp ('k') | Source/wtf/text/StringBuilder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698