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>

23 files changed, 32 insertions, 1 deletions

diff --git a/samplecode/ClockFaceView.cpp b/samplecode/ClockFaceView.cpp
index 2721a5bd18..9cee95b84c 100644
--- a/samplecode/ClockFaceView.cpp
+++ b/samplecode/ClockFaceView.cpp
@@ -164,7 +164,10 @@ static void r7(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p, SkScalar int
 
 typedef void (*raster_proc)(SkLayerRasterizer*, SkPaint&);
 
-static void apply_shader(SkPaint* paint, float scale) {
+#include "SkXfermode.h"
+
+static void apply_shader(SkPaint* paint, float scale)
+{
     SkPaint p;
     SkLayerRasterizer::Builder rastBuilder;
 
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp
index fc3a95ab88..94c12cd727 100644
--- a/samplecode/SampleAll.cpp
+++ b/samplecode/SampleAll.cpp
@@ -32,6 +32,7 @@
 #include "SkRandom.h"
 #include "SkTypeface.h"
 #include "SkUtils.h"
+#include "SkXfermode.h"
 
 #include <math.h>
 #include "DecodeFile.h"
diff --git a/samplecode/SampleAnimatedText.cpp b/samplecode/SampleAnimatedText.cpp
index dec8f8f49d..6bd6d82e8c 100644
--- a/samplecode/SampleAnimatedText.cpp
+++ b/samplecode/SampleAnimatedText.cpp
@@ -15,6 +15,7 @@
 #include "SkSystemEventTypes.h"
 #include "SkTime.h"
 #include "SkTypeface.h"
+#include "SkXfermode.h"
 #include "Timer.h"
 
 #if SK_SUPPORT_GPU
diff --git a/samplecode/SampleBitmapRect.cpp b/samplecode/SampleBitmapRect.cpp
index ebfe3bbc6d..24c3efff79 100644
--- a/samplecode/SampleBitmapRect.cpp
+++ b/samplecode/SampleBitmapRect.cpp
@@ -15,6 +15,7 @@
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
+#include "SkXfermode.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"
diff --git a/samplecode/SampleConcavePaths.cpp b/samplecode/SampleConcavePaths.cpp
index 7ff6819ac4..d75ec4c4be 100644
--- a/samplecode/SampleConcavePaths.cpp
+++ b/samplecode/SampleConcavePaths.cpp
@@ -14,6 +14,7 @@
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
+#include "SkXfermode.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkParsePath.h"
diff --git a/samplecode/SampleEmboss.cpp b/samplecode/SampleEmboss.cpp
index 4aba6fd157..f1ea1fe547 100644
--- a/samplecode/SampleEmboss.cpp
+++ b/samplecode/SampleEmboss.cpp
@@ -21,6 +21,7 @@
 #include "SkColorFilter.h"
 #include "SkTime.h"
 #include "SkTypeface.h"
+#include "SkXfermode.h"
 
 class EmbossView : public SampleView {
     SkEmbossMaskFilter::Light   fLight;
diff --git a/samplecode/SampleFilter2.cpp b/samplecode/SampleFilter2.cpp
index 9b2298a0b4..8c93563c40 100644
--- a/samplecode/SampleFilter2.cpp
+++ b/samplecode/SampleFilter2.cpp
@@ -15,6 +15,7 @@
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
+#include "SkXfermode.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"
diff --git a/samplecode/SampleFuzz.cpp b/samplecode/SampleFuzz.cpp
index a0cb0e02ba..c7d05782e3 100644
--- a/samplecode/SampleFuzz.cpp
+++ b/samplecode/SampleFuzz.cpp
@@ -10,6 +10,7 @@
 #include "SkBlurMaskFilter.h"
 #include "SkPaint.h"
 #include "SkPath.h"
+#include "SkXfermode.h"
 #include "SkMatrix.h"
 #include "SkColor.h"
 #include "SkRandom.h"
diff --git a/samplecode/SampleHairline.cpp b/samplecode/SampleHairline.cpp
index 169804ddfa..fef44f53ce 100644
--- a/samplecode/SampleHairline.cpp
+++ b/samplecode/SampleHairline.cpp
@@ -21,6 +21,8 @@
 #include "SkColorFilter.h"
 #include "SkTime.h"
 #include "SkTypeface.h"
+#include "SkXfermode.h"
+
 #include "SkStream.h"
 #include "SkColorPriv.h"
 
diff --git a/samplecode/SampleLayers.cpp b/samplecode/SampleLayers.cpp
index c086eb0480..71b2e8ba66 100644
--- a/samplecode/SampleLayers.cpp
+++ b/samplecode/SampleLayers.cpp
@@ -23,6 +23,7 @@
 #include "SkTypeface.h"
 #include "SkUtils.h"
 #include "SkKey.h"
+#include "SkXfermode.h"
 #include "SkDrawFilter.h"
 
 static void make_paint(SkPaint* paint, const SkMatrix& localMatrix) {
diff --git a/samplecode/SampleLines.cpp b/samplecode/SampleLines.cpp
index bf43e8b9c4..08a9e86c4b 100644
--- a/samplecode/SampleLines.cpp
+++ b/samplecode/SampleLines.cpp
@@ -21,6 +21,8 @@
 #include "SkColorFilter.h"
 #include "SkTime.h"
 #include "SkTypeface.h"
+#include "SkXfermode.h"
+
 #include "SkStream.h"
 #include "SkColorPriv.h"
 
diff --git a/samplecode/SamplePatch.cpp b/samplecode/SamplePatch.cpp
index b105090db2..243d106784 100644
--- a/samplecode/SamplePatch.cpp
+++ b/samplecode/SamplePatch.cpp
@@ -17,6 +17,7 @@
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
+#include "SkXfermode.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"
diff --git a/samplecode/SamplePath.cpp b/samplecode/SamplePath.cpp
index 40c350fbd2..f0bdf8d684 100644
--- a/samplecode/SamplePath.cpp
+++ b/samplecode/SamplePath.cpp
@@ -15,6 +15,7 @@
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
+#include "SkXfermode.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkParsePath.h"
diff --git a/samplecode/SamplePathClip.cpp b/samplecode/SamplePathClip.cpp
index b425884ebe..af9608f0eb 100644
--- a/samplecode/SamplePathClip.cpp
+++ b/samplecode/SamplePathClip.cpp
@@ -13,6 +13,7 @@
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
+#include "SkXfermode.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"
diff --git a/samplecode/SamplePdfFileViewer.cpp b/samplecode/SamplePdfFileViewer.cpp
index ab5a73e824..110aa5876c 100644
--- a/samplecode/SamplePdfFileViewer.cpp
+++ b/samplecode/SamplePdfFileViewer.cpp
@@ -26,6 +26,8 @@
 #include "SkColorFilter.h"
 #include "SkTime.h"
 #include "SkTypeface.h"
+#include "SkXfermode.h"
+
 #include "SkPdfRenderer.h"
 
 class PdfFileViewer : public SampleView {
diff --git a/samplecode/SamplePictFile.cpp b/samplecode/SamplePictFile.cpp
index 32cc723d9d..83912a5e2f 100644
--- a/samplecode/SamplePictFile.cpp
+++ b/samplecode/SamplePictFile.cpp
@@ -25,6 +25,8 @@
 #include "SkColorFilter.h"
 #include "SkTime.h"
 #include "SkTypeface.h"
+#include "SkXfermode.h"
+
 #include "SkStream.h"
 #include "SkSurface.h"
 
diff --git a/samplecode/SamplePoints.cpp b/samplecode/SamplePoints.cpp
index 13b98972d3..0bfe28f850 100644
--- a/samplecode/SamplePoints.cpp
+++ b/samplecode/SamplePoints.cpp
@@ -19,6 +19,8 @@
 #include "SkColorFilter.h"
 #include "SkTime.h"
 #include "SkTypeface.h"
+#include "SkXfermode.h"
+
 #include "SkStream.h"
 
 class PointsView : public SampleView {
diff --git a/samplecode/SampleShaders.cpp b/samplecode/SampleShaders.cpp
index f9926ebf3f..ba3b80d7f8 100644
--- a/samplecode/SampleShaders.cpp
+++ b/samplecode/SampleShaders.cpp
@@ -15,6 +15,7 @@
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
+#include "SkXfermode.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"
diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp
index 8325cd7755..730c47ce98 100644
--- a/samplecode/SampleText.cpp
+++ b/samplecode/SampleText.cpp
@@ -21,6 +21,8 @@
 #include "SkColorFilter.h"
 #include "SkTime.h"
 #include "SkTypeface.h"
+#include "SkXfermode.h"
+
 #include "SkStream.h"
 
 static const struct {
diff --git a/samplecode/SampleTextAlpha.cpp b/samplecode/SampleTextAlpha.cpp
index 8286177ae7..48625ad79a 100644
--- a/samplecode/SampleTextAlpha.cpp
+++ b/samplecode/SampleTextAlpha.cpp
@@ -15,6 +15,7 @@
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
+#include "SkXfermode.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"
diff --git a/samplecode/SampleTextBox.cpp b/samplecode/SampleTextBox.cpp
index 947ed8ec1e..8540ca456f 100644
--- a/samplecode/SampleTextBox.cpp
+++ b/samplecode/SampleTextBox.cpp
@@ -16,6 +16,7 @@
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
+#include "SkXfermode.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"
diff --git a/samplecode/SampleVertices.cpp b/samplecode/SampleVertices.cpp
index d08726c027..3ba98bb919 100644
--- a/samplecode/SampleVertices.cpp
+++ b/samplecode/SampleVertices.cpp
@@ -14,6 +14,7 @@
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
+#include "SkXfermode.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkTime.h"
diff --git a/samplecode/SampleXfermodesBlur.cpp b/samplecode/SampleXfermodesBlur.cpp
index 2169ffde53..fe07c9b567 100644
--- a/samplecode/SampleXfermodesBlur.cpp
+++ b/samplecode/SampleXfermodesBlur.cpp
@@ -21,6 +21,7 @@
 #include "SkColorFilter.h"
 #include "SkTime.h"
 #include "SkTypeface.h"
+#include "SkXfermode.h"
 
 #include "SkStream.h"
 #include "SkColorPriv.h"