The Tor Browser / file diff

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/gfx/skia/trunk/src/ports/SkMemory_mozalloc.cpp	Wed Dec 31 06:09:35 2014 +0100
     1.3 @@ -0,0 +1,47 @@
     1.4 +/*
     1.5 + * Copyright 2011 Google Inc.
     1.6 + * Copyright 2012 Mozilla Foundation
     1.7 + *
     1.8 + * Use of this source code is governed by a BSD-style license that can be
     1.9 + * found in the LICENSE file.
    1.10 + */
    1.11 +
    1.12 +#include "SkTypes.h"
    1.13 +
    1.14 +#include "mozilla/mozalloc.h"
    1.15 +#include "mozilla/mozalloc_abort.h"
    1.16 +#include "mozilla/mozalloc_oom.h"
    1.17 +
    1.18 +void sk_throw() {
    1.19 +    SkDEBUGFAIL("sk_throw");
    1.20 +    mozalloc_abort("Abort from sk_throw");
    1.21 +}
    1.22 +
    1.23 +void sk_out_of_memory(void) {
    1.24 +    SkDEBUGFAIL("sk_out_of_memory");
    1.25 +    mozalloc_handle_oom(0);
    1.26 +}
    1.27 +
    1.28 +void* sk_malloc_throw(size_t size) {
    1.29 +    return sk_malloc_flags(size, SK_MALLOC_THROW);
    1.30 +}
    1.31 +
    1.32 +void* sk_realloc_throw(void* addr, size_t size) {
    1.33 +    return moz_xrealloc(addr, size);
    1.34 +}
    1.35 +
    1.36 +void sk_free(void* p) {
    1.37 +    moz_free(p);
    1.38 +}
    1.39 +
    1.40 +void* sk_malloc_flags(size_t size, unsigned flags) {
    1.41 +    return (flags & SK_MALLOC_THROW) ? moz_xmalloc(size) : moz_malloc(size);
    1.42 +}
    1.43 +
    1.44 +void* sk_calloc(size_t size) {
    1.45 +    return moz_calloc(size, 1);
    1.46 +}
    1.47 +
    1.48 +void* sk_calloc_throw(size_t size) {
    1.49 +    return moz_xcalloc(size, 1);
    1.50 +}