diff options
| author |  Florin Malita <fmalita@chromium.org> | 2017-05-03 15:41:00 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-03 15:41:07 +0000 |
| commit | 9d5f66d9c21eda7d3e2ed47654180c0c4b6e38b1 (patch) | |
| tree | 14830ff2d997033a05a4582ab33c4734232b263d /bench | |
| parent | e188f8b14b6abb4ce8265f330b37f0faa406e04d (diff) | |
Revert "Reland: Remove SkLights include from SkCanvas.h"
This reverts commit fed00319c9bafa41c8df658708030c072b301a41.
Reason for revert: breaking the Android roll.
Original change's description:
> Reland: Remove SkLights include from SkCanvas.h
>
> SkLights.h pulls in a bunch of other headers and is not needed (fwdecl
> works fine).
>
> Change-Id: I3ed97cd7861e51dcb7cfa7950a97b420dbc6fbfb
> TBR=reed@google.com
> Reviewed-on: https://skia-review.googlesource.com/15143
> Commit-Queue: Florin Malita <fmalita@chromium.org>
> Reviewed-by: Florin Malita <fmalita@chromium.org>
>
TBR=fmalita@chromium.org,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I3b0e69f1d04d160f16a5567b09982d35cc9ca84e
Reviewed-on: https://skia-review.googlesource.com/15195
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'bench')
| -rw-r--r-- | bench/ColorCanvasDrawBitmapBench.cpp | 1 | ||||
| -rw-r--r-- | bench/DrawBitmapAABench.cpp | 1 | ||||
| -rw-r--r-- | bench/DrawLatticeBench.cpp | 1 | ||||
| -rw-r--r-- | bench/ImageFilterDAGBench.cpp | 1 | ||||
| -rw-r--r-- | bench/MagnifierBench.cpp | 1 | ||||
| -rw-r--r-- | bench/ReadPixBench.cpp | 1 | ||||
| -rw-r--r-- | bench/ShaderMaskBench.cpp | 1 | ||||
| -rw-r--r-- | bench/WritePixelsBench.cpp | 1 |
8 files changed, 0 insertions, 8 deletions
diff --git a/bench/ColorCanvasDrawBitmapBench.cpp b/bench/ColorCanvasDrawBitmapBench.cpp index c150e7974b..de13ba2afc 100644 --- a/bench/ColorCanvasDrawBitmapBench.cpp +++ b/bench/ColorCanvasDrawBitmapBench.cpp @@ -6,7 +6,6 @@ */ #include "Benchmark.h" -#include "SkBitmap.h" #include "SkCanvas.h" #include "SkColorSpaceXformCanvas.h" #include "SkString.h" diff --git a/bench/DrawBitmapAABench.cpp b/bench/DrawBitmapAABench.cpp index f0ccd89000..011c30a100 100644 --- a/bench/DrawBitmapAABench.cpp +++ b/bench/DrawBitmapAABench.cpp @@ -5,7 +5,6 @@ * found in the LICENSE file. */ #include "Benchmark.h" -#include "SkBitmap.h" #include "SkCanvas.h" #include "SkMatrix.h" #include "SkPaint.h" diff --git a/bench/DrawLatticeBench.cpp b/bench/DrawLatticeBench.cpp index 7a8cdf3b3a..806815b21d 100644 --- a/bench/DrawLatticeBench.cpp +++ b/bench/DrawLatticeBench.cpp @@ -6,7 +6,6 @@ */ #include "Benchmark.h" -#include "SkBitmap.h" #include "SkCanvas.h" #include "SkRect.h" #include "SkString.h" diff --git a/bench/ImageFilterDAGBench.cpp b/bench/ImageFilterDAGBench.cpp index 350510bf9d..719e87b58d 100644 --- a/bench/ImageFilterDAGBench.cpp +++ b/bench/ImageFilterDAGBench.cpp @@ -10,7 +10,6 @@ #include "SkBlurImageFilter.h" #include "SkDisplacementMapEffect.h" #include "SkCanvas.h" -#include "SkImage.h" #include "SkMergeImageFilter.h" diff --git a/bench/MagnifierBench.cpp b/bench/MagnifierBench.cpp index 6403aa6de7..98deade164 100644 --- a/bench/MagnifierBench.cpp +++ b/bench/MagnifierBench.cpp @@ -6,7 +6,6 @@ */ #include "Benchmark.h" -#include "SkBitmap.h" #include "SkCanvas.h" #include "SkMagnifierImageFilter.h" #include "SkRandom.h" diff --git a/bench/ReadPixBench.cpp b/bench/ReadPixBench.cpp index 2a8e9c4df3..2efb19cc9b 100644 --- a/bench/ReadPixBench.cpp +++ b/bench/ReadPixBench.cpp @@ -6,7 +6,6 @@ */ #include "Benchmark.h" -#include "SkBitmap.h" #include "SkCanvas.h" diff --git a/bench/ShaderMaskBench.cpp b/bench/ShaderMaskBench.cpp index 1cc2347403..8fd99b6536 100644 --- a/bench/ShaderMaskBench.cpp +++ b/bench/ShaderMaskBench.cpp @@ -9,7 +9,6 @@ #include "SkCanvas.h" #include "SkPaint.h" #include "SkRandom.h" -#include "SkShader.h" #include "SkString.h" #include "SkTemplates.h" diff --git a/bench/WritePixelsBench.cpp b/bench/WritePixelsBench.cpp index 4e2dbeba33..5d6787e25c 100644 --- a/bench/WritePixelsBench.cpp +++ b/bench/WritePixelsBench.cpp @@ -6,7 +6,6 @@ */ #include "Benchmark.h" -#include "SkBitmap.h" #include "SkCanvas.h" #include "SkString.h" |