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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/BlendTest.cpp | 1 | ||||
| -rw-r--r-- | tests/ColorFilterTest.cpp | 1 | ||||
| -rw-r--r-- | tests/GrGetCoeffBlendKnownComponentsTest.cpp | 1 | ||||
| -rw-r--r-- | tests/GrPorterDuffTest.cpp | 1 | ||||
| -rw-r--r-- | tests/LayerDrawLooperTest.cpp | 1 | ||||
| -rw-r--r-- | tests/PaintTest.cpp | 1 | ||||
| -rw-r--r-- | tests/RecordOptsTest.cpp | 1 | ||||
| -rw-r--r-- | tests/SrcOverTest.cpp | 1 |
8 files changed, 8 insertions, 0 deletions
diff --git a/tests/BlendTest.cpp b/tests/BlendTest.cpp index 785acb8681..cd5e8efba7 100644 --- a/tests/BlendTest.cpp +++ b/tests/BlendTest.cpp @@ -9,6 +9,7 @@ #include "SkColor.h" #include "SkColorPriv.h" #include "SkTaskGroup.h" +#include "SkXfermode.h" #include <functional> struct Results { int diffs, diffs_0x00, diffs_0xff, diffs_by_1; }; diff --git a/tests/ColorFilterTest.cpp b/tests/ColorFilterTest.cpp index ad2dd0fc35..ec34a151be 100644 --- a/tests/ColorFilterTest.cpp +++ b/tests/ColorFilterTest.cpp @@ -12,6 +12,7 @@ #include "SkReadBuffer.h" #include "SkWriteBuffer.h" #include "SkRandom.h" +#include "SkXfermode.h" #include "Test.h" static sk_sp<SkColorFilter> reincarnate_colorfilter(SkFlattenable* obj) { diff --git a/tests/GrGetCoeffBlendKnownComponentsTest.cpp b/tests/GrGetCoeffBlendKnownComponentsTest.cpp index 31a41943d9..38dfb30c56 100644 --- a/tests/GrGetCoeffBlendKnownComponentsTest.cpp +++ b/tests/GrGetCoeffBlendKnownComponentsTest.cpp @@ -13,6 +13,7 @@ #include "SkGr.h" #include "SkGrPriv.h" #include "SkRandom.h" +#include "SkXfermode.h" static GrColor make_baseline_color(GrColor src, GrColor dst, const SkXfermode* xm) { SkPMColor skSrc = GrColorToSkPMColor(src); diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp index 53aeb9a1ca..eb3c9bc186 100644 --- a/tests/GrPorterDuffTest.cpp +++ b/tests/GrPorterDuffTest.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ +#include "SkXfermode.h" #include "Test.h" #if SK_SUPPORT_GPU diff --git a/tests/LayerDrawLooperTest.cpp b/tests/LayerDrawLooperTest.cpp index 8fcbf1615c..7b3aa29883 100644 --- a/tests/LayerDrawLooperTest.cpp +++ b/tests/LayerDrawLooperTest.cpp @@ -16,6 +16,7 @@ #include "SkRefCnt.h" #include "SkScalar.h" #include "SkSmallAllocator.h" +#include "SkXfermode.h" #include "Test.h" static SkBitmap make_bm(int w, int h) { diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp index 76bfb02923..9cd9cfc63c 100644 --- a/tests/PaintTest.cpp +++ b/tests/PaintTest.cpp @@ -15,6 +15,7 @@ #include "SkTypeface.h" #include "SkUtils.h" #include "SkWriteBuffer.h" +#include "SkXfermode.h" #include "Test.h" static size_t uni_to_utf8(const SkUnichar src[], void* dst, int count) { diff --git a/tests/RecordOptsTest.cpp b/tests/RecordOptsTest.cpp index f5f18f3b1c..b7c9ae96c6 100644 --- a/tests/RecordOptsTest.cpp +++ b/tests/RecordOptsTest.cpp @@ -13,6 +13,7 @@ #include "SkRecordOpts.h" #include "SkRecorder.h" #include "SkRecords.h" +#include "SkXfermode.h" #include "SkPictureRecorder.h" #include "SkPictureImageFilter.h" #include "SkSurface.h" diff --git a/tests/SrcOverTest.cpp b/tests/SrcOverTest.cpp index df315983ea..7789fbdd50 100644 --- a/tests/SrcOverTest.cpp +++ b/tests/SrcOverTest.cpp @@ -6,6 +6,7 @@ */ #include "SkColorPriv.h" +#include "SkXfermode.h" #include "Test.h" // our std SkAlpha255To256 |