Revert "Revert "make it illegal to include SkXfermode.h""

This reverts commit e9d1b299ccbf8017ba57040986ded638f954684a.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> Revert "make it illegal to include SkXfermode.h"
> 
> This reverts commit 07764cefbb18041a77897df3453903b0a2016583.
> 
> Reason for revert: breaking google3
> 
> Original change's description:
> > make it illegal to include SkXfermode.h
> > 
> > BUG=skia:
> > 
> > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5133
> > 
> > Change-Id: I6e8596dcb17cd7e8efa67859bb682bf9bfcac4db
> > Reviewed-on: https://skia-review.googlesource.com/5133
> > 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: I136f9e533eb60633c49dffa19b5747d50b6d98a8
> Reviewed-on: https://skia-review.googlesource.com/5196
> Commit-Queue: Greg Daniel <egdaniel@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> 

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

Change-Id: I0b767ce778a4ade83c2f07d5ece486bb46d7712c
Reviewed-on: https://skia-review.googlesource.com/5223
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>

29 files changed, 3 insertions, 34 deletions

diff --git a/src/animator/SkDrawPaint.h b/src/animator/SkDrawPaint.h
index bef52527b1..b252a4d11a 100644
--- a/src/animator/SkDrawPaint.h
+++ b/src/animator/SkDrawPaint.h
@@ -14,7 +14,6 @@
 #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 5d94f049e8..14d24f5f55 100644
--- a/src/animator/SkPaintPart.h
+++ b/src/animator/SkPaintPart.h
@@ -13,7 +13,6 @@
 #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 1e618accb0..f5e2c3210a 100644
--- a/src/core/SkBitmapDevice.cpp
+++ b/src/core/SkBitmapDevice.cpp
@@ -20,7 +20,6 @@
 #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 731d0d3cb7..a05c176bcd 100644
--- a/src/core/SkBlitter.cpp
+++ b/src/core/SkBlitter.cpp
@@ -16,7 +16,6 @@
 #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 f04527b273..5cbd23eb08 100644
--- a/src/core/SkComposeShader.cpp
+++ b/src/core/SkComposeShader.cpp
@@ -11,7 +11,6 @@
 #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 856207da78..a2d7a51dff 100644
--- a/src/core/SkDraw.cpp
+++ b/src/core/SkDraw.cpp
@@ -33,7 +33,6 @@
 #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 21c4d16c4a..6f8f8d67b2 100644
--- a/src/core/SkGlobalInitialization_core.cpp
+++ b/src/core/SkGlobalInitialization_core.cpp
@@ -19,7 +19,6 @@
 #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 01b1432ef0..803b7435bb 100644
--- a/src/core/SkGraphics.cpp
+++ b/src/core/SkGraphics.cpp
@@ -28,7 +28,6 @@
 #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 2586c29d9f..8e0374495f 100644
--- a/src/core/SkModeColorFilter.h
+++ b/src/core/SkModeColorFilter.h
@@ -7,7 +7,6 @@
 
 #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 82f1c827a7..a5df8dd145 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -35,7 +35,6 @@
 #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 013bc7f98e..6078cb6293 100644
--- a/src/core/SkPictureFlat.cpp
+++ b/src/core/SkPictureFlat.cpp
@@ -13,7 +13,6 @@
 #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 7f933a75d2..0a1a24f8bf 100644
--- a/src/core/SkPixmap.cpp
+++ b/src/core/SkPixmap.cpp
@@ -241,7 +241,6 @@ 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 90910eaa92..ca6313eccd 100644
--- a/src/core/SkRasterPipelineBlitter.cpp
+++ b/src/core/SkRasterPipelineBlitter.cpp
@@ -15,7 +15,6 @@
 #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 a7feec1fb3..605caa3b06 100644
--- a/src/core/SkRecordOpts.cpp
+++ b/src/core/SkRecordOpts.cpp
@@ -10,7 +10,6 @@
 #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 3f3927e742..eb27f69d26 100644
--- a/src/core/SkXfermode.cpp
+++ b/src/core/SkXfermode.cpp
@@ -5,7 +5,6 @@
  * 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 b7d85ea98f..208925ed18 100644
--- a/src/core/SkXfermodePriv.h
+++ b/src/core/SkXfermodePriv.h
@@ -12,10 +12,6 @@
 #include "SkColor.h"
 #include "SkFlattenable.h"
 
-#ifdef SK_SUPPORT_LEGACY_XFERMODE_IS_PUBLIC
-#include "SkXfermode.h"
-#else
-
 class GrFragmentProcessor;
 class GrTexture;
 class GrXPFactory;
@@ -307,5 +303,3 @@ private:
 };
 
 #endif
-
-#endif
diff --git a/src/core/SkXfermode_proccoeff.h b/src/core/SkXfermode_proccoeff.h
index 8d70957b94..8a7b62f0a2 100644
--- a/src/core/SkXfermode_proccoeff.h
+++ b/src/core/SkXfermode_proccoeff.h
@@ -8,7 +8,6 @@
 #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 5cb1093434..ff7f357189 100644
--- a/src/effects/SkArithmeticModePriv.h
+++ b/src/effects/SkArithmeticModePriv.h
@@ -8,7 +8,8 @@
 #ifndef SkArithmeticModePriv_DEFINED
 #define SkArithmeticModePriv_DEFINED
 
-#include "SkArithmeticMode.h"
+#include "SkScalar.h"
+#include "SkXfermodePriv.h"
 
 class SkXfermode;
 
diff --git a/src/effects/SkLayerRasterizer.cpp b/src/effects/SkLayerRasterizer.cpp
index 71d7fb63c5..b3e84593bd 100644
--- a/src/effects/SkLayerRasterizer.cpp
+++ b/src/effects/SkLayerRasterizer.cpp
@@ -17,7 +17,6 @@
 #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 a396b3e690..0987266bbc 100644
--- a/src/effects/SkXfermodeImageFilter.cpp
+++ b/src/effects/SkXfermodeImageFilter.cpp
@@ -14,7 +14,6 @@
 #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 45083f725c..229bf8212f 100644
--- a/src/effects/gradients/Sk4fLinearGradient.cpp
+++ b/src/effects/gradients/Sk4fLinearGradient.cpp
@@ -7,7 +7,6 @@
 
 #include "Sk4fLinearGradient.h"
 #include "Sk4x4f.h"
-#include "SkXfermode.h"
 
 #include <cmath>
 
diff --git a/src/gpu/GrRenderTargetOpList.h b/src/gpu/GrRenderTargetOpList.h
index 9f9a52a02d..d96f83d21a 100644
--- a/src/gpu/GrRenderTargetOpList.h
+++ b/src/gpu/GrRenderTargetOpList.h
@@ -26,7 +26,6 @@
 #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 cc2cd2fd50..04147f6870 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -39,7 +39,6 @@
 #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 8d5c5008d2..7303fd49e5 100644
--- a/src/gpu/effects/GrCustomXfermode.cpp
+++ b/src/gpu/effects/GrCustomXfermode.cpp
@@ -14,7 +14,6 @@
 #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 1f2e1c8446..820b55c7fe 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -19,7 +19,6 @@
 #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 3b0940e0d2..d129ddaa3d 100644
--- a/src/gpu/gl/GrGLProgram.h
+++ b/src/gpu/gl/GrGLProgram.h
@@ -17,7 +17,6 @@
 #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 63d6762444..fb0fb0b935 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 efaca333af..9542c9e0ae 100644
--- a/src/utils/SkDumpCanvas.cpp
+++ b/src/utils/SkDumpCanvas.cpp
@@ -19,7 +19,6 @@
 // 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 dbb6138220..97a6cb3f01 100644
--- a/src/utils/SkPatchGrid.h
+++ b/src/utils/SkPatchGrid.h
@@ -10,7 +10,6 @@
 
 #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