Revert[7] "replace SkXfermode obj with SkBlendMode enum in paints"
authorMike Reed <reed@google.com>
Wed, 5 Oct 2016 19:59:51 +0000 (19:59 +0000)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Wed, 5 Oct 2016 20:20:14 +0000 (20:20 +0000)
commitc245574ba3d0e2ade6c94b2812de3baa383bf4c4
treee008f8500d56d8487a2941cb217c5ff8d1151dcf
parent62f6856ebe003743192508653914b5e01ffcc857
Revert[7] "replace SkXfermode obj with SkBlendMode enum in paints"

This reverts commit Ib4a154cdd5f5d1dcac921ef50d53b79a2d6a1be8.

Reason for revert: new assert from 100K bot

Original change's description:
> Revert[6] "replace SkXfermode obj with SkBlendMode enum in paints"
>
> - perform version check in CreateProc for XfermodeImageFilter and ArithmeticImageFilter
> This reverts commit 3ed485f4249e17abb4b11f5018d03175fd1afb44.
>
> BUG=skia:
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2992
>
> Change-Id: Ib4a154cdd5f5d1dcac921ef50d53b79a2d6a1be8
> Reviewed-on: https://skia-review.googlesource.com/2992
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
>

TBR=reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: I848e5a69c5cd67f2c14889f4f0a346652578c4ff
Reviewed-on: https://skia-review.googlesource.com/3023
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
139 files changed:
bench/RectBench.cpp
bench/RotatedRectBench.cpp
bench/XfermodeBench.cpp
dm/DMSrcSink.cpp
fuzz/FilterFuzz.cpp
gm/aaclip.cpp
gm/aarectmodes.cpp
gm/aaxfermodes.cpp
gm/bitmaprect.cpp
gm/blurredclippedcircle.cpp
gm/colormatrix.cpp
gm/colortypexfermode.cpp
gm/drawatlas.cpp
gm/drawatlascolor.cpp
gm/dstreadshuffle.cpp
gm/gamma.cpp
gm/gm.cpp
gm/hairmodes.cpp
gm/imagefilters.cpp
gm/imagefiltersgraph.cpp
gm/imagefilterstransformed.cpp
gm/lcdblendmodes.cpp
gm/lcdoverlap.cpp
gm/lumafilter.cpp
gm/modecolorfilters.cpp
gm/picture.cpp
gm/plus.cpp
gm/srcmode.cpp
gm/textblobblockreordering.cpp
gm/textbloblooper.cpp
gm/texteffects.cpp
gm/texturedomaineffect.cpp
gm/verylargebitmap.cpp
gm/xfermodeimagefilter.cpp
gm/xfermodes.cpp
gm/xfermodes2.cpp
gm/xfermodes3.cpp
gyp/skia_for_android_framework_defines.gypi
include/core/SkBlendMode.h [deleted file]
include/core/SkCanvas.h
include/core/SkColorFilter.h
include/core/SkPaint.h
include/core/SkPicture.h
include/core/SkXfermode.h
include/effects/SkXfermodeImageFilter.h
include/gpu/GrPaint.h
include/gpu/effects/GrPorterDuffXferProcessor.h
public.bzl
samplecode/SampleAARectModes.cpp
samplecode/SampleAll.cpp
samplecode/SampleApp.cpp
samplecode/SampleColorFilter.cpp
samplecode/SampleFatBits.cpp
samplecode/SampleFilterFuzz.cpp
samplecode/SampleFuzz.cpp
samplecode/SampleHairModes.cpp
samplecode/SampleLayerMask.cpp
samplecode/SampleLayers.cpp
samplecode/SamplePathClip.cpp
samplecode/SampleQuadStroker.cpp
samplecode/SampleRegion.cpp
samplecode/SampleSlides.cpp
samplecode/SampleXfer.cpp
samplecode/SampleXfermodesBlur.cpp
src/c/sk_paint.cpp
src/core/SkBitmapDevice.cpp
src/core/SkBlendModePriv.h [deleted file]
src/core/SkBlitter.cpp
src/core/SkBlitter_A8.cpp
src/core/SkBlitter_ARGB32.cpp
src/core/SkBlitter_PM4f.cpp
src/core/SkBlitter_RGB16.cpp
src/core/SkBlitter_Sprite.cpp
src/core/SkCanvas.cpp
src/core/SkDraw.cpp
src/core/SkGpuBlurUtils.cpp
src/core/SkImageFilter.cpp
src/core/SkMatrixImageFilter.cpp
src/core/SkPaint.cpp
src/core/SkPaintPriv.cpp
src/core/SkPixmap.cpp
src/core/SkRasterPipelineBlitter.cpp
src/core/SkReadBuffer.h
src/core/SkRecordDraw.cpp
src/core/SkRecordOpts.cpp
src/core/SkSpriteBlitter4f.cpp
src/core/SkSpriteBlitter_ARGB32.cpp
src/core/SkSpriteBlitter_RGB16.cpp
src/core/SkXfermode.cpp
src/core/SkXfermodeInterpretation.cpp
src/effects/SkAlphaThresholdFilter.cpp
src/effects/SkColorFilterImageFilter.cpp
src/effects/SkDisplacementMapEffect.cpp
src/effects/SkDropShadowImageFilter.cpp
src/effects/SkImageSource.cpp
src/effects/SkLayerDrawLooper.cpp
src/effects/SkLightingImageFilter.cpp
src/effects/SkMergeImageFilter.cpp
src/effects/SkMorphologyImageFilter.cpp
src/effects/SkOffsetImageFilter.cpp
src/effects/SkTileImageFilter.cpp
src/effects/SkXfermodeImageFilter.cpp
src/gpu/GrContext.cpp
src/gpu/GrDrawContext.cpp
src/gpu/GrSWMaskHelper.cpp
src/gpu/GrTextureParamsAdjuster.cpp
src/gpu/GrTextureToYUVPlanes.cpp
src/gpu/GrYUVProvider.cpp
src/gpu/SkGr.cpp
src/gpu/effects/GrConfigConversionEffect.cpp
src/gpu/text/GrTextUtils.cpp
src/image/SkImage.cpp
src/pdf/SkPDFDevice.cpp
src/pdf/SkPDFDevice.h
src/pdf/SkPDFGraphicState.cpp
src/pdf/SkPDFGraphicState.h
src/pipe/SkPipeCanvas.cpp
src/pipe/SkPipeFormat.h
src/pipe/SkPipeReader.cpp
src/utils/SkDumpCanvas.cpp
src/utils/SkLua.cpp
src/utils/SkRGBAToYUV.cpp
src/xps/SkXPSDevice.cpp
tests/ApplyGammaTest.cpp
tests/ImageFilterTest.cpp
tests/ImageTest.cpp
tests/LayerDrawLooperTest.cpp
tests/PDFOpaqueSrcModeToSrcOverTest.cpp
tests/PaintTest.cpp
tests/ReadPixelsTest.cpp
tests/RecordDrawTest.cpp
tests/RecordOptsTest.cpp
tests/RecordingXfermodeTest.cpp
tests/SerializationTest.cpp
tests/WritePixelsTest.cpp
tools/debugger/SkDebugCanvas.cpp
tools/debugger/SkDrawCommand.cpp
tools/sk_tool_utils.cpp
tools/viewer/sk_app/mac/RasterWindowContext_mac.cpp