| 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 66402d8bdd485e5754b919e1df6fcf1e211b9dd7..befe9c4766a1c915ae40d393c1191cc1ef0e7fb0 100644
|
| --- a/third_party/WebKit/Source/wtf/text/StringImplCF.cpp
|
| +++ b/third_party/WebKit/Source/wtf/text/StringImplCF.cpp
|
| @@ -39,7 +39,7 @@ static const void* retain(const void* info) {
|
| }
|
|
|
| static void release(const void*) {
|
| - ASSERT_NOT_REACHED();
|
| + NOTREACHED();
|
| }
|
|
|
| static CFStringRef copyDescription(const void*) {
|
| @@ -74,7 +74,7 @@ static void* reallocate(void* pointer, CFIndex newSize, CFOptionFlags, void*) {
|
| static void deallocateOnMainThread(void* headerPointer) {
|
| StringImpl** header = static_cast<StringImpl**>(headerPointer);
|
| StringImpl* underlyingString = *header;
|
| - ASSERT(underlyingString);
|
| + DCHECK(underlyingString);
|
| underlyingString->deref(); // Balanced by call to ref in allocate above.
|
| WTF::Partitions::fastFree(header);
|
| }
|
| @@ -132,7 +132,7 @@ RetainPtr<CFStringRef> StringImpl::createCFString() {
|
|
|
| // Put pointer to the StringImpl in a global so the allocator can store it
|
| // with the CFString.
|
| - ASSERT(!StringWrapperCFAllocator::currentString);
|
| + DCHECK(!StringWrapperCFAllocator::currentString);
|
| StringWrapperCFAllocator::currentString = this;
|
|
|
| CFStringRef string;
|
|
|