Bug 910754 - Use SkMemory_mozalloc instead r=snorp
authorGeorge Wright <george@mozilla.com>
Thu, 13 Mar 2014 09:50:51 -0400
changeset 173431 beb1b8402d96c3137ce7aeecab7e1f7a7a024945
parent 173430 21ad5a22138200921bbb78e155c2a573974dfd57
child 173432 d7e998c17c498d724682113871bc61cc836fc23b
push id26403
push userryanvm@gmail.com
push dateThu, 13 Mar 2014 19:32:04 +0000
treeherdermozilla-central@fe40387eba1a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssnorp
bugs910754
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 910754 - Use SkMemory_mozalloc instead r=snorp
gfx/skia/generate_mozbuild.py
gfx/skia/moz.build
--- a/gfx/skia/generate_mozbuild.py
+++ b/gfx/skia/generate_mozbuild.py
@@ -155,31 +155,33 @@ def generate_separated_sources(platform_
     'SkForceLinking',
     'SkMovie',
     'SkImageDecoder',
     'SkImageEncoder',
     'SkBitmapHasher',
     'SkWGL',
     'SkImages',
     'SkDiscardableMemory_ashmem'
+    'SkMemory_malloc'
   ]
 
   def isblacklisted(value):
     for item in blacklist:
       if value.find(item) >= 0:
         return True
 
     return False
 
   separated = {
     'common': {
       #'trunk/src/effects/gradients/SkGradientTileProc.cpp',
       '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',
       # 'trunk/src/images/SkImageRefPool.cpp',
       # 'trunk/src/images/SkImageDecoder.cpp',
       # 'trunk/src/images/SkImageDecoder_Factory.cpp',
     },
     'android': {
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -651,17 +651,17 @@ SOURCES += [
     'trunk/src/pathops/SkPathWriter.cpp',
     'trunk/src/pathops/SkQuarticRoot.cpp',
     'trunk/src/pathops/SkReduceOrder.cpp',
     'trunk/src/pipe/SkGPipeRead.cpp',
     'trunk/src/pipe/SkGPipeWrite.cpp',
     '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',
     'trunk/src/utils/SkBase64.cpp',
     'trunk/src/utils/SkBitSet.cpp',
     'trunk/src/utils/SkBoundaryPatch.cpp',
     'trunk/src/utils/SkCamera.cpp',
     'trunk/src/utils/SkCanvasStack.cpp',