From 07764cefbb18041a77897df3453903b0a2016583 Mon Sep 17 00:00:00 2001
From: Mike Reed <reed@google.com>
Date: Wed, 23 Nov 2016 10:03:39 -0500
Subject: 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>
---
 src/effects/SkArithmeticModePriv.h           | 3 ++-
 src/effects/SkLayerRasterizer.cpp            | 1 -
 src/effects/SkXfermodeImageFilter.cpp        | 1 -
 src/effects/gradients/Sk4fLinearGradient.cpp | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/effects')

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>
 
-- 
cgit v1.2.3