From e9d1b299ccbf8017ba57040986ded638f954684a Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Wed, 23 Nov 2016 16:47:38 +0000 Subject: 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 > Commit-Queue: Mike Reed > 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 Reviewed-by: Greg Daniel --- src/gpu/effects/GrCustomXfermode.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/gpu/effects') 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" -- cgit v1.2.3