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

Unified Diff: third_party/WebKit/Source/wtf/text/StringImplCF.cpp

Issue 1611343002: wtf reformat test Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pydent Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/wtf/text/StringImplCF.cpp
diff --git a/third_party/WebKit/Source/wtf/text/StringImplCF.cpp b/third_party/WebKit/Source/wtf/text/StringImplCF.cpp
index 844ae4987cc4d27924ffeb70b0e1f024d7072a1e..59b2f9e5a38c131cbe12a617cc4e896ddae1e103 100644
--- a/third_party/WebKit/Source/wtf/text/StringImplCF.cpp
+++ b/third_party/WebKit/Source/wtf/text/StringImplCF.cpp
@@ -35,119 +35,119 @@ namespace StringWrapperCFAllocator {
static StringImpl* currentString;
-static const void* retain(const void* info)
-{
- return info;
+static const void* retain(const void* info) {
+ return info;
}
NO_RETURN_DUE_TO_ASSERT
-static void release(const void*)
-{
- ASSERT_NOT_REACHED();
+static void release(const void*) {
+ ASSERT_NOT_REACHED();
}
-static CFStringRef copyDescription(const void*)
-{
- return CFSTR("WTF::String-based allocator");
+static CFStringRef copyDescription(const void*) {
+ return CFSTR("WTF::String-based allocator");
}
-static void* allocate(CFIndex size, CFOptionFlags, void*)
-{
- StringImpl* underlyingString = 0;
- if (isMainThread()) {
- underlyingString = currentString;
- if (underlyingString) {
- currentString = 0;
- underlyingString->ref(); // Balanced by call to deref in deallocate below.
- }
+static void* allocate(CFIndex size, CFOptionFlags, void*) {
+ StringImpl* underlyingString = 0;
+ if (isMainThread()) {
+ underlyingString = currentString;
+ if (underlyingString) {
+ currentString = 0;
+ underlyingString
+ ->ref(); // Balanced by call to deref in deallocate below.
}
- StringImpl** header = static_cast<StringImpl**>(WTF::Partitions::fastMalloc(sizeof(StringImpl*) + size, WTF_HEAP_PROFILER_TYPE_NAME(StringImpl*)));
- *header = underlyingString;
- return header + 1;
+ }
+ StringImpl** header = static_cast<StringImpl**>(WTF::Partitions::fastMalloc(
+ sizeof(StringImpl*) + size, WTF_HEAP_PROFILER_TYPE_NAME(StringImpl*)));
+ *header = underlyingString;
+ return header + 1;
}
-static void* reallocate(void* pointer, CFIndex newSize, CFOptionFlags, void*)
-{
- size_t newAllocationSize = sizeof(StringImpl*) + newSize;
- StringImpl** header = static_cast<StringImpl**>(pointer) - 1;
- ASSERT(!*header);
- header = static_cast<StringImpl**>(WTF::Partitions::fastRealloc(header, newAllocationSize, WTF_HEAP_PROFILER_TYPE_NAME(StringImpl*)));
- return header + 1;
+static void* reallocate(void* pointer, CFIndex newSize, CFOptionFlags, void*) {
+ size_t newAllocationSize = sizeof(StringImpl*) + newSize;
+ StringImpl** header = static_cast<StringImpl**>(pointer) - 1;
+ ASSERT(!*header);
+ header = static_cast<StringImpl**>(WTF::Partitions::fastRealloc(
+ header, newAllocationSize, WTF_HEAP_PROFILER_TYPE_NAME(StringImpl*)));
+ return header + 1;
}
-static void deallocateOnMainThread(void* headerPointer)
-{
- StringImpl** header = static_cast<StringImpl**>(headerPointer);
- StringImpl* underlyingString = *header;
- ASSERT(underlyingString);
- underlyingString->deref(); // Balanced by call to ref in allocate above.
- WTF::Partitions::fastFree(header);
+static void deallocateOnMainThread(void* headerPointer) {
+ StringImpl** header = static_cast<StringImpl**>(headerPointer);
+ StringImpl* underlyingString = *header;
+ ASSERT(underlyingString);
+ underlyingString->deref(); // Balanced by call to ref in allocate above.
+ WTF::Partitions::fastFree(header);
}
-static void deallocate(void* pointer, void*)
-{
- StringImpl** header = static_cast<StringImpl**>(pointer) - 1;
- StringImpl* underlyingString = *header;
- if (!underlyingString) {
- WTF::Partitions::fastFree(header);
+static void deallocate(void* pointer, void*) {
+ StringImpl** header = static_cast<StringImpl**>(pointer) - 1;
+ StringImpl* underlyingString = *header;
+ if (!underlyingString) {
+ WTF::Partitions::fastFree(header);
+ } else {
+ if (!isMainThread()) {
+ internal::callOnMainThread(&deallocateOnMainThread, header);
} else {
- if (!isMainThread()) {
- internal::callOnMainThread(&deallocateOnMainThread, header);
- } else {
- underlyingString->deref(); // Balanced by call to ref in allocate above.
- WTF::Partitions::fastFree(header);
- }
+ underlyingString->deref(); // Balanced by call to ref in allocate above.
+ WTF::Partitions::fastFree(header);
}
+ }
}
-static CFIndex preferredSize(CFIndex size, CFOptionFlags, void*)
-{
- // FIXME: If FastMalloc provided a "good size" callback, we'd want to use it here.
- // Note that this optimization would help performance for strings created with the
- // allocator that are mutable, and those typically are only created by callers who
- // make a new string using the old string's allocator, such as some of the call
- // sites in CFURL.
- return size;
+static CFIndex preferredSize(CFIndex size, CFOptionFlags, void*) {
+ // FIXME: If FastMalloc provided a "good size" callback, we'd want to use it here.
+ // Note that this optimization would help performance for strings created with the
+ // allocator that are mutable, and those typically are only created by callers who
+ // make a new string using the old string's allocator, such as some of the call
+ // sites in CFURL.
+ return size;
}
-static CFAllocatorRef create()
-{
- CFAllocatorContext context = { 0, 0, retain, release, copyDescription, allocate, reallocate, deallocate, preferredSize };
- return CFAllocatorCreate(0, &context);
+static CFAllocatorRef create() {
+ CFAllocatorContext context = {
+ 0, 0, retain, release, copyDescription,
+ allocate, reallocate, deallocate, preferredSize};
+ return CFAllocatorCreate(0, &context);
}
-static CFAllocatorRef allocator()
-{
- static CFAllocatorRef allocator = create();
- return allocator;
+static CFAllocatorRef allocator() {
+ static CFAllocatorRef allocator = create();
+ return allocator;
}
-
}
-RetainPtr<CFStringRef> StringImpl::createCFString()
-{
- // Since garbage collection isn't compatible with custom allocators, we
- // can't use the NoCopy variants of CFStringCreate*() when GC is enabled.
- if (!m_length || !isMainThread()) {
- if (is8Bit())
- return adoptCF(CFStringCreateWithBytes(0, reinterpret_cast<const UInt8*>(characters8()), m_length, kCFStringEncodingISOLatin1, false));
- return adoptCF(CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(characters16()), m_length));
- }
- CFAllocatorRef allocator = StringWrapperCFAllocator::allocator();
-
- // Put pointer to the StringImpl in a global so the allocator can store it with the CFString.
- ASSERT(!StringWrapperCFAllocator::currentString);
- StringWrapperCFAllocator::currentString = this;
-
- CFStringRef string;
+RetainPtr<CFStringRef> StringImpl::createCFString() {
+ // Since garbage collection isn't compatible with custom allocators, we
+ // can't use the NoCopy variants of CFStringCreate*() when GC is enabled.
+ if (!m_length || !isMainThread()) {
if (is8Bit())
- string = CFStringCreateWithBytesNoCopy(allocator, reinterpret_cast<const UInt8*>(characters8()), m_length, kCFStringEncodingISOLatin1, false, kCFAllocatorNull);
- else
- string = CFStringCreateWithCharactersNoCopy(allocator, reinterpret_cast<const UniChar*>(characters16()), m_length, kCFAllocatorNull);
- // CoreFoundation might not have to allocate anything, we clear currentString in case we did not execute allocate().
- StringWrapperCFAllocator::currentString = 0;
-
- return adoptCF(string);
+ return adoptCF(CFStringCreateWithBytes(
+ 0, reinterpret_cast<const UInt8*>(characters8()), m_length,
+ kCFStringEncodingISOLatin1, false));
+ return adoptCF(CFStringCreateWithCharacters(
+ 0, reinterpret_cast<const UniChar*>(characters16()), m_length));
+ }
+ CFAllocatorRef allocator = StringWrapperCFAllocator::allocator();
+
+ // Put pointer to the StringImpl in a global so the allocator can store it with the CFString.
+ ASSERT(!StringWrapperCFAllocator::currentString);
+ StringWrapperCFAllocator::currentString = this;
+
+ CFStringRef string;
+ if (is8Bit())
+ string = CFStringCreateWithBytesNoCopy(
+ allocator, reinterpret_cast<const UInt8*>(characters8()), m_length,
+ kCFStringEncodingISOLatin1, false, kCFAllocatorNull);
+ else
+ string = CFStringCreateWithCharactersNoCopy(
+ allocator, reinterpret_cast<const UniChar*>(characters16()), m_length,
+ kCFAllocatorNull);
+ // CoreFoundation might not have to allocate anything, we clear currentString in case we did not execute allocate().
+ StringWrapperCFAllocator::currentString = 0;
+
+ return adoptCF(string);
}
// On StringImpl creation we could check if the allocator is the StringWrapperCFAllocator.
@@ -156,7 +156,6 @@ RetainPtr<CFStringRef> StringImpl::createCFString()
// the CFStringRef is *not* at the start of an allocated block. Testing shows 1000x
// more calls to createCFString than calls to the create functions with the appropriate
// allocator, so it's probably not urgent optimize that case.
-
}
-#endif // OS(MACOSX)
+#endif // OS(MACOSX)
« no previous file with comments | « third_party/WebKit/Source/wtf/text/StringImpl.cpp ('k') | third_party/WebKit/Source/wtf/text/StringImplTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698