diff options
| author | droger@chromium.org <droger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-20 16:51:23 +0000 |
|---|---|---|
| committer | droger@chromium.org <droger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-20 16:51:23 +0000 |
| commit | b55715ef252cc4fa13f03e188b095202b542527b (patch) | |
| tree | 12891ce79ceacaceaf71ab07326aca12763cd4d6 /skia | |
| parent | e908adf3342afe0848d9e92a217502fafdecfd02 (diff) | |
| download | chromium_src-b55715ef252cc4fa13f03e188b095202b542527b.zip chromium_src-b55715ef252cc4fa13f03e188b095202b542527b.tar.gz chromium_src-b55715ef252cc4fa13f03e188b095202b542527b.tar.bz2 | |
Fix the iOS build.
An incorrect dependency to webkit_support.gyp:glue was added (see https://codereview.chromium.org/10913257/), and iOS does not
have base::UncheckedMalloc(size) (see https://chromiumcodereview.appspot.com/10908245/).
BUG=103980, 73751, 117949
Review URL: https://chromiumcodereview.appspot.com/10958011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157788 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/SkMemory_new_handler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/skia/ext/SkMemory_new_handler.cpp b/skia/ext/SkMemory_new_handler.cpp index 2ab49e3..1799618 100644 --- a/skia/ext/SkMemory_new_handler.cpp +++ b/skia/ext/SkMemory_new_handler.cpp @@ -56,7 +56,7 @@ void* sk_malloc_flags(size_t size, unsigned flags) { p = malloc(size); #else if (!(flags & SK_MALLOC_THROW)) { -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) && !defined(OS_IOS) p = base::UncheckedMalloc(size); #else SkAutoMutexAcquire lock(gSkNewHandlerMutex); |