mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-11 10:08:41 +00:00
Bug 1271356 - cut out some utils and effects cruft we don't use in Skia builds. r=jrmuizel
This commit is contained in:
Lee Salzman
parent
4abc47955f
commit
d74f6ef5d6
@ -73,6 +73,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in {
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
||||
DEFINES['UNICODE'] = True
|
||||
DEFINES['_UNICODE'] = True
|
||||
UNIFIED_SOURCES += [
|
||||
'skia/src/fonts/SkFontMgr_indirect.cpp',
|
||||
'skia/src/fonts/SkRemotableFontMgr.cpp',
|
||||
]
|
||||
|
||||
# We should autogenerate these SSE related flags.
|
||||
|
||||
@ -172,23 +176,53 @@ def generate_separated_sources(platform_sources):
|
||||
'experimental',
|
||||
'SkXML',
|
||||
'GrGLCreateNativeInterface',
|
||||
'GrGLCreateNullInterface',
|
||||
'GrGLAssembleInterface',
|
||||
'GrGLTestInterface',
|
||||
'fontconfig',
|
||||
'SkThreadUtils_pthread_',
|
||||
'SkFontConfig',
|
||||
'SkFontMgr_android',
|
||||
'SkFontMgr_custom',
|
||||
'SkFontHost_FreeType.cpp',
|
||||
'SkForceLinking',
|
||||
'Movie',
|
||||
'ImageEncoder',
|
||||
'skia/src/c/',
|
||||
'skia/src/effects/Gr',
|
||||
'skia/src/effects/Sk',
|
||||
'skia/src/fonts/',
|
||||
'skia/src/images/',
|
||||
'skia/src/ports/SkImageGenerator',
|
||||
'SkBitmapRegion',
|
||||
'SkLightingShader',
|
||||
'codec',
|
||||
'SkWGL',
|
||||
'SkMemory_malloc',
|
||||
'SkOpts_',
|
||||
'opts_check_x86',
|
||||
'third_party',
|
||||
# unused in skia/src/utils
|
||||
'SkBitSet',
|
||||
'SkBoundaryPatch',
|
||||
'SkCamera',
|
||||
'SkCanvasStack',
|
||||
'SkCanvasStateUtils',
|
||||
'SkDumpCanvas',
|
||||
'SkFrontBufferedStream',
|
||||
'SkInterpolator',
|
||||
'SkLayer',
|
||||
'SkMatrix44',
|
||||
'SkMeshUtils',
|
||||
'SkMD5',
|
||||
'SkNinePatch',
|
||||
'SkNullCanvas',
|
||||
'SkNWayCanvas',
|
||||
'SkPaintFilterCanvas',
|
||||
'SkParseColor',
|
||||
'SkPatchGrid',
|
||||
'SkRTConf',
|
||||
'SkTextBox',
|
||||
'SkWhitelistTypefaces',
|
||||
]
|
||||
|
||||
def isblacklisted(value):
|
||||
@ -200,6 +234,11 @@ def generate_separated_sources(platform_sources):
|
||||
|
||||
separated = defaultdict(set, {
|
||||
'common': {
|
||||
'skia/src/effects/SkBlurImageFilter.cpp',
|
||||
'skia/src/effects/SkDashPathEffect.cpp',
|
||||
'skia/src/effects/SkGpuBlurUtils.cpp',
|
||||
'skia/src/effects/SkImageSource.cpp',
|
||||
'skia/src/effects/SkLayerRasterizer.cpp',
|
||||
'skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
|
||||
'skia/src/ports/SkDiscardableMemory_none.cpp',
|
||||
'skia/src/ports/SkMemory_mozalloc.cpp',
|
||||
@ -309,7 +348,6 @@ def write_sources(f, values, indent):
|
||||
'GrAA',
|
||||
'GrGL',
|
||||
'GrBatchAtlas.cpp',
|
||||
'SkArithmeticMode_gpu.cpp',
|
||||
'SkImage_Gpu.cpp',
|
||||
'SkPathOpsDebug.cpp',
|
||||
'SkParsePath.cpp',
|
||||
|
||||
@ -14,8 +14,6 @@
|
||||
# DO NOT MODIFY THIS FILE IT IS AUTOGENERATED.
|
||||
#
|
||||
UNIFIED_SOURCES += [
|
||||
'skia/src/c/sk_paint.cpp',
|
||||
'skia/src/c/sk_surface.cpp',
|
||||
'skia/src/core/SkAAClip.cpp',
|
||||
'skia/src/core/SkAlphaRuns.cpp',
|
||||
'skia/src/core/SkAnnotation.cpp',
|
||||
@ -88,7 +86,6 @@ UNIFIED_SOURCES += [
|
||||
'skia/src/core/SkImageFilter.cpp',
|
||||
'skia/src/core/SkImageGenerator.cpp',
|
||||
'skia/src/core/SkImageInfo.cpp',
|
||||
'skia/src/core/SkLightingShader.cpp',
|
||||
'skia/src/core/SkLinearBitmapPipeline.cpp',
|
||||
'skia/src/core/SkLineClipper.cpp',
|
||||
'skia/src/core/SkLocalMatrixImageFilter.cpp',
|
||||
@ -190,58 +187,16 @@ UNIFIED_SOURCES += [
|
||||
'skia/src/effects/gradients/SkRadialGradient.cpp',
|
||||
'skia/src/effects/gradients/SkSweepGradient.cpp',
|
||||
'skia/src/effects/gradients/SkTwoPointConicalGradient.cpp',
|
||||
'skia/src/effects/GrCircleBlurFragmentProcessor.cpp',
|
||||
'skia/src/effects/Sk1DPathEffect.cpp',
|
||||
'skia/src/effects/Sk2DPathEffect.cpp',
|
||||
'skia/src/effects/SkAlphaThresholdFilter.cpp',
|
||||
'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/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',
|
||||
'skia/src/effects/SkEmbossMask.cpp',
|
||||
'skia/src/effects/SkEmbossMaskFilter.cpp',
|
||||
'skia/src/effects/SkImageSource.cpp',
|
||||
'skia/src/effects/SkLayerDrawLooper.cpp',
|
||||
'skia/src/effects/SkLayerRasterizer.cpp',
|
||||
'skia/src/effects/SkLightingImageFilter.cpp',
|
||||
'skia/src/effects/SkLumaColorFilter.cpp',
|
||||
'skia/src/effects/SkMagnifierImageFilter.cpp',
|
||||
'skia/src/effects/SkMergeImageFilter.cpp',
|
||||
'skia/src/effects/SkMorphologyImageFilter.cpp',
|
||||
'skia/src/effects/SkOffsetImageFilter.cpp',
|
||||
'skia/src/effects/SkPackBits.cpp',
|
||||
'skia/src/effects/SkPaintFlagsDrawFilter.cpp',
|
||||
'skia/src/effects/SkPaintImageFilter.cpp',
|
||||
'skia/src/effects/SkPerlinNoiseShader.cpp',
|
||||
'skia/src/effects/SkPictureImageFilter.cpp',
|
||||
'skia/src/effects/SkTableColorFilter.cpp',
|
||||
'skia/src/effects/SkTableMaskFilter.cpp',
|
||||
'skia/src/effects/SkTestImageFilters.cpp',
|
||||
'skia/src/effects/SkTileImageFilter.cpp',
|
||||
'skia/src/fonts/SkFontMgr_indirect.cpp',
|
||||
'skia/src/fonts/SkGScalerContext.cpp',
|
||||
'skia/src/fonts/SkRandomScalerContext.cpp',
|
||||
'skia/src/fonts/SkRemotableFontMgr.cpp',
|
||||
'skia/src/fonts/SkTestScalerContext.cpp',
|
||||
'skia/src/image/SkImage.cpp',
|
||||
'skia/src/image/SkImage_Generator.cpp',
|
||||
'skia/src/image/SkImage_Raster.cpp',
|
||||
'skia/src/image/SkImageShader.cpp',
|
||||
'skia/src/image/SkSurface.cpp',
|
||||
'skia/src/image/SkSurface_Raster.cpp',
|
||||
'skia/src/images/SkJPEGWriteUtility.cpp',
|
||||
'skia/src/lazy/SkDiscardableMemoryPool.cpp',
|
||||
'skia/src/lazy/SkDiscardablePixelRef.cpp',
|
||||
'skia/src/pathops/SkAddIntersections.cpp',
|
||||
@ -286,37 +241,16 @@ UNIFIED_SOURCES += [
|
||||
'skia/src/sfnt/SkOTUtils.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/SkDashPath.cpp',
|
||||
'skia/src/utils/SkDumpCanvas.cpp',
|
||||
'skia/src/utils/SkEventTracer.cpp',
|
||||
'skia/src/utils/SkFrontBufferedStream.cpp',
|
||||
'skia/src/utils/SkInterpolator.cpp',
|
||||
'skia/src/utils/SkLayer.cpp',
|
||||
'skia/src/utils/SkMatrix22.cpp',
|
||||
'skia/src/utils/SkMatrix44.cpp',
|
||||
'skia/src/utils/SkMD5.cpp',
|
||||
'skia/src/utils/SkMeshUtils.cpp',
|
||||
'skia/src/utils/SkNinePatch.cpp',
|
||||
'skia/src/utils/SkNullCanvas.cpp',
|
||||
'skia/src/utils/SkNWayCanvas.cpp',
|
||||
'skia/src/utils/SkOSFile.cpp',
|
||||
'skia/src/utils/SkPaintFilterCanvas.cpp',
|
||||
'skia/src/utils/SkParseColor.cpp',
|
||||
'skia/src/utils/SkPatchGrid.cpp',
|
||||
'skia/src/utils/SkPatchUtils.cpp',
|
||||
'skia/src/utils/SkRGBAToYUV.cpp',
|
||||
'skia/src/utils/SkRTConf.cpp',
|
||||
'skia/src/utils/SkTextBox.cpp',
|
||||
'skia/src/utils/SkTextureCompressor.cpp',
|
||||
'skia/src/utils/SkTextureCompressor_ASTC.cpp',
|
||||
'skia/src/utils/SkTextureCompressor_LATC.cpp',
|
||||
'skia/src/utils/SkTextureCompressor_R11EAC.cpp',
|
||||
'skia/src/utils/SkWhitelistTypefaces.cpp',
|
||||
]
|
||||
SOURCES += [
|
||||
'skia/src/core/SkAdvancedTypefaceMetrics.cpp',
|
||||
@ -334,8 +268,6 @@ SOURCES += [
|
||||
'skia/src/core/SkXfermode4f.cpp',
|
||||
'skia/src/core/SkXfermodeInterpretation.cpp',
|
||||
'skia/src/core/SkXfermodeU64.cpp',
|
||||
'skia/src/effects/SkMatrixConvolutionImageFilter.cpp',
|
||||
'skia/src/effects/SkXfermodeImageFilter.cpp',
|
||||
'skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
|
||||
'skia/src/pathops/SkPathOpsDebug.cpp',
|
||||
'skia/src/utils/SkParse.cpp',
|
||||
@ -466,7 +398,6 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']:
|
||||
'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',
|
||||
@ -477,11 +408,9 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']:
|
||||
'skia/src/gpu/gl/builders/GrGLProgramBuilder.cpp',
|
||||
'skia/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp',
|
||||
'skia/src/gpu/gl/builders/GrGLSLPrettyPrint.cpp',
|
||||
'skia/src/gpu/gl/GrGLAssembleInterface.cpp',
|
||||
'skia/src/gpu/gl/GrGLBuffer.cpp',
|
||||
'skia/src/gpu/gl/GrGLCaps.cpp',
|
||||
'skia/src/gpu/gl/GrGLContext.cpp',
|
||||
'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',
|
||||
@ -496,7 +425,6 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']:
|
||||
'skia/src/gpu/gl/GrGLProgramDesc.cpp',
|
||||
'skia/src/gpu/gl/GrGLRenderTarget.cpp',
|
||||
'skia/src/gpu/gl/GrGLStencilAttachment.cpp',
|
||||
'skia/src/gpu/gl/GrGLTestInterface.cpp',
|
||||
'skia/src/gpu/gl/GrGLTexture.cpp',
|
||||
'skia/src/gpu/gl/GrGLTextureRenderTarget.cpp',
|
||||
'skia/src/gpu/gl/GrGLUniformHandler.cpp',
|
||||
@ -681,6 +609,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in {
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
||||
DEFINES['UNICODE'] = True
|
||||
DEFINES['_UNICODE'] = True
|
||||
UNIFIED_SOURCES += [
|
||||
'skia/src/fonts/SkFontMgr_indirect.cpp',
|
||||
'skia/src/fonts/SkRemotableFontMgr.cpp',
|
||||
]
|
||||
|
||||
# We should autogenerate these SSE related flags.
|
||||
|
||||
|
||||
@ -5,45 +5,12 @@
|
||||
* found in the LICENSE file.
|
||||
*/
|
||||
|
||||
#include "Sk1DPathEffect.h"
|
||||
#include "Sk2DPathEffect.h"
|
||||
#include "SkAlphaThresholdFilter.h"
|
||||
#include "SkArithmeticMode.h"
|
||||
#include "SkArcToPathEffect.h"
|
||||
#include "SkBitmapSourceDeserializer.h"
|
||||
#include "SkBlurDrawLooper.h"
|
||||
#include "SkBlurImageFilter.h"
|
||||
#include "SkBlurMaskFilter.h"
|
||||
#include "SkColorCubeFilter.h"
|
||||
#include "SkColorFilterImageFilter.h"
|
||||
#include "SkColorMatrixFilterRowMajor255.h"
|
||||
#include "SkComposeImageFilter.h"
|
||||
#include "SkCornerPathEffect.h"
|
||||
#include "SkDashPathEffect.h"
|
||||
#include "SkDiscretePathEffect.h"
|
||||
#include "SkDisplacementMapEffect.h"
|
||||
#include "SkDropShadowImageFilter.h"
|
||||
#include "SkEmbossMaskFilter.h"
|
||||
#include "SkGradientShader.h"
|
||||
#include "SkImageSource.h"
|
||||
#include "SkLayerDrawLooper.h"
|
||||
#include "SkLayerRasterizer.h"
|
||||
#include "SkLightingImageFilter.h"
|
||||
#include "SkLightingShader.h"
|
||||
#include "SkLocalMatrixImageFilter.h"
|
||||
#include "SkLumaColorFilter.h"
|
||||
#include "SkMagnifierImageFilter.h"
|
||||
#include "SkMatrixConvolutionImageFilter.h"
|
||||
#include "SkMergeImageFilter.h"
|
||||
#include "SkMorphologyImageFilter.h"
|
||||
#include "SkOffsetImageFilter.h"
|
||||
#include "SkPaintImageFilter.h"
|
||||
#include "SkPerlinNoiseShader.h"
|
||||
#include "SkPictureImageFilter.h"
|
||||
#include "SkTableColorFilter.h"
|
||||
#include "SkTestImageFilters.h"
|
||||
#include "SkTileImageFilter.h"
|
||||
#include "SkXfermodeImageFilter.h"
|
||||
|
||||
// Security note:
|
||||
//
|
||||
@ -65,58 +32,16 @@
|
||||
void SkFlattenable::PrivateInitializer::InitEffects() {
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapSourceDeserializer)
|
||||
|
||||
// MaskFilter
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkEmbossMaskFilter)
|
||||
SkBlurMaskFilter::InitializeFlattenables();
|
||||
|
||||
// DrawLooper
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurDrawLooper)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerDrawLooper)
|
||||
|
||||
// Rasterizer
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerRasterizer)
|
||||
|
||||
// ColorFilter
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorCubeFilter)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorMatrixFilterRowMajor255)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLumaColorFilter)
|
||||
SkAlphaThresholdFilter::InitializeFlattenables();
|
||||
SkArithmeticMode::InitializeFlattenables();
|
||||
SkTableColorFilter::InitializeFlattenables();
|
||||
|
||||
// Shader
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPerlinNoiseShader)
|
||||
SkGradientShader::InitializeFlattenables();
|
||||
SkLightingShader::InitializeFlattenables();
|
||||
|
||||
// PathEffect
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkArcToPathEffect)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkCornerPathEffect)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDashPathEffect)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDiscretePathEffect)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPath1DPathEffect)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLine2DPathEffect)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPath2DPathEffect)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSumPathEffect)
|
||||
|
||||
// ImageFilter
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurImageFilter)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDilateImageFilter)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDisplacementMapEffect)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDropShadowImageFilter)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkErodeImageFilter)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkImageSource)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLocalMatrixImageFilter)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPaintImageFilter)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPictureImageFilter)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkTileImageFilter)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkXfermodeImageFilter)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMagnifierImageFilter)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMatrixConvolutionImageFilter)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkOffsetImageFilter)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeImageFilter)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMergeImageFilter)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorFilterImageFilter)
|
||||
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDownSampleImageFilter)
|
||||
SkLightingImageFilter::InitializeFlattenables();
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user