From 3a2bac0af507789e1194c813e074d266a6abd962 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Tue, 9 Feb 2016 13:36:40 -0500 Subject: [PATCH] Bug 1246756 - part 2 - update Skia moz.build for m49 update. r=jrmuizel --- gfx/skia/generate_mozbuild.py | 1 - gfx/skia/moz.build | 36 +++++++++++++++++------------------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py index c1680225b11f..6c9cee78b896 100755 --- a/gfx/skia/generate_mozbuild.py +++ b/gfx/skia/generate_mozbuild.py @@ -37,7 +37,6 @@ LOCAL_INCLUDES += [ 'skia/include/gpu', 'skia/include/images', 'skia/include/pathops', - 'skia/include/pipe', 'skia/include/ports', 'skia/include/private', 'skia/include/utils', diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build index 93d2c5f8351a..113194078da2 100644 --- a/gfx/skia/moz.build +++ b/gfx/skia/moz.build @@ -25,7 +25,6 @@ UNIFIED_SOURCES += [ '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', @@ -43,6 +42,7 @@ UNIFIED_SOURCES += [ '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', @@ -65,7 +65,6 @@ UNIFIED_SOURCES += [ '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', @@ -76,6 +75,7 @@ UNIFIED_SOURCES += [ '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', @@ -98,6 +98,7 @@ UNIFIED_SOURCES += [ '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', @@ -193,7 +194,6 @@ UNIFIED_SOURCES += [ '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', @@ -216,10 +216,10 @@ UNIFIED_SOURCES += [ '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', @@ -273,17 +273,15 @@ UNIFIED_SOURCES += [ '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', @@ -291,8 +289,6 @@ UNIFIED_SOURCES += [ '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', @@ -391,10 +387,8 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']: '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', @@ -407,7 +401,6 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']: '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', @@ -443,14 +436,12 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']: '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', @@ -463,6 +454,15 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']: '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 += [ @@ -490,7 +490,6 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']: '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', @@ -502,6 +501,8 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']: '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', @@ -654,7 +655,6 @@ LOCAL_INCLUDES += [ 'skia/include/gpu', 'skia/include/images', 'skia/include/pathops', - 'skia/include/pipe', 'skia/include/ports', 'skia/include/private', 'skia/include/utils',