Bug 974900 - re-unify the Skia build - r=ehsan
authorBenoit Jacob <bjacob@mozilla.com>
Fri, 06 Jun 2014 15:38:08 -0400
changeset 207633 123b94215b3ef74457aeafd820698f03ad2dacf5
parent 207632 f0d95520c476bb2db2254992798e53c921494323
child 207634 568758b30cb2027cc61ea17c8f7e9da35583e298
push id494
push userraliiev@mozilla.com
push dateMon, 25 Aug 2014 18:42:16 +0000
treeherdermozilla-release@a3cc3e46b571 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs974900
milestone32.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 974900 - re-unify the Skia build - r=ehsan
gfx/skia/moz.build
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -304,40 +304,35 @@ EXPORTS.skia += [
     'trunk/include/xml/SkXMLParser.h',
     'trunk/include/xml/SkXMLWriter.h',
     'trunk/src/ports/SkAtomics_android.h',
     'trunk/src/ports/SkAtomics_sync.h',
     'trunk/src/ports/SkAtomics_win.h',
     'trunk/src/ports/SkMutex_pthread.h',
     'trunk/src/ports/SkMutex_win.h',
 ]
-SOURCES += [
+UNIFIED_SOURCES += [
     'trunk/src/core/SkAAClip.cpp',
     'trunk/src/core/SkAdvancedTypefaceMetrics.cpp',
     'trunk/src/core/SkAlphaRuns.cpp',
     'trunk/src/core/SkAnnotation.cpp',
     'trunk/src/core/SkBBoxHierarchyRecord.cpp',
     'trunk/src/core/SkBBoxRecord.cpp',
     'trunk/src/core/SkBitmap.cpp',
     'trunk/src/core/SkBitmap_scroll.cpp',
     'trunk/src/core/SkBitmapDevice.cpp',
     'trunk/src/core/SkBitmapFilter.cpp',
     'trunk/src/core/SkBitmapHeap.cpp',
     'trunk/src/core/SkBitmapProcShader.cpp',
     'trunk/src/core/SkBitmapProcState.cpp',
-    'trunk/src/core/SkBitmapProcState_matrixProcs.cpp',
     'trunk/src/core/SkBitmapScaler.cpp',
     'trunk/src/core/SkBlitMask_D32.cpp',
     'trunk/src/core/SkBlitRow_D16.cpp',
     'trunk/src/core/SkBlitRow_D32.cpp',
     'trunk/src/core/SkBlitter.cpp',
-    'trunk/src/core/SkBlitter_A8.cpp',
-    'trunk/src/core/SkBlitter_ARGB32.cpp',
-    'trunk/src/core/SkBlitter_RGB16.cpp',
-    'trunk/src/core/SkBlitter_Sprite.cpp',
     'trunk/src/core/SkBuffer.cpp',
     'trunk/src/core/SkCanvas.cpp',
     'trunk/src/core/SkChunkAlloc.cpp',
     'trunk/src/core/SkClipStack.cpp',
     'trunk/src/core/SkColor.cpp',
     'trunk/src/core/SkColorFilter.cpp',
     'trunk/src/core/SkColorTable.cpp',
     'trunk/src/core/SkComposeShader.cpp',
@@ -413,17 +408,16 @@ SOURCES += [
     'trunk/src/core/SkRegion.cpp',
     'trunk/src/core/SkRegion_path.cpp',
     'trunk/src/core/SkRRect.cpp',
     'trunk/src/core/SkRTree.cpp',
     'trunk/src/core/SkScalar.cpp',
     'trunk/src/core/SkScaledImageCache.cpp',
     'trunk/src/core/SkScalerContext.cpp',
     'trunk/src/core/SkScan.cpp',
-    'trunk/src/core/SkScan_Antihair.cpp',
     'trunk/src/core/SkScan_AntiPath.cpp',
     'trunk/src/core/SkScan_Hairline.cpp',
     'trunk/src/core/SkScan_Path.cpp',
     'trunk/src/core/SkShader.cpp',
     'trunk/src/core/SkSpriteBlitter_ARGB32.cpp',
     'trunk/src/core/SkSpriteBlitter_RGB16.cpp',
     'trunk/src/core/SkStream.cpp',
     'trunk/src/core/SkString.cpp',
@@ -548,29 +542,27 @@ SOURCES += [
     'trunk/src/gpu/gl/GrGLVertexBuffer.cpp',
     'trunk/src/gpu/gl/GrGpuGL.cpp',
     'trunk/src/gpu/gl/GrGpuGL_program.cpp',
     'trunk/src/gpu/gl/SkGLContextHelper.cpp',
     'trunk/src/gpu/gl/SkNullGLContext.cpp',
     'trunk/src/gpu/GrAAConvexPathRenderer.cpp',
     'trunk/src/gpu/GrAAHairLinePathRenderer.cpp',
     'trunk/src/gpu/GrAARectRenderer.cpp',
-    'trunk/src/gpu/GrAddPathRenderers_default.cpp',
     'trunk/src/gpu/GrAllocPool.cpp',
     'trunk/src/gpu/GrAtlas.cpp',
     'trunk/src/gpu/GrBitmapTextContext.cpp',
     'trunk/src/gpu/GrBlend.cpp',
     'trunk/src/gpu/GrBufferAllocPool.cpp',
     'trunk/src/gpu/GrCacheID.cpp',
     'trunk/src/gpu/GrClipData.cpp',
     'trunk/src/gpu/GrClipMaskCache.cpp',
     'trunk/src/gpu/GrClipMaskManager.cpp',
     'trunk/src/gpu/GrContext.cpp',
     'trunk/src/gpu/GrDefaultPathRenderer.cpp',
-    'trunk/src/gpu/GrDistanceFieldTextContext.cpp',
     'trunk/src/gpu/GrDrawState.cpp',
     'trunk/src/gpu/GrDrawTarget.cpp',
     'trunk/src/gpu/GrEffect.cpp',
     'trunk/src/gpu/GrGpu.cpp',
     'trunk/src/gpu/GrGpuFactory.cpp',
     'trunk/src/gpu/GrInOrderDrawBuffer.cpp',
     'trunk/src/gpu/GrMemoryPool.cpp',
     'trunk/src/gpu/GrOvalRenderer.cpp',
@@ -658,17 +650,16 @@ SOURCES += [
     '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',
     'trunk/src/utils/SkCanvasStateUtils.cpp',
-    'trunk/src/utils/SkCondVar.cpp',
     'trunk/src/utils/SkCountdown.cpp',
     'trunk/src/utils/SkCubicInterval.cpp',
     'trunk/src/utils/SkCullPoints.cpp',
     'trunk/src/utils/SkDeferredCanvas.cpp',
     'trunk/src/utils/SkDumpCanvas.cpp',
     'trunk/src/utils/SkEventTracer.cpp',
     'trunk/src/utils/SkFrontBufferedStream.cpp',
     'trunk/src/utils/SkGatherPixelRefsAndRects.cpp',
@@ -676,26 +667,37 @@ SOURCES += [
     'trunk/src/utils/SkLayer.cpp',
     'trunk/src/utils/SkMatrix44.cpp',
     'trunk/src/utils/SkMD5.cpp',
     'trunk/src/utils/SkMeshUtils.cpp',
     'trunk/src/utils/SkNinePatch.cpp',
     'trunk/src/utils/SkNullCanvas.cpp',
     'trunk/src/utils/SkNWayCanvas.cpp',
     'trunk/src/utils/SkOSFile.cpp',
-    'trunk/src/utils/SkParse.cpp',
     'trunk/src/utils/SkParseColor.cpp',
     'trunk/src/utils/SkParsePath.cpp',
     'trunk/src/utils/SkPathUtils.cpp',
     'trunk/src/utils/SkPictureUtils.cpp',
     'trunk/src/utils/SkProxyCanvas.cpp',
     'trunk/src/utils/SkRTConf.cpp',
     'trunk/src/utils/SkSHA1.cpp',
     'trunk/src/utils/SkUnitMappers.cpp',
 ]
+SOURCES += [
+    'trunk/src/core/SkBitmapProcState_matrixProcs.cpp',
+    'trunk/src/core/SkBlitter_A8.cpp',
+    'trunk/src/core/SkBlitter_ARGB32.cpp',
+    'trunk/src/core/SkBlitter_RGB16.cpp',
+    'trunk/src/core/SkBlitter_Sprite.cpp',
+    'trunk/src/core/SkScan_Antihair.cpp',
+    'trunk/src/gpu/GrAddPathRenderers_default.cpp',
+    'trunk/src/gpu/GrDistanceFieldTextContext.cpp',
+    'trunk/src/utils/SkCondVar.cpp',
+    'trunk/src/utils/SkParse.cpp',
+]
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
     SOURCES += [
         'trunk/src/images/SkImageRef_ashmem.cpp',
         'trunk/src/ports/SkDebug_android.cpp',
         'trunk/src/ports/SkFontHost_android_old.cpp',
         'trunk/src/ports/SkFontHost_cairo.cpp',
         'trunk/src/ports/SkFontHost_FreeType.cpp',
         'trunk/src/ports/SkFontHost_FreeType_common.cpp',