diff options
| author |  Mike Reed <reed@google.com> | 2016-11-23 22:16:59 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-23 22:17:17 +0000 |
| commit | 0e39f97cd7af16e57c7257770af8340750c9b3b0 (patch) | |
| tree | 05fe33fe5d965a3a2d655b03f26c6f85322326c2 /gm | |
| parent | e68872b030fdc376ebb1ab0f5757eddf85125982 (diff) | |
Revert "Revert "make it illegal to include SkXfermode.h""
This reverts commit e9d1b299ccbf8017ba57040986ded638f954684a.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> 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>
>
TBR=egdaniel@google.com,reviews@skia.org,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I0b767ce778a4ade83c2f07d5ece486bb46d7712c
Reviewed-on: https://skia-review.googlesource.com/5223
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@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, 0 insertions, 8 deletions
diff --git a/gm/aaxfermodes.cpp b/gm/aaxfermodes.cpp index df09a0bc9d..dcb9cb7e1b 100644 --- a/gm/aaxfermodes.cpp +++ b/gm/aaxfermodes.cpp @@ -6,7 +6,6 @@ */ #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 80bf6cce8a..608649ecfc 100644 --- a/gm/blurroundrect.cpp +++ b/gm/blurroundrect.cpp @@ -17,7 +17,6 @@ #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 9b715ef78c..9541e08258 100644 --- a/gm/colortypexfermode.cpp +++ b/gm/colortypexfermode.cpp @@ -8,7 +8,6 @@ #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 785f2bf4a5..7a8540bc33 100644 --- a/gm/composeshader.cpp +++ b/gm/composeshader.cpp @@ -12,7 +12,6 @@ #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 2c3cbc87f9..b038fdb1f7 100644 --- a/gm/dstreadshuffle.cpp +++ b/gm/dstreadshuffle.cpp @@ -9,7 +9,6 @@ #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 453a555a6f..c4c389a065 100644 --- a/gm/texteffects.cpp +++ b/gm/texteffects.cpp @@ -150,8 +150,6 @@ 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 604a767a4f..fb318dd529 100644 --- a/gm/xfermodes.cpp +++ b/gm/xfermodes.cpp @@ -8,7 +8,6 @@ #include "gm.h" #include "SkBitmap.h" #include "SkShader.h" -#include "SkXfermode.h" #include "SkPM4f.h" enum SrcType { |