remove unnecessary bitmapdevice references

TBR=

Author: reed@google.com

Review URL: https://codereview.chromium.org/354143004

diff --git a/bench/BlurImageFilterBench.cpp b/bench/BlurImageFilterBench.cpp
index 786611b..4e8688d 100644 (file)
--- a/bench/BlurImageFilterBench.cpp
+++ b/bench/BlurImageFilterBench.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Benchmark.h"
-#include "SkBitmapDevice.h"
 #include "SkBlurImageFilter.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"

diff --git a/bench/DisplacementBench.cpp b/bench/DisplacementBench.cpp
index 881ba33..2a0f7c0 100644 (file)
--- a/bench/DisplacementBench.cpp
+++ b/bench/DisplacementBench.cpp
@@ -4,8 +4,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #include "Benchmark.h"
-#include "SkBitmapDevice.h"
 #include "SkBitmapSource.h"
 #include "SkCanvas.h"
 #include "SkDisplacementMapEffect.h"

diff --git a/bench/MagnifierBench.cpp b/bench/MagnifierBench.cpp
index 875ec4f..c47dcdc 100644 (file)
--- a/bench/MagnifierBench.cpp
+++ b/bench/MagnifierBench.cpp
@@ -4,8 +4,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #include "Benchmark.h"
-#include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkMagnifierImageFilter.h"
 #include "SkRandom.h"

diff --git a/bench/MergeBench.cpp b/bench/MergeBench.cpp
index a6bb3ac..2e1ca32 100644 (file)
--- a/bench/MergeBench.cpp
+++ b/bench/MergeBench.cpp
@@ -4,8 +4,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #include "Benchmark.h"
-#include "SkBitmapDevice.h"
 #include "SkBitmapSource.h"
 #include "SkCanvas.h"
 #include "SkMergeImageFilter.h"

diff --git a/bench/benchmain.cpp b/bench/benchmain.cpp
index 2a071be..e097fe0 100644 (file)
--- a/bench/benchmain.cpp
+++ b/bench/benchmain.cpp
@@ -10,7 +10,6 @@
 #include "CrashHandler.h"
 #include "GMBench.h"
 #include "ResultsWriter.h"
-#include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
 #include "SkCommandLineFlags.h"
@@ -29,7 +28,6 @@
 #include "GrContext.h"
 #include "GrContextFactory.h"
 #include "GrRenderTarget.h"
-#include "SkGpuDevice.h"
 #include "gl/GrGLDefines.h"
 #else
 class GrContext;

diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp
index 52d2094..9e3d762 100644 (file)
--- a/samplecode/SampleFilterFuzz.cpp
+++ b/samplecode/SampleFilterFuzz.cpp
@@ -6,7 +6,6 @@
  */
 #include "SampleCode.h"
 #include "SkAlphaThresholdFilter.h"
-#include "SkBitmapDevice.h"
 #include "SkBitmapSource.h"
 #include "SkBlurImageFilter.h"
 #include "SkCanvas.h"

diff --git a/tests/CanvasStateTest.cpp b/tests/CanvasStateTest.cpp
index 5c7e473..98a0b0e 100644 (file)
--- a/tests/CanvasStateTest.cpp
+++ b/tests/CanvasStateTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkCanvasStateUtils.h"
 #include "SkDrawFilter.h"

diff --git a/tests/GradientTest.cpp b/tests/GradientTest.cpp
index 3e40010..3b09f85 100644 (file)
--- a/tests/GradientTest.cpp
+++ b/tests/GradientTest.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "SkBitmapDevice.h"
+#include "SkCanvas.h"
 #include "SkColorShader.h"
 #include "SkEmptyShader.h"
 #include "SkGradientShader.h"

diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index c554a12..6ec1e0a 100644 (file)
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "SkBitmapDevice.h"
 #include "SkBlurImageFilter.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
@@ -13,9 +12,6 @@
 #include "SkData.h"
 #include "SkDecodingImageGenerator.h"
 #include "SkError.h"
-#if SK_SUPPORT_GPU
-#include "SkGpuDevice.h"
-#endif
 #include "SkImageEncoder.h"
 #include "SkImageGenerator.h"
 #include "SkPaint.h"

diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp
index ce91490..9917119 100644 (file)
--- a/tests/SerializationTest.cpp
+++ b/tests/SerializationTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "SkBitmapDevice.h"
 #include "SkBitmapSource.h"
 #include "SkCanvas.h"
 #include "SkMallocPixelRef.h"

diff --git a/tests/TileGridTest.cpp b/tests/TileGridTest.cpp
index da228a0..6daee16 100644 (file)
--- a/tests/TileGridTest.cpp
+++ b/tests/TileGridTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkPictureRecorder.h"
 #include "SkTileGrid.h"