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 /gm | |
| 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 'gm')
| -rw-r--r-- | gm/aaxfermodes.cpp | 1 | ||||
| -rw-r--r-- | gm/blurroundrect.cpp | 1 | ||||
| -rw-r--r-- | gm/colortypexfermode.cpp | 1 | ||||
| -rw-r--r-- | gm/composeshader.cpp | 1 | ||||
| -rw-r--r-- | gm/dstreadshuffle.cpp | 1 | ||||
| -rw-r--r-- | gm/texteffects.cpp | 2 | ||||
| -rw-r--r-- | gm/xfermodes.cpp | 1 |
7 files changed, 8 insertions, 0 deletions
diff --git a/gm/aaxfermodes.cpp b/gm/aaxfermodes.cpp index dcb9cb7e1b..df09a0bc9d 100644 --- a/gm/aaxfermodes.cpp +++ b/gm/aaxfermodes.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "SkArithmeticMode.h" #include "SkBlendModePriv.h" #include "SkPath.h" #include "SkShader.h" diff --git a/gm/blurroundrect.cpp b/gm/blurroundrect.cpp index 608649ecfc..80bf6cce8a 100644 --- a/gm/blurroundrect.cpp +++ b/gm/blurroundrect.cpp @@ -17,6 +17,7 @@ #include "SkRect.h" #include "SkRRect.h" #include "SkString.h" +#include "SkXfermode.h" // This GM mimics a blurred RR seen in the wild. class BlurRoundRectGM : public skiagm::GM { diff --git a/gm/colortypexfermode.cpp b/gm/colortypexfermode.cpp index 9541e08258..9b715ef78c 100644 --- a/gm/colortypexfermode.cpp +++ b/gm/colortypexfermode.cpp @@ -8,6 +8,7 @@ #include "SkBitmap.h" #include "SkGradientShader.h" #include "SkShader.h" +#include "SkXfermode.h" #include "../src/fonts/SkGScalerContext.h" namespace skiagm { diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp index 7a8540bc33..785f2bf4a5 100644 --- a/gm/composeshader.cpp +++ b/gm/composeshader.cpp @@ -12,6 +12,7 @@ #include "SkGraphics.h" #include "SkShader.h" #include "SkString.h" +#include "SkXfermode.h" static sk_sp<SkShader> make_shader(SkBlendMode mode) { SkPoint pts[2]; diff --git a/gm/dstreadshuffle.cpp b/gm/dstreadshuffle.cpp index b038fdb1f7..2c3cbc87f9 100644 --- a/gm/dstreadshuffle.cpp +++ b/gm/dstreadshuffle.cpp @@ -9,6 +9,7 @@ #include "SkPath.h" #include "SkRandom.h" #include "SkShader.h" +#include "SkXfermode.h" namespace skiagm { diff --git a/gm/texteffects.cpp b/gm/texteffects.cpp index c4c389a065..453a555a6f 100644 --- a/gm/texteffects.cpp +++ b/gm/texteffects.cpp @@ -150,6 +150,8 @@ constexpr raster_proc gRastProcs[] = { r0, r1, r2, r3, r4, r5, r6, r7, r8, r9 }; +#include "SkXfermode.h" + static void apply_shader(SkPaint* paint, int index) { raster_proc proc = gRastProcs[index]; if (proc) { diff --git a/gm/xfermodes.cpp b/gm/xfermodes.cpp index fb318dd529..604a767a4f 100644 --- a/gm/xfermodes.cpp +++ b/gm/xfermodes.cpp @@ -8,6 +8,7 @@ #include "gm.h" #include "SkBitmap.h" #include "SkShader.h" +#include "SkXfermode.h" #include "SkPM4f.h" enum SrcType { |