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/effects | |
| 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/effects')
| -rw-r--r-- | src/effects/SkArithmeticModePriv.h | 3 | ||||
| -rw-r--r-- | src/effects/SkLayerRasterizer.cpp | 1 | ||||
| -rw-r--r-- | src/effects/SkXfermodeImageFilter.cpp | 1 | ||||
| -rw-r--r-- | src/effects/gradients/Sk4fLinearGradient.cpp | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/src/effects/SkArithmeticModePriv.h b/src/effects/SkArithmeticModePriv.h index ff7f357189..5cb1093434 100644 --- a/src/effects/SkArithmeticModePriv.h +++ b/src/effects/SkArithmeticModePriv.h @@ -8,8 +8,7 @@ #ifndef SkArithmeticModePriv_DEFINED #define SkArithmeticModePriv_DEFINED -#include "SkScalar.h" -#include "SkXfermodePriv.h" +#include "SkArithmeticMode.h" class SkXfermode; diff --git a/src/effects/SkLayerRasterizer.cpp b/src/effects/SkLayerRasterizer.cpp index b3e84593bd..71d7fb63c5 100644 --- a/src/effects/SkLayerRasterizer.cpp +++ b/src/effects/SkLayerRasterizer.cpp @@ -17,6 +17,7 @@ #include "SkPathEffect.h" #include "../core/SkRasterClip.h" #include "../core/SkStrokeRec.h" +#include "SkXfermode.h" #include <new> struct SkLayerRasterizer_Rec { diff --git a/src/effects/SkXfermodeImageFilter.cpp b/src/effects/SkXfermodeImageFilter.cpp index 0987266bbc..a396b3e690 100644 --- a/src/effects/SkXfermodeImageFilter.cpp +++ b/src/effects/SkXfermodeImageFilter.cpp @@ -14,6 +14,7 @@ #include "SkSpecialImage.h" #include "SkSpecialSurface.h" #include "SkWriteBuffer.h" +#include "SkXfermode.h" #if SK_SUPPORT_GPU #include "GrContext.h" #include "GrRenderTargetContext.h" diff --git a/src/effects/gradients/Sk4fLinearGradient.cpp b/src/effects/gradients/Sk4fLinearGradient.cpp index 229bf8212f..45083f725c 100644 --- a/src/effects/gradients/Sk4fLinearGradient.cpp +++ b/src/effects/gradients/Sk4fLinearGradient.cpp @@ -7,6 +7,7 @@ #include "Sk4fLinearGradient.h" #include "Sk4x4f.h" +#include "SkXfermode.h" #include <cmath> |