diff options
Diffstat (limited to 'src')
29 files changed, 34 insertions, 3 deletions
diff --git a/src/animator/SkDrawPaint.h b/src/animator/SkDrawPaint.h index b252a4d11a..bef52527b1 100644 --- a/src/animator/SkDrawPaint.h +++ b/src/animator/SkDrawPaint.h @@ -14,6 +14,7 @@ #include "SkIntArray.h" #include "SkMemberInfo.h" #include "SkPaint.h" +#include "SkXfermode.h" class SkDrawMaskFilter; class SkDrawPathEffect; diff --git a/src/animator/SkPaintPart.h b/src/animator/SkPaintPart.h index 14d24f5f55..5d94f049e8 100644 --- a/src/animator/SkPaintPart.h +++ b/src/animator/SkPaintPart.h @@ -13,6 +13,7 @@ #include "SkPaint.h" #include "SkShader.h" #include "SkTypeface.h" +#include "SkXfermode.h" class SkDrawPaint; class SkDrawMatrix; diff --git a/src/core/SkBitmapDevice.cpp b/src/core/SkBitmapDevice.cpp index f5e2c3210a..1e618accb0 100644 --- a/src/core/SkBitmapDevice.cpp +++ b/src/core/SkBitmapDevice.cpp @@ -20,6 +20,7 @@ #include "SkShader.h" #include "SkSpecialImage.h" #include "SkSurface.h" +#include "SkXfermode.h" class SkColorTable; diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp index a05c176bcd..731d0d3cb7 100644 --- a/src/core/SkBlitter.cpp +++ b/src/core/SkBlitter.cpp @@ -16,6 +16,7 @@ #include "SkString.h" #include "SkTLazy.h" #include "SkUtils.h" +#include "SkXfermode.h" #include "SkXfermodeInterpretation.h" // define this for testing srgb blits diff --git a/src/core/SkComposeShader.cpp b/src/core/SkComposeShader.cpp index 5cbd23eb08..f04527b273 100644 --- a/src/core/SkComposeShader.cpp +++ b/src/core/SkComposeShader.cpp @@ -11,6 +11,7 @@ #include "SkColorShader.h" #include "SkReadBuffer.h" #include "SkWriteBuffer.h" +#include "SkXfermode.h" #include "SkString.h" sk_sp<SkShader> SkShader::MakeComposeShader(sk_sp<SkShader> dst, sk_sp<SkShader> src, diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp index a2d7a51dff..856207da78 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -33,6 +33,7 @@ #include "SkTLazy.h" #include "SkUtils.h" #include "SkVertState.h" +#include "SkXfermode.h" #include "SkBitmapProcShader.h" #include "SkDrawProcs.h" diff --git a/src/core/SkGlobalInitialization_core.cpp b/src/core/SkGlobalInitialization_core.cpp index 6f8f8d67b2..21c4d16c4a 100644 --- a/src/core/SkGlobalInitialization_core.cpp +++ b/src/core/SkGlobalInitialization_core.cpp @@ -19,6 +19,7 @@ #include "SkPathEffect.h" #include "SkPictureShader.h" #include "SkRecordedDrawable.h" +#include "SkXfermode.h" /* * Registers all of the required effects subclasses for picture deserialization. diff --git a/src/core/SkGraphics.cpp b/src/core/SkGraphics.cpp index 803b7435bb..01b1432ef0 100644 --- a/src/core/SkGraphics.cpp +++ b/src/core/SkGraphics.cpp @@ -28,6 +28,7 @@ #include "SkTSearch.h" #include "SkTime.h" #include "SkUtils.h" +#include "SkXfermode.h" #include <stdlib.h> diff --git a/src/core/SkModeColorFilter.h b/src/core/SkModeColorFilter.h index 8e0374495f..2586c29d9f 100644 --- a/src/core/SkModeColorFilter.h +++ b/src/core/SkModeColorFilter.h @@ -7,6 +7,7 @@ #include "SkColorFilter.h" #include "SkPM4f.h" +#include "SkXfermode.h" #ifndef SkModeColorFilter_DEFINED #define SkModeColorFilter_DEFINED diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index a5df8dd145..82f1c827a7 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -35,6 +35,7 @@ #include "SkTextToPathIter.h" #include "SkTLazy.h" #include "SkTypeface.h" +#include "SkXfermode.h" static inline uint32_t set_clear_mask(uint32_t bits, bool cond, uint32_t mask) { return cond ? bits | mask : bits & ~mask; diff --git a/src/core/SkPictureFlat.cpp b/src/core/SkPictureFlat.cpp index 6078cb6293..013bc7f98e 100644 --- a/src/core/SkPictureFlat.cpp +++ b/src/core/SkPictureFlat.cpp @@ -13,6 +13,7 @@ #include "SkRasterizer.h" #include "SkShader.h" #include "SkTypeface.h" +#include "SkXfermode.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/SkPixmap.cpp b/src/core/SkPixmap.cpp index 0a1a24f8bf..7f933a75d2 100644 --- a/src/core/SkPixmap.cpp +++ b/src/core/SkPixmap.cpp @@ -241,6 +241,7 @@ bool SkPixmap::erase(const SkColor4f& origColor, const SkIRect* subset) const { #include "SkBitmap.h" #include "SkCanvas.h" #include "SkSurface.h" +#include "SkXfermode.h" bool SkPixmap::scalePixels(const SkPixmap& dst, SkFilterQuality quality) const { // Can't do anthing with empty src or dst diff --git a/src/core/SkRasterPipelineBlitter.cpp b/src/core/SkRasterPipelineBlitter.cpp index ca6313eccd..90910eaa92 100644 --- a/src/core/SkRasterPipelineBlitter.cpp +++ b/src/core/SkRasterPipelineBlitter.cpp @@ -15,6 +15,7 @@ #include "SkPM4fPriv.h" #include "SkRasterPipeline.h" #include "SkShader.h" +#include "SkXfermode.h" class SkRasterPipelineBlitter : public SkBlitter { diff --git a/src/core/SkRecordOpts.cpp b/src/core/SkRecordOpts.cpp index 605caa3b06..a7feec1fb3 100644 --- a/src/core/SkRecordOpts.cpp +++ b/src/core/SkRecordOpts.cpp @@ -10,6 +10,7 @@ #include "SkRecordPattern.h" #include "SkRecords.h" #include "SkTDArray.h" +#include "SkXfermode.h" using namespace SkRecords; diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp index eb27f69d26..3f3927e742 100644 --- a/src/core/SkXfermode.cpp +++ b/src/core/SkXfermode.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ +#include "SkXfermode.h" #include "SkXfermode_proccoeff.h" #include "SkColorPriv.h" #include "SkMathPriv.h" diff --git a/src/core/SkXfermodePriv.h b/src/core/SkXfermodePriv.h index 208925ed18..b7d85ea98f 100644 --- a/src/core/SkXfermodePriv.h +++ b/src/core/SkXfermodePriv.h @@ -12,6 +12,10 @@ #include "SkColor.h" #include "SkFlattenable.h" +#ifdef SK_SUPPORT_LEGACY_XFERMODE_IS_PUBLIC +#include "SkXfermode.h" +#else + class GrFragmentProcessor; class GrTexture; class GrXPFactory; @@ -303,3 +307,5 @@ private: }; #endif + +#endif diff --git a/src/core/SkXfermode_proccoeff.h b/src/core/SkXfermode_proccoeff.h index 8a7b62f0a2..8d70957b94 100644 --- a/src/core/SkXfermode_proccoeff.h +++ b/src/core/SkXfermode_proccoeff.h @@ -8,6 +8,7 @@ #ifndef SkXfermode_proccoeff_DEFINED #define SkXfermode_proccoeff_DEFINED +#include "SkXfermode.h" #include "SkReadBuffer.h" #include "SkWriteBuffer.h" diff --git a/src/effects/SkArithmeticModePriv.h b/src/effects/SkArithmeticModePriv.h index ff7f357189..5cb1093434 100644 --- a/src/effects/SkArithmeticModePriv.h +++ b/src/effects/SkArithmeticModePriv.h @@ -8,8 +8,7 @@ #ifndef SkArithmeticModePriv_DEFINED #define SkArithmeticModePriv_DEFINED -#include "SkScalar.h" -#include "SkXfermodePriv.h" +#include "SkArithmeticMode.h" class SkXfermode; diff --git a/src/effects/SkLayerRasterizer.cpp b/src/effects/SkLayerRasterizer.cpp index b3e84593bd..71d7fb63c5 100644 --- a/src/effects/SkLayerRasterizer.cpp +++ b/src/effects/SkLayerRasterizer.cpp @@ -17,6 +17,7 @@ #include "SkPathEffect.h" #include "../core/SkRasterClip.h" #include "../core/SkStrokeRec.h" +#include "SkXfermode.h" #include <new> struct SkLayerRasterizer_Rec { diff --git a/src/effects/SkXfermodeImageFilter.cpp b/src/effects/SkXfermodeImageFilter.cpp index 0987266bbc..a396b3e690 100644 --- a/src/effects/SkXfermodeImageFilter.cpp +++ b/src/effects/SkXfermodeImageFilter.cpp @@ -14,6 +14,7 @@ #include "SkSpecialImage.h" #include "SkSpecialSurface.h" #include "SkWriteBuffer.h" +#include "SkXfermode.h" #if SK_SUPPORT_GPU #include "GrContext.h" #include "GrRenderTargetContext.h" diff --git a/src/effects/gradients/Sk4fLinearGradient.cpp b/src/effects/gradients/Sk4fLinearGradient.cpp index 229bf8212f..45083f725c 100644 --- a/src/effects/gradients/Sk4fLinearGradient.cpp +++ b/src/effects/gradients/Sk4fLinearGradient.cpp @@ -7,6 +7,7 @@ #include "Sk4fLinearGradient.h" #include "Sk4x4f.h" +#include "SkXfermode.h" #include <cmath> diff --git a/src/gpu/GrRenderTargetOpList.h b/src/gpu/GrRenderTargetOpList.h index d96f83d21a..9f9a52a02d 100644 --- a/src/gpu/GrRenderTargetOpList.h +++ b/src/gpu/GrRenderTargetOpList.h @@ -26,6 +26,7 @@ #include "SkTArray.h" #include "SkTLazy.h" #include "SkTypes.h" +#include "SkXfermode.h" class GrAuditTrail; class GrBatch; diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index 04147f6870..cc2cd2fd50 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -39,6 +39,7 @@ #include "SkTLazy.h" #include "SkUtils.h" #include "SkVertState.h" +#include "SkXfermode.h" #include "batches/GrRectBatchFactory.h" #include "effects/GrBicubicEffect.h" #include "effects/GrDashingEffect.h" diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp index 7303fd49e5..8d5c5008d2 100644 --- a/src/gpu/effects/GrCustomXfermode.cpp +++ b/src/gpu/effects/GrCustomXfermode.cpp @@ -14,6 +14,7 @@ #include "GrPipeline.h" #include "GrProcessor.h" #include "GrTexture.h" +#include "SkXfermode.h" #include "glsl/GrGLSLBlend.h" #include "glsl/GrGLSLCaps.h" #include "glsl/GrGLSLFragmentProcessor.h" diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp index 820b55c7fe..1f2e1c8446 100644 --- a/src/gpu/gl/GrGLProgram.cpp +++ b/src/gpu/gl/GrGLProgram.cpp @@ -19,6 +19,7 @@ #include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLGeometryProcessor.h" #include "glsl/GrGLSLXferProcessor.h" +#include "SkXfermode.h" #define GL_CALL(X) GR_GL_CALL(fGpu->glInterface(), X) #define GL_CALL_RET(R, X) GR_GL_CALL_RET(fGpu->glInterface(), R, X) diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h index d129ddaa3d..3b0940e0d2 100644 --- a/src/gpu/gl/GrGLProgram.h +++ b/src/gpu/gl/GrGLProgram.h @@ -17,6 +17,7 @@ #include "glsl/GrGLSLUniformHandler.h" #include "SkString.h" +#include "SkXfermode.h" #include "builders/GrGLProgramBuilder.h" diff --git a/src/gpu/glsl/GrGLSLBlend.h b/src/gpu/glsl/GrGLSLBlend.h index fb0fb0b935..63d6762444 100644 --- a/src/gpu/glsl/GrGLSLBlend.h +++ b/src/gpu/glsl/GrGLSLBlend.h @@ -8,8 +8,8 @@ #ifndef GrGLBlend_DEFINED #define GrGLBlend_DEFINED -#include "SkBlendMode.h" #include "SkRegion.h" +#include "SkXfermode.h" class GrGLSLFragmentBuilder; diff --git a/src/utils/SkDumpCanvas.cpp b/src/utils/SkDumpCanvas.cpp index 9542c9e0ae..efaca333af 100644 --- a/src/utils/SkDumpCanvas.cpp +++ b/src/utils/SkDumpCanvas.cpp @@ -19,6 +19,7 @@ // needed just to know that these are all subclassed from SkFlattenable #include "SkShader.h" #include "SkPathEffect.h" +#include "SkXfermode.h" #include "SkColorFilter.h" #include "SkPathEffect.h" #include "SkMaskFilter.h" diff --git a/src/utils/SkPatchGrid.h b/src/utils/SkPatchGrid.h index 97a6cb3f01..dbb6138220 100644 --- a/src/utils/SkPatchGrid.h +++ b/src/utils/SkPatchGrid.h @@ -10,6 +10,7 @@ #include "SkCanvas.h" #include "SkPatchUtils.h" +#include "SkXfermode.h" /** * Class that represents a grid of patches. Adjacent patches share their corners and a color is |