| OLD | NEW |
| 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 14 matching lines...) Expand all Loading... |
| 25 | 25 |
| 26 #include "wtf/text/AtomicString.h" | 26 #include "wtf/text/AtomicString.h" |
| 27 | 27 |
| 28 #if OS(MACOSX) | 28 #if OS(MACOSX) |
| 29 | 29 |
| 30 #include "wtf/text/CString.h" | 30 #include "wtf/text/CString.h" |
| 31 #include <CoreFoundation/CoreFoundation.h> | 31 #include <CoreFoundation/CoreFoundation.h> |
| 32 | 32 |
| 33 namespace WTF { | 33 namespace WTF { |
| 34 | 34 |
| 35 PassRefPtr<StringImpl> AtomicString::add(CFStringRef string) | 35 PassRefPtr<StringImpl> AtomicString::add(CFStringRef string) { |
| 36 { | 36 if (!string) |
| 37 if (!string) | 37 return nullptr; |
| 38 return nullptr; | |
| 39 | 38 |
| 40 CFIndex length = CFStringGetLength(string); | 39 CFIndex length = CFStringGetLength(string); |
| 41 | 40 |
| 42 if (const LChar* ptr = reinterpret_cast<const LChar*>(CFStringGetCStringPtr(
string, kCFStringEncodingISOLatin1))) | 41 if (const LChar* ptr = reinterpret_cast<const LChar*>( |
| 43 return add(ptr, length); | 42 CFStringGetCStringPtr(string, kCFStringEncodingISOLatin1))) |
| 43 return add(ptr, length); |
| 44 | 44 |
| 45 if (const UniChar* ptr = CFStringGetCharactersPtr(string)) | 45 if (const UniChar* ptr = CFStringGetCharactersPtr(string)) |
| 46 return add(reinterpret_cast<const UChar*>(ptr), length); | 46 return add(reinterpret_cast<const UChar*>(ptr), length); |
| 47 | 47 |
| 48 Vector<UniChar, 1024> ucharBuffer(length); | 48 Vector<UniChar, 1024> ucharBuffer(length); |
| 49 CFStringGetCharacters(string, CFRangeMake(0, length), ucharBuffer.data()); | 49 CFStringGetCharacters(string, CFRangeMake(0, length), ucharBuffer.data()); |
| 50 return add(reinterpret_cast<const UChar*>(ucharBuffer.data()), length); | 50 return add(reinterpret_cast<const UChar*>(ucharBuffer.data()), length); |
| 51 } | 51 } |
| 52 | 52 |
| 53 } // namespace WTF | 53 } // namespace WTF |
| 54 | 54 |
| 55 #endif // OS(MACOSX) | 55 #endif // OS(MACOSX) |
| OLD | NEW |