diff options
| author |  Greg Daniel <egdaniel@google.com> | 2016-11-23 16:47:38 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-23 16:47:49 +0000 |
| commit | e9d1b299ccbf8017ba57040986ded638f954684a (patch) | |
| tree | f35cd6bbf36dd058a71db44ce5d47039e5bbf013 /src/gpu/glsl | |
| parent | db6830162eca5b94e61d9825ec93306fc615d204 (diff) | |
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>
Diffstat (limited to 'src/gpu/glsl')
| -rw-r--r-- | src/gpu/glsl/GrGLSLBlend.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |