Bug 974272 - Unbreak skia on tier3 platforms by dropping unused setProcessorAffinity() implementation. r=gw280
authorJan Beich <jbeich@tormail.org>
Thu, 20 Feb 2014 09:35:58 -0500
changeset 187921 e2d30842fedb1056f32ed4b8afe0ee70ce413161
parent 187920 f75f99b377eeb5fa0d9534f959df405d0e8bda75
child 187922 6d098abf43ad9085a3b9f82e78710895f680f9f0
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgw280
bugs974272
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 974272 - Unbreak skia on tier3 platforms by dropping unused setProcessorAffinity() implementation. r=gw280
gfx/skia/generate_mozbuild.py
gfx/skia/moz.build
--- a/gfx/skia/generate_mozbuild.py
+++ b/gfx/skia/generate_mozbuild.py
@@ -126,16 +126,17 @@ def generate_separated_sources(platform_
     '_gif',
     'SkFontConfigParser_android',
     'SkJpeg',
     'SkXML',
     'SkCity',
     'GrGLCreateNativeInterface',
     'fontconfig',
     '_neon',
+    'SkThreadUtils_pthread_',
     'SkImage_Codec',
     'SkBitmapChecksummer',
     'SkNativeGLContext',
     'SkFontConfig',
     'SkFontHost_win_dw',
     'SkForceLinking',
     'SkMovie',
     'SkImageDecoder',
@@ -170,17 +171,16 @@ def generate_separated_sources(platform_
       # 'trunk/src/ports/SkDebug_android.cpp',
       'trunk/src/ports/SkFontHost_cairo.cpp',
       # 'trunk/src/ports/SkFontHost_FreeType.cpp',
       # 'trunk/src/ports/SkFontHost_FreeType_common.cpp',
       # 'trunk/src/ports/SkThread_pthread.cpp',
       # 'trunk/src/ports/SkPurgeableMemoryBlock_android.cpp',
       # 'trunk/src/ports/SkTime_Unix.cpp',
       # 'trunk/src/utils/SkThreadUtils_pthread.cpp',
-      # 'trunk/src/utils/SkThreadUtils_pthread_other.cpp',
       # 'trunk/src/images/SkImageRef_ashmem.cpp',
       # 'trunk/src/utils/android/ashmem.cpp',
     },
     'linux': {
       'trunk/src/ports/SkFontHost_cairo.cpp',
     },
     'intel': {
       'trunk/src/opts/SkXfermode_opts_none.cpp',
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -704,43 +704,40 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and
         'trunk/src/ports/SkFontHost_FreeType.cpp',
         'trunk/src/ports/SkFontHost_FreeType_common.cpp',
         'trunk/src/ports/SkOSFile_posix.cpp',
         'trunk/src/ports/SkPurgeableMemoryBlock_android.cpp',
         'trunk/src/ports/SkTime_Unix.cpp',
         'trunk/src/ports/SkTLS_pthread.cpp',
         'trunk/src/utils/android/ashmem.cpp',
         'trunk/src/utils/SkThreadUtils_pthread.cpp',
-        'trunk/src/utils/SkThreadUtils_pthread_other.cpp',
     ]
     DEFINES['SK_FONTHOST_CAIRO_STANDALONE'] = 0
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     SOURCES += [
         'trunk/src/ports/SkDebug_stdio.cpp',
         'trunk/src/ports/SkFontHost_mac.cpp',
         'trunk/src/ports/SkOSFile_posix.cpp',
         'trunk/src/ports/SkPurgeableMemoryBlock_mac.cpp',
         'trunk/src/ports/SkTime_Unix.cpp',
         'trunk/src/ports/SkTLS_pthread.cpp',
         'trunk/src/utils/mac/SkCreateCGImageRef.cpp',
         'trunk/src/utils/mac/SkStream_mac.cpp',
         'trunk/src/utils/SkThreadUtils_pthread.cpp',
-        'trunk/src/utils/SkThreadUtils_pthread_mach.cpp',
     ]
 if CONFIG['MOZ_WIDGET_GTK']:
     SOURCES += [
         'trunk/src/ports/SkDebug_stdio.cpp',
         'trunk/src/ports/SkFontHost_cairo.cpp',
         'trunk/src/ports/SkFontHost_FreeType.cpp',
         'trunk/src/ports/SkFontHost_FreeType_common.cpp',
         'trunk/src/ports/SkOSFile_posix.cpp',
         'trunk/src/ports/SkTime_Unix.cpp',
         'trunk/src/ports/SkTLS_pthread.cpp',
         'trunk/src/utils/SkThreadUtils_pthread.cpp',
-        'trunk/src/utils/SkThreadUtils_pthread_linux.cpp',
     ]
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     SOURCES += [
         'trunk/src/ports/SkDebug_win.cpp',
         'trunk/src/ports/SkFontHost_win.cpp',
         'trunk/src/ports/SkFontMgr_default_gdi.cpp',
         'trunk/src/ports/SkOSFile_win.cpp',
         'trunk/src/ports/SkTime_win.cpp',