Bug 910754 - Use SkMemory_mozalloc instead r=snorp

This commit is contained in:
George Wright 2014-03-13 09:50:51 -04:00
parent 609e9a9f16
commit 1c935ca879
2 changed files with 3 additions and 1 deletions

View File

@ -160,6 +160,7 @@ def generate_separated_sources(platform_sources):
'SkWGL',
'SkImages',
'SkDiscardableMemory_ashmem'
'SkMemory_malloc'
]
def isblacklisted(value):
@ -175,6 +176,7 @@ def generate_separated_sources(platform_sources):
'trunk/src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
'trunk/src/ports/SkDiscardableMemory_none.cpp',
'trunk/src/ports/SkImageDecoder_empty.cpp',
'trunk/src/ports/SkMemory_mozalloc.cpp',
# 'trunk/src/images/SkImages.cpp',
# 'trunk/src/images/SkImageRef.cpp',
# 'trunk/src/images/SkImageRef_GlobalPool.cpp',

View File

@ -656,7 +656,7 @@ SOURCES += [
'trunk/src/ports/SkDiscardableMemory_none.cpp',
'trunk/src/ports/SkGlobalInitialization_default.cpp',
'trunk/src/ports/SkImageDecoder_empty.cpp',
'trunk/src/ports/SkMemory_malloc.cpp',
'trunk/src/ports/SkMemory_mozalloc.cpp',
'trunk/src/ports/SkOSFile_stdio.cpp',
'trunk/src/sfnt/SkOTTable_name.cpp',
'trunk/src/sfnt/SkOTUtils.cpp',