diff options
author | Mike Reed <reed@google.com> | 2016-11-23 10:03:39 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-23 15:35:45 +0000 |
commit | 07764cefbb18041a77897df3453903b0a2016583 (patch) | |
tree | 2da64d6d5f22c93aee97120ffe3121d1ff717811 /samplecode | |
parent | 3761f850408785c2ceee72f94e387998eb89e81a (diff) |
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>
Diffstat (limited to 'samplecode')
-rw-r--r-- | samplecode/ClockFaceView.cpp | 5 | ||||
-rw-r--r-- | samplecode/SampleAll.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleAnimatedText.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleBitmapRect.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleConcavePaths.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleEmboss.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleFilter2.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleFuzz.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleHairline.cpp | 2 | ||||
-rw-r--r-- | samplecode/SampleLayers.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleLines.cpp | 2 | ||||
-rw-r--r-- | samplecode/SamplePatch.cpp | 1 | ||||
-rw-r--r-- | samplecode/SamplePath.cpp | 1 | ||||
-rw-r--r-- | samplecode/SamplePathClip.cpp | 1 | ||||
-rw-r--r-- | samplecode/SamplePdfFileViewer.cpp | 2 | ||||
-rw-r--r-- | samplecode/SamplePictFile.cpp | 2 | ||||
-rw-r--r-- | samplecode/SamplePoints.cpp | 2 | ||||
-rw-r--r-- | samplecode/SampleShaders.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleText.cpp | 2 | ||||
-rw-r--r-- | samplecode/SampleTextAlpha.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleTextBox.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleVertices.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleXfermodesBlur.cpp | 1 |
23 files changed, 1 insertions, 32 deletions
diff --git a/samplecode/ClockFaceView.cpp b/samplecode/ClockFaceView.cpp index 9cee95b84c..2721a5bd18 100644 --- a/samplecode/ClockFaceView.cpp +++ b/samplecode/ClockFaceView.cpp @@ -164,10 +164,7 @@ static void r7(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p, SkScalar int typedef void (*raster_proc)(SkLayerRasterizer*, SkPaint&); -#include "SkXfermode.h" - -static void apply_shader(SkPaint* paint, float scale) -{ +static void apply_shader(SkPaint* paint, float scale) { SkPaint p; SkLayerRasterizer::Builder rastBuilder; diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index 94c12cd727..fc3a95ab88 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -32,7 +32,6 @@ #include "SkRandom.h" #include "SkTypeface.h" #include "SkUtils.h" -#include "SkXfermode.h" #include <math.h> #include "DecodeFile.h" diff --git a/samplecode/SampleAnimatedText.cpp b/samplecode/SampleAnimatedText.cpp index 6bd6d82e8c..dec8f8f49d 100644 --- a/samplecode/SampleAnimatedText.cpp +++ b/samplecode/SampleAnimatedText.cpp @@ -15,7 +15,6 @@ #include "SkSystemEventTypes.h" #include "SkTime.h" #include "SkTypeface.h" -#include "SkXfermode.h" #include "Timer.h" #if SK_SUPPORT_GPU diff --git a/samplecode/SampleBitmapRect.cpp b/samplecode/SampleBitmapRect.cpp index 24c3efff79..ebfe3bbc6d 100644 --- a/samplecode/SampleBitmapRect.cpp +++ b/samplecode/SampleBitmapRect.cpp @@ -15,7 +15,6 @@ #include "SkRegion.h" #include "SkShader.h" #include "SkUtils.h" -#include "SkXfermode.h" #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkTime.h" diff --git a/samplecode/SampleConcavePaths.cpp b/samplecode/SampleConcavePaths.cpp index d75ec4c4be..7ff6819ac4 100644 --- a/samplecode/SampleConcavePaths.cpp +++ b/samplecode/SampleConcavePaths.cpp @@ -14,7 +14,6 @@ #include "SkRegion.h" #include "SkShader.h" #include "SkUtils.h" -#include "SkXfermode.h" #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkParsePath.h" diff --git a/samplecode/SampleEmboss.cpp b/samplecode/SampleEmboss.cpp index f1ea1fe547..4aba6fd157 100644 --- a/samplecode/SampleEmboss.cpp +++ b/samplecode/SampleEmboss.cpp @@ -21,7 +21,6 @@ #include "SkColorFilter.h" #include "SkTime.h" #include "SkTypeface.h" -#include "SkXfermode.h" class EmbossView : public SampleView { SkEmbossMaskFilter::Light fLight; diff --git a/samplecode/SampleFilter2.cpp b/samplecode/SampleFilter2.cpp index 8c93563c40..9b2298a0b4 100644 --- a/samplecode/SampleFilter2.cpp +++ b/samplecode/SampleFilter2.cpp @@ -15,7 +15,6 @@ #include "SkRegion.h" #include "SkShader.h" #include "SkUtils.h" -#include "SkXfermode.h" #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkTime.h" diff --git a/samplecode/SampleFuzz.cpp b/samplecode/SampleFuzz.cpp index c7d05782e3..a0cb0e02ba 100644 --- a/samplecode/SampleFuzz.cpp +++ b/samplecode/SampleFuzz.cpp @@ -10,7 +10,6 @@ #include "SkBlurMaskFilter.h" #include "SkPaint.h" #include "SkPath.h" -#include "SkXfermode.h" #include "SkMatrix.h" #include "SkColor.h" #include "SkRandom.h" diff --git a/samplecode/SampleHairline.cpp b/samplecode/SampleHairline.cpp index fef44f53ce..169804ddfa 100644 --- a/samplecode/SampleHairline.cpp +++ b/samplecode/SampleHairline.cpp @@ -21,8 +21,6 @@ #include "SkColorFilter.h" #include "SkTime.h" #include "SkTypeface.h" -#include "SkXfermode.h" - #include "SkStream.h" #include "SkColorPriv.h" diff --git a/samplecode/SampleLayers.cpp b/samplecode/SampleLayers.cpp index 71b2e8ba66..c086eb0480 100644 --- a/samplecode/SampleLayers.cpp +++ b/samplecode/SampleLayers.cpp @@ -23,7 +23,6 @@ #include "SkTypeface.h" #include "SkUtils.h" #include "SkKey.h" -#include "SkXfermode.h" #include "SkDrawFilter.h" static void make_paint(SkPaint* paint, const SkMatrix& localMatrix) { diff --git a/samplecode/SampleLines.cpp b/samplecode/SampleLines.cpp index 08a9e86c4b..bf43e8b9c4 100644 --- a/samplecode/SampleLines.cpp +++ b/samplecode/SampleLines.cpp @@ -21,8 +21,6 @@ #include "SkColorFilter.h" #include "SkTime.h" #include "SkTypeface.h" -#include "SkXfermode.h" - #include "SkStream.h" #include "SkColorPriv.h" diff --git a/samplecode/SamplePatch.cpp b/samplecode/SamplePatch.cpp index 243d106784..b105090db2 100644 --- a/samplecode/SamplePatch.cpp +++ b/samplecode/SamplePatch.cpp @@ -17,7 +17,6 @@ #include "SkRegion.h" #include "SkShader.h" #include "SkUtils.h" -#include "SkXfermode.h" #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkTime.h" diff --git a/samplecode/SamplePath.cpp b/samplecode/SamplePath.cpp index f0bdf8d684..40c350fbd2 100644 --- a/samplecode/SamplePath.cpp +++ b/samplecode/SamplePath.cpp @@ -15,7 +15,6 @@ #include "SkRegion.h" #include "SkShader.h" #include "SkUtils.h" -#include "SkXfermode.h" #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkParsePath.h" diff --git a/samplecode/SamplePathClip.cpp b/samplecode/SamplePathClip.cpp index af9608f0eb..b425884ebe 100644 --- a/samplecode/SamplePathClip.cpp +++ b/samplecode/SamplePathClip.cpp @@ -13,7 +13,6 @@ #include "SkRegion.h" #include "SkShader.h" #include "SkUtils.h" -#include "SkXfermode.h" #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkTime.h" diff --git a/samplecode/SamplePdfFileViewer.cpp b/samplecode/SamplePdfFileViewer.cpp index 110aa5876c..ab5a73e824 100644 --- a/samplecode/SamplePdfFileViewer.cpp +++ b/samplecode/SamplePdfFileViewer.cpp @@ -26,8 +26,6 @@ #include "SkColorFilter.h" #include "SkTime.h" #include "SkTypeface.h" -#include "SkXfermode.h" - #include "SkPdfRenderer.h" class PdfFileViewer : public SampleView { diff --git a/samplecode/SamplePictFile.cpp b/samplecode/SamplePictFile.cpp index 83912a5e2f..32cc723d9d 100644 --- a/samplecode/SamplePictFile.cpp +++ b/samplecode/SamplePictFile.cpp @@ -25,8 +25,6 @@ #include "SkColorFilter.h" #include "SkTime.h" #include "SkTypeface.h" -#include "SkXfermode.h" - #include "SkStream.h" #include "SkSurface.h" diff --git a/samplecode/SamplePoints.cpp b/samplecode/SamplePoints.cpp index 0bfe28f850..13b98972d3 100644 --- a/samplecode/SamplePoints.cpp +++ b/samplecode/SamplePoints.cpp @@ -19,8 +19,6 @@ #include "SkColorFilter.h" #include "SkTime.h" #include "SkTypeface.h" -#include "SkXfermode.h" - #include "SkStream.h" class PointsView : public SampleView { diff --git a/samplecode/SampleShaders.cpp b/samplecode/SampleShaders.cpp index ba3b80d7f8..f9926ebf3f 100644 --- a/samplecode/SampleShaders.cpp +++ b/samplecode/SampleShaders.cpp @@ -15,7 +15,6 @@ #include "SkRegion.h" #include "SkShader.h" #include "SkUtils.h" -#include "SkXfermode.h" #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkTime.h" diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp index 730c47ce98..8325cd7755 100644 --- a/samplecode/SampleText.cpp +++ b/samplecode/SampleText.cpp @@ -21,8 +21,6 @@ #include "SkColorFilter.h" #include "SkTime.h" #include "SkTypeface.h" -#include "SkXfermode.h" - #include "SkStream.h" static const struct { diff --git a/samplecode/SampleTextAlpha.cpp b/samplecode/SampleTextAlpha.cpp index 48625ad79a..8286177ae7 100644 --- a/samplecode/SampleTextAlpha.cpp +++ b/samplecode/SampleTextAlpha.cpp @@ -15,7 +15,6 @@ #include "SkRegion.h" #include "SkShader.h" #include "SkUtils.h" -#include "SkXfermode.h" #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkTime.h" diff --git a/samplecode/SampleTextBox.cpp b/samplecode/SampleTextBox.cpp index 8540ca456f..947ed8ec1e 100644 --- a/samplecode/SampleTextBox.cpp +++ b/samplecode/SampleTextBox.cpp @@ -16,7 +16,6 @@ #include "SkRegion.h" #include "SkShader.h" #include "SkUtils.h" -#include "SkXfermode.h" #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkTime.h" diff --git a/samplecode/SampleVertices.cpp b/samplecode/SampleVertices.cpp index 3ba98bb919..d08726c027 100644 --- a/samplecode/SampleVertices.cpp +++ b/samplecode/SampleVertices.cpp @@ -14,7 +14,6 @@ #include "SkRegion.h" #include "SkShader.h" #include "SkUtils.h" -#include "SkXfermode.h" #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkTime.h" diff --git a/samplecode/SampleXfermodesBlur.cpp b/samplecode/SampleXfermodesBlur.cpp index fe07c9b567..2169ffde53 100644 --- a/samplecode/SampleXfermodesBlur.cpp +++ b/samplecode/SampleXfermodesBlur.cpp @@ -21,7 +21,6 @@ #include "SkColorFilter.h" #include "SkTime.h" #include "SkTypeface.h" -#include "SkXfermode.h" #include "SkStream.h" #include "SkColorPriv.h" |