Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

skia/ext/SkMemory_new_handler.cpp

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdlib.h>
 
 #include "base/process/memory.h"
 
 #include "third_party/skia/include/core/SkTypes.h"
 
 // This implementation of sk_malloc_flags() and friends is similar to
 // SkMemory_malloc.cpp, except it uses base::UncheckedMalloc and friends
 // for non-SK_MALLOC_THROW calls.
 //
 // The name of this file is historic: a previous implementation tried to
 // use std::set_new_handler() for the same effect, but it didn't actually work.
 
 static inline void* throw_on_failure(size_t size, void* p) {
     if (size > 0 && p == NULL) {
         // If we've got a NULL here, the only reason we should have failed is running out of RAM.
         sk_out_of_memory();
     }
     return p;
 }
 
-void sk_throw() {
-    SkASSERT(!"sk_throw");
-    abort();
+void sk_abort_no_print() {
+  abort();
 }
 
 void sk_out_of_memory(void) {
     SkASSERT(!"sk_out_of_memory");
     abort();
 }
 
 void* sk_realloc_throw(void* addr, size_t size) {
     return throw_on_failure(size, realloc(addr, size));
 }
@@ skipping 54 matching lines @@
     result = calloc(1, size);
 #else
     // It's the responsibility of the caller to check the return value.
     ignore_result(base::UncheckedCalloc(size, 1, &result));
 #endif
     if (result) {
         prevent_overcommit(0, size, result);
     }
     return result;
 }