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

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

Issue 2110813003: Move all the AtomicString table into AtomicStringTable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix comments. Created 4 years, 5 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) 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23 * THE POSSIBILITY OF SUCH DAMAGE. 23 * THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "wtf/text/AtomicString.h" 26 #include "wtf/text/AtomicString.h"
27 27
28 #include "wtf/text/AtomicStringTable.h"
29
28 #if OS(MACOSX) 30 #if OS(MACOSX)
29 31
30 #include "wtf/text/CString.h" 32 #include "wtf/text/CString.h"
31 #include <CoreFoundation/CoreFoundation.h> 33 #include <CoreFoundation/CoreFoundation.h>
32 34
33 namespace WTF { 35 namespace WTF {
34 36
35 PassRefPtr<StringImpl> AtomicString::add(CFStringRef string) 37 PassRefPtr<StringImpl> AtomicString::add(CFStringRef string)
36 { 38 {
37 if (!string) 39 if (!string)
38 return nullptr; 40 return nullptr;
39 41
40 CFIndex length = CFStringGetLength(string); 42 CFIndex length = CFStringGetLength(string);
41 43
42 if (const LChar* ptr = reinterpret_cast<const LChar*>(CFStringGetCStringPtr( string, kCFStringEncodingISOLatin1))) 44 if (const LChar* ptr = reinterpret_cast<const LChar*>(CFStringGetCStringPtr( string, kCFStringEncodingISOLatin1)))
43 return add(ptr, length); 45 return AtomicStringTable::instance().add(ptr, length);
44 46
45 if (const UniChar* ptr = CFStringGetCharactersPtr(string)) 47 if (const UniChar* ptr = CFStringGetCharactersPtr(string))
46 return add(reinterpret_cast<const UChar*>(ptr), length); 48 return AtomicStringTable::instance().add(reinterpret_cast<const UChar*>( ptr), length);
47 49
48 Vector<UniChar, 1024> ucharBuffer(length); 50 Vector<UniChar, 1024> ucharBuffer(length);
49 CFStringGetCharacters(string, CFRangeMake(0, length), ucharBuffer.data()); 51 CFStringGetCharacters(string, CFRangeMake(0, length), ucharBuffer.data());
50 return add(reinterpret_cast<const UChar*>(ucharBuffer.data()), length); 52 return AtomicStringTable::instance().add(reinterpret_cast<const UChar*>(ucha rBuffer.data()), length);
51 } 53 }
52 54
53 } // namespace WTF 55 } // namespace WTF
54 56
55 #endif // OS(MACOSX) 57 #endif // OS(MACOSX)
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/wtf/text/AtomicString.cpp ('k') | third_party/WebKit/Source/wtf/text/AtomicStringTable.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698