Bug 1246756 - part 2 - update Skia moz.build for m49 update. r=jrmuizel
authorLee Salzman <lsalzman@mozilla.com>
Tue, 09 Feb 2016 13:36:40 -0500
changeset 283657 e6731baa8120d7089a00d326617fb1c46ed539a4
parent 283656 7efdcd187a97e95103cc9b9e524bedba3f2e5cc1
child 283658 159e0a5a653f2789e0c9b94f41501a4a44f7cb34
push id71631
push userlsalzman@mozilla.com
push dateTue, 09 Feb 2016 23:33:15 +0000
treeherdermozilla-inbound@159e0a5a653f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1246756
milestone47.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 1246756 - part 2 - update Skia moz.build for m49 update. r=jrmuizel
gfx/skia/generate_mozbuild.py
gfx/skia/moz.build
--- a/gfx/skia/generate_mozbuild.py
+++ b/gfx/skia/generate_mozbuild.py
@@ -32,17 +32,16 @@ FINAL_LIBRARY = 'gkmedias'
 LOCAL_INCLUDES += [
     'skia/include/c',
     'skia/include/config',
     'skia/include/core',
     'skia/include/effects',
     'skia/include/gpu',
     'skia/include/images',
     'skia/include/pathops',
-    'skia/include/pipe',
     'skia/include/ports',
     'skia/include/private',
     'skia/include/utils',
     'skia/include/utils/mac',
     'skia/include/utils/win',
     'skia/include/views',
     'skia/src/core',
     'skia/src/gpu',
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -20,17 +20,16 @@ UNIFIED_SOURCES += [
     'skia/src/core/SkAlphaRuns.cpp',
     'skia/src/core/SkAnnotation.cpp',
     'skia/src/core/SkBBHFactory.cpp',
     'skia/src/core/SkBigPicture.cpp',
     'skia/src/core/SkBitmap.cpp',
     'skia/src/core/SkBitmapCache.cpp',
     'skia/src/core/SkBitmapController.cpp',
     'skia/src/core/SkBitmapDevice.cpp',
-    'skia/src/core/SkBitmapFilter.cpp',
     'skia/src/core/SkBitmapHeap.cpp',
     'skia/src/core/SkBitmapProcShader.cpp',
     'skia/src/core/SkBitmapProcState.cpp',
     'skia/src/core/SkBitmapProvider.cpp',
     'skia/src/core/SkBitmapScaler.cpp',
     'skia/src/core/SkBlitMask_D32.cpp',
     'skia/src/core/SkBlitRow_D16.cpp',
     'skia/src/core/SkBlitRow_D32.cpp',
@@ -38,16 +37,17 @@ UNIFIED_SOURCES += [
     'skia/src/core/SkBuffer.cpp',
     'skia/src/core/SkCachedData.cpp',
     'skia/src/core/SkCanvas.cpp',
     'skia/src/core/SkChecksum.cpp',
     'skia/src/core/SkChunkAlloc.cpp',
     'skia/src/core/SkClipStack.cpp',
     'skia/src/core/SkColor.cpp',
     'skia/src/core/SkColorFilter.cpp',
+    'skia/src/core/SkColorFilterShader.cpp',
     'skia/src/core/SkColorTable.cpp',
     'skia/src/core/SkComposeShader.cpp',
     'skia/src/core/SkConfig8888.cpp',
     'skia/src/core/SkConvolver.cpp',
     'skia/src/core/SkCubicClipper.cpp',
     'skia/src/core/SkData.cpp',
     'skia/src/core/SkDataTable.cpp',
     'skia/src/core/SkDebug.cpp',
@@ -60,27 +60,27 @@ UNIFIED_SOURCES += [
     'skia/src/core/SkDraw.cpp',
     'skia/src/core/SkDrawable.cpp',
     'skia/src/core/SkDrawLooper.cpp',
     'skia/src/core/SkEdge.cpp',
     'skia/src/core/SkEdgeBuilder.cpp',
     'skia/src/core/SkEdgeClipper.cpp',
     'skia/src/core/SkError.cpp',
     'skia/src/core/SkFilterProc.cpp',
-    'skia/src/core/SkFilterShader.cpp',
     'skia/src/core/SkFlattenable.cpp',
     'skia/src/core/SkFlattenableSerialization.cpp',
     'skia/src/core/SkFloatBits.cpp',
     'skia/src/core/SkFont.cpp',
     'skia/src/core/SkFontDescriptor.cpp',
     'skia/src/core/SkFontMgr.cpp',
     'skia/src/core/SkFontStream.cpp',
     'skia/src/core/SkFontStyle.cpp',
     'skia/src/core/SkForceCPlusPlusLinking.cpp',
     'skia/src/core/SkGeometry.cpp',
+    'skia/src/core/SkGlobalInitialization_core.cpp',
     'skia/src/core/SkGlyphCache.cpp',
     'skia/src/core/SkGraphics.cpp',
     'skia/src/core/SkHalf.cpp',
     'skia/src/core/SkImageCacherator.cpp',
     'skia/src/core/SkImageFilter.cpp',
     'skia/src/core/SkImageGenerator.cpp',
     'skia/src/core/SkImageInfo.cpp',
     'skia/src/core/SkLightingShader.cpp',
@@ -93,16 +93,17 @@ UNIFIED_SOURCES += [
     'skia/src/core/SkMaskFilter.cpp',
     'skia/src/core/SkMaskGamma.cpp',
     'skia/src/core/SkMath.cpp',
     'skia/src/core/SkMatrix.cpp',
     'skia/src/core/SkMatrixImageFilter.cpp',
     'skia/src/core/SkMetaData.cpp',
     'skia/src/core/SkMiniRecorder.cpp',
     'skia/src/core/SkMipMap.cpp',
+    'skia/src/core/SkModeColorFilter.cpp',
     'skia/src/core/SkMultiPictureDraw.cpp',
     'skia/src/core/SkNinePatchIter.cpp',
     'skia/src/core/SkPackBits.cpp',
     'skia/src/core/SkPaint.cpp',
     'skia/src/core/SkPaintPriv.cpp',
     'skia/src/core/SkPath.cpp',
     'skia/src/core/SkPathEffect.cpp',
     'skia/src/core/SkPathMeasure.cpp',
@@ -188,17 +189,16 @@ UNIFIED_SOURCES += [
     'skia/src/effects/SkArcToPathEffect.cpp',
     'skia/src/effects/SkArithmeticMode.cpp',
     'skia/src/effects/SkBlurDrawLooper.cpp',
     'skia/src/effects/SkBlurImageFilter.cpp',
     'skia/src/effects/SkBlurMask.cpp',
     'skia/src/effects/SkBlurMaskFilter.cpp',
     'skia/src/effects/SkColorCubeFilter.cpp',
     'skia/src/effects/SkColorFilterImageFilter.cpp',
-    'skia/src/effects/SkColorFilters.cpp',
     'skia/src/effects/SkColorMatrix.cpp',
     'skia/src/effects/SkColorMatrixFilter.cpp',
     'skia/src/effects/SkComposeImageFilter.cpp',
     'skia/src/effects/SkCornerPathEffect.cpp',
     'skia/src/effects/SkDashPathEffect.cpp',
     'skia/src/effects/SkDiscretePathEffect.cpp',
     'skia/src/effects/SkDisplacementMapEffect.cpp',
     'skia/src/effects/SkDropShadowImageFilter.cpp',
@@ -211,20 +211,20 @@ UNIFIED_SOURCES += [
     'skia/src/effects/SkLightingImageFilter.cpp',
     'skia/src/effects/SkLumaColorFilter.cpp',
     'skia/src/effects/SkMagnifierImageFilter.cpp',
     'skia/src/effects/SkMatrixConvolutionImageFilter.cpp',
     'skia/src/effects/SkMergeImageFilter.cpp',
     'skia/src/effects/SkMorphologyImageFilter.cpp',
     'skia/src/effects/SkOffsetImageFilter.cpp',
     'skia/src/effects/SkPaintFlagsDrawFilter.cpp',
+    'skia/src/effects/SkPaintImageFilter.cpp',
     'skia/src/effects/SkPerlinNoiseShader.cpp',
     'skia/src/effects/SkPictureImageFilter.cpp',
     'skia/src/effects/SkPixelXorXfermode.cpp',
-    'skia/src/effects/SkRectShaderImageFilter.cpp',
     'skia/src/effects/SkTableColorFilter.cpp',
     'skia/src/effects/SkTableMaskFilter.cpp',
     'skia/src/effects/SkTestImageFilters.cpp',
     'skia/src/effects/SkTileImageFilter.cpp',
     'skia/src/effects/SkXfermodeImageFilter.cpp',
     'skia/src/fonts/SkFontMgr_indirect.cpp',
     'skia/src/fonts/SkGScalerContext.cpp',
     'skia/src/fonts/SkRandomScalerContext.cpp',
@@ -268,36 +268,32 @@ UNIFIED_SOURCES += [
     'skia/src/pathops/SkPathOpsRect.cpp',
     'skia/src/pathops/SkPathOpsSimplify.cpp',
     'skia/src/pathops/SkPathOpsTightBounds.cpp',
     'skia/src/pathops/SkPathOpsTSect.cpp',
     'skia/src/pathops/SkPathOpsTypes.cpp',
     'skia/src/pathops/SkPathOpsWinding.cpp',
     'skia/src/pathops/SkPathWriter.cpp',
     'skia/src/pathops/SkReduceOrder.cpp',
-    'skia/src/pipe/SkGPipeRead.cpp',
-    'skia/src/pipe/SkGPipeWrite.cpp',
     'skia/src/ports/SkDiscardableMemory_none.cpp',
     'skia/src/ports/SkGlobalInitialization_default.cpp',
     'skia/src/ports/SkImageDecoder_empty.cpp',
     'skia/src/ports/SkImageGenerator_skia.cpp',
     'skia/src/ports/SkMemory_mozalloc.cpp',
+    'skia/src/ports/SkOSEnvironment.cpp',
     'skia/src/ports/SkOSFile_stdio.cpp',
     'skia/src/sfnt/SkOTTable_name.cpp',
     'skia/src/sfnt/SkOTUtils.cpp',
-    'skia/src/utils/android/SkAndroidSDKCanvas.cpp',
     'skia/src/utils/SkBase64.cpp',
     'skia/src/utils/SkBitmapSourceDeserializer.cpp',
     'skia/src/utils/SkBitSet.cpp',
     'skia/src/utils/SkBoundaryPatch.cpp',
     'skia/src/utils/SkCamera.cpp',
     'skia/src/utils/SkCanvasStack.cpp',
     'skia/src/utils/SkCanvasStateUtils.cpp',
-    'skia/src/utils/SkCubicInterval.cpp',
-    'skia/src/utils/SkCullPoints.cpp',
     'skia/src/utils/SkDashPath.cpp',
     'skia/src/utils/SkDumpCanvas.cpp',
     'skia/src/utils/SkEventTracer.cpp',
     'skia/src/utils/SkFrontBufferedStream.cpp',
     'skia/src/utils/SkImageGeneratorUtils.cpp',
     'skia/src/utils/SkInterpolator.cpp',
     'skia/src/utils/SkLayer.cpp',
     'skia/src/utils/SkMatrix22.cpp',
@@ -386,33 +382,30 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']:
         'skia/src/gpu/gl/debug/GrFrameBufferObj.cpp',
         'skia/src/gpu/gl/debug/GrProgramObj.cpp',
         'skia/src/gpu/gl/debug/GrShaderObj.cpp',
         'skia/src/gpu/gl/debug/GrTextureObj.cpp',
         'skia/src/gpu/gl/debug/GrTextureUnitObj.cpp',
         'skia/src/gpu/gl/debug/SkDebugGLContext.cpp',
         'skia/src/gpu/gl/SkGLContext.cpp',
         'skia/src/gpu/gl/SkNullGLContext.cpp',
-        'skia/src/gpu/GrAtlasTextBlob.cpp',
-        'skia/src/gpu/GrAtlasTextContext.cpp',
+        'skia/src/gpu/GrAuditTrail.cpp',
         'skia/src/gpu/GrBatchFlushState.cpp',
-        'skia/src/gpu/GrBatchFontCache.cpp',
         'skia/src/gpu/GrBatchTest.cpp',
         'skia/src/gpu/GrBlend.cpp',
         'skia/src/gpu/GrBlurUtils.cpp',
         'skia/src/gpu/GrBufferAllocPool.cpp',
         'skia/src/gpu/GrCaps.cpp',
         'skia/src/gpu/GrClip.cpp',
         'skia/src/gpu/GrClipMaskManager.cpp',
         'skia/src/gpu/GrContext.cpp',
         'skia/src/gpu/GrCoordTransform.cpp',
         'skia/src/gpu/GrDefaultGeoProcFactory.cpp',
         'skia/src/gpu/GrDrawingManager.cpp',
         'skia/src/gpu/GrDrawTarget.cpp',
-        'skia/src/gpu/GrFontScaler.cpp',
         'skia/src/gpu/GrFragmentProcessor.cpp',
         'skia/src/gpu/GrGpu.cpp',
         'skia/src/gpu/GrGpuFactory.cpp',
         'skia/src/gpu/GrGpuResource.cpp',
         'skia/src/gpu/GrGpuResourceRef.cpp',
         'skia/src/gpu/GrImageIDTextureAdjuster.cpp',
         'skia/src/gpu/GrInvariantOutput.cpp',
         'skia/src/gpu/GrLayerAtlas.cpp',
@@ -438,36 +431,43 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']:
         'skia/src/gpu/GrRecordReplaceDraw.cpp',
         'skia/src/gpu/GrRectanizer_pow2.cpp',
         'skia/src/gpu/GrRectanizer_skyline.cpp',
         'skia/src/gpu/GrReducedClip.cpp',
         'skia/src/gpu/GrRenderTarget.cpp',
         'skia/src/gpu/GrResourceProvider.cpp',
         'skia/src/gpu/GrSoftwarePathRenderer.cpp',
         'skia/src/gpu/GrStencil.cpp',
-        'skia/src/gpu/GrStencilAndCoverTextContext.cpp',
         'skia/src/gpu/GrStencilAttachment.cpp',
         'skia/src/gpu/GrStrokeInfo.cpp',
         'skia/src/gpu/GrSurface.cpp',
         'skia/src/gpu/GrSWMaskHelper.cpp',
+        'skia/src/gpu/GrTessellator.cpp',
         'skia/src/gpu/GrTestUtils.cpp',
-        'skia/src/gpu/GrTextBlobCache.cpp',
-        'skia/src/gpu/GrTextContext.cpp',
         'skia/src/gpu/GrTexture.cpp',
         'skia/src/gpu/GrTextureAccess.cpp',
         'skia/src/gpu/GrTextureParamsAdjuster.cpp',
         'skia/src/gpu/GrTextureProvider.cpp',
         'skia/src/gpu/GrTraceMarker.cpp',
         'skia/src/gpu/GrXferProcessor.cpp',
         'skia/src/gpu/GrYUVProvider.cpp',
         'skia/src/gpu/SkGpuDevice.cpp',
         'skia/src/gpu/SkGpuDevice_drawTexture.cpp',
         'skia/src/gpu/SkGr.cpp',
         'skia/src/gpu/SkGrPixelRef.cpp',
         'skia/src/gpu/SkGrTexturePixelRef.cpp',
+        'skia/src/gpu/text/GrAtlasTextBlob.cpp',
+        'skia/src/gpu/text/GrAtlasTextContext.cpp',
+        'skia/src/gpu/text/GrBatchFontCache.cpp',
+        'skia/src/gpu/text/GrDistanceFieldAdjustTable.cpp',
+        'skia/src/gpu/text/GrFontScaler.cpp',
+        'skia/src/gpu/text/GrStencilAndCoverTextContext.cpp',
+        'skia/src/gpu/text/GrTextBlobCache.cpp',
+        'skia/src/gpu/text/GrTextContext.cpp',
+        'skia/src/gpu/text/GrTextUtils.cpp',
         'skia/src/image/SkSurface_Gpu.cpp',
     ]
     SOURCES += [
         'skia/src/effects/SkArithmeticMode_gpu.cpp',
         'skia/src/gpu/batches/GrAAConvexPathRenderer.cpp',
         'skia/src/gpu/batches/GrAAConvexTessellator.cpp',
         'skia/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp',
         'skia/src/gpu/batches/GrAAFillRectBatch.cpp',
@@ -485,28 +485,29 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']:
         'skia/src/gpu/gl/GrGLCreateNullInterface.cpp',
         'skia/src/gpu/gl/GrGLDefaultInterface_native.cpp',
         'skia/src/gpu/gl/GrGLExtensions.cpp',
         'skia/src/gpu/gl/GrGLGLSL.cpp',
         'skia/src/gpu/gl/GrGLGpu.cpp',
         'skia/src/gpu/gl/GrGLGpuProgramCache.cpp',
         'skia/src/gpu/gl/GrGLIndexBuffer.cpp',
         'skia/src/gpu/gl/GrGLInterface.cpp',
-        'skia/src/gpu/gl/GrGLNameAllocator.cpp',
         'skia/src/gpu/gl/GrGLNoOpInterface.cpp',
         'skia/src/gpu/gl/GrGLPath.cpp',
         'skia/src/gpu/gl/GrGLPathRange.cpp',
         'skia/src/gpu/gl/GrGLPathRendering.cpp',
         'skia/src/gpu/gl/GrGLProgram.cpp',
         'skia/src/gpu/gl/GrGLProgramDataManager.cpp',
         'skia/src/gpu/gl/GrGLProgramDesc.cpp',
         'skia/src/gpu/gl/GrGLRenderTarget.cpp',
         'skia/src/gpu/gl/GrGLStencilAttachment.cpp',
         'skia/src/gpu/gl/GrGLTexture.cpp',
         'skia/src/gpu/gl/GrGLTextureRenderTarget.cpp',
+        'skia/src/gpu/gl/GrGLTransferBuffer.cpp',
+        'skia/src/gpu/gl/GrGLUniformHandler.cpp',
         'skia/src/gpu/gl/GrGLUtil.cpp',
         'skia/src/gpu/gl/GrGLVaryingHandler.cpp',
         'skia/src/gpu/gl/GrGLVertexArray.cpp',
         'skia/src/gpu/gl/GrGLVertexBuffer.cpp',
         'skia/src/gpu/glsl/GrGLSL.cpp',
         'skia/src/gpu/glsl/GrGLSLBlend.cpp',
         'skia/src/gpu/glsl/GrGLSLCaps.cpp',
         'skia/src/gpu/glsl/GrGLSLFragmentProcessor.cpp',
@@ -649,17 +650,16 @@ FINAL_LIBRARY = 'gkmedias'
 LOCAL_INCLUDES += [
     'skia/include/c',
     'skia/include/config',
     'skia/include/core',
     'skia/include/effects',
     'skia/include/gpu',
     'skia/include/images',
     'skia/include/pathops',
-    'skia/include/pipe',
     'skia/include/ports',
     'skia/include/private',
     'skia/include/utils',
     'skia/include/utils/mac',
     'skia/include/utils/win',
     'skia/include/views',
     'skia/src/core',
     'skia/src/gpu',