Rein in the use of SkDevice.h

Nothing interesting.

TBR=reed@google.com

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1904673003

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

bench/LightingBench.cpp

@@ -6,7 +6,6 @@
  */
 #include "Benchmark.h"
 #include "SkCanvas.h"
-#include "SkDevice.h"
 #include "SkLightingImageFilter.h"
 #include "SkPoint3.h"
 

debugger/QT/SkGLWidget.h

@@ -15,7 +15,6 @@
 #include <QtOpenGL/QGLWidget>
 #include "SkDebugCanvas.h"
 #include "SkDebugger.h"
-#include "SkDevice.h"
 #include "SkGpuDevice.h"
 #include "GrContext.h"
 #include "gl/GrGLInterface.h"

gm/beziereffects.cpp

@@ -16,7 +16,6 @@
 #include "GrPathUtils.h"
 #include "GrTest.h"
 #include "SkColorPriv.h"
-#include "SkDevice.h"
 #include "SkGeometry.h"
 
 #include "batches/GrTestBatch.h"

gm/bigrrectaaeffect.cpp

@@ -10,7 +10,6 @@
 #include "GrContext.h"
 #include "GrDrawContextPriv.h"
 #include "GrPipelineBuilder.h"
-#include "SkDevice.h"
 #include "SkRRect.h"
 #include "batches/GrDrawBatch.h"
 #include "batches/GrRectBatchFactory.h"

gm/convexpolyeffect.cpp

@@ -17,7 +17,6 @@
 #include "GrPathUtils.h"
 #include "GrTest.h"
 #include "SkColorPriv.h"
-#include "SkDevice.h"
 #include "SkGeometry.h"
 #include "SkTLList.h"
 

gm/extractbitmap.cpp

@@ -8,7 +8,6 @@
 #include "gm.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
-#include "SkDevice.h"
 #include "SkString.h"
 #include "SkSurface.h"
 

gm/pathopsskpclip.cpp

@@ -9,7 +9,6 @@
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkClipStack.h"
-#include "SkDevice.h"
 #include "SkPath.h"
 #include "SkPathOps.h"
 #include "SkPicture.h"

gm/rrects.cpp

@@ -13,7 +13,6 @@
 #include "batches/GrRectBatchFactory.h"
 #include "effects/GrRRectEffect.h"
 #endif
-#include "SkDevice.h"
 #include "SkRRect.h"
 
 namespace skiagm {

samplecode/SampleAARectModes.cpp

@@ -8,7 +8,6 @@
 #include "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
-#include "SkDevice.h"
 #include "SkColorPriv.h"
 #include "SkShader.h"
 

samplecode/SampleAARects.cpp

@@ -7,7 +7,6 @@
 #include "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
-#include "SkDevice.h"
 #include "SkPaint.h"
 #include "SkShader.h"
 

samplecode/SampleApp.cpp

@@ -14,7 +14,6 @@
 #include "SkCanvas.h"
 #include "SkCommandLineFlags.h"
 #include "SkData.h"
-#include "SkDevice.h"
 #include "SkDocument.h"
 #include "SkGraphics.h"
 #include "SkImageEncoder.h"

samplecode/SampleCircle.cpp

@@ -7,7 +7,6 @@
 
 #include "SampleCode.h"
 #include "SkCanvas.h"
-#include "SkDevice.h"
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkView.h"

samplecode/SampleClip.cpp

@@ -9,7 +9,6 @@
 #include "SkView.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
-#include "SkDevice.h"
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkRandom.h"

samplecode/SampleColorFilter.cpp

@@ -9,7 +9,6 @@
 #include "SkView.h"
 #include "SkCanvas.h"
 #include "SkColorFilter.h"
-#include "SkDevice.h"
 #include "SkPaint.h"
 #include "SkShader.h"
 

samplecode/SampleHairModes.cpp

@@ -8,7 +8,6 @@
 #include "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
-#include "SkDevice.h"
 #include "SkColorPriv.h"
 #include "SkShader.h"
 

samplecode/SampleLCD.cpp

@@ -7,7 +7,6 @@
 #include "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
-#include "SkDevice.h"
 #include "SkPaint.h"
 #include "SkShader.h"
 

samplecode/SampleManyRects.cpp

@@ -6,7 +6,6 @@
  */
 #include "SampleCode.h"
 #include "SkCanvas.h"
-#include "SkDevice.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
 #include "SkShader.h"

samplecode/SampleSlides.cpp

@@ -8,7 +8,6 @@
 #include "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
 #include "SkCanvas.h"
-#include "SkDevice.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkGradientShader.h"

samplecode/SampleStrokeRect.cpp

@@ -7,7 +7,6 @@
 #include "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
-#include "SkDevice.h"
 #include "SkPaint.h"
 
 class StrokeRectSample : public SampleView {

samplecode/SampleTextAlpha.cpp

@@ -8,7 +8,6 @@
 #include "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
 #include "SkCanvas.h"
-#include "SkDevice.h"
 #include "SkGradientShader.h"
 #include "SkGraphics.h"
 #include "SkPath.h"

src/animator/SkSnapshot.cpp

@@ -35,8 +35,6 @@ SkSnapshot::SkSnapshot()
     fSeqVal     = 0;
 }
 
-#include "SkDevice.h"
-
 bool SkSnapshot::draw(SkAnimateMaker& maker) {
     SkASSERT(type >= 0);
     SkASSERT(filename.size() > 0);

src/core/SkCanvas.cpp

@@ -10,7 +10,6 @@
 #include "SkCanvasPriv.h"
 #include "SkClipStack.h"
 #include "SkColorFilter.h"
-#include "SkDevice.h"
 #include "SkDraw.h"
 #include "SkDrawable.h"
 #include "SkDrawFilter.h"

src/core/SkImageFilter.cpp

@@ -11,7 +11,6 @@
 #include "SkBitmap.h"
 #include "SkBitmapDevice.h"
 #include "SkChecksum.h"
-#include "SkDevice.h"
 #include "SkFuzzLogging.h"
 #include "SkLocalMatrixImageFilter.h"
 #include "SkMatrixImageFilter.h"

src/core/SkPictureRecord.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "SkPictureRecord.h"
-#include "SkDevice.h"
 #include "SkImage_Base.h"
 #include "SkPatchUtils.h"
 #include "SkPixelRef.h"

tests/ImageTest.cpp

@@ -13,7 +13,6 @@
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkData.h"
-#include "SkDevice.h"
 #include "SkImageEncoder.h"
 #include "SkImageGenerator.h"
 #include "SkImage_Base.h"

tests/PathOpsSkpClipTest.cpp

@@ -13,7 +13,6 @@
 #include "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkCommandLineFlags.h"
-#include "SkDevice.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkImageEncoder.h"

tests/SkpSkGrTest.cpp

@@ -14,7 +14,6 @@
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
-#include "SkDevice.h"
 #include "SkGraphics.h"
 #include "SkImageEncoder.h"
 #include "SkOSFile.h"

tools/debugger/SkDebugCanvas.cpp

@@ -9,7 +9,6 @@
 #include "SkClipStack.h"
 #include "SkDebugCanvas.h"
 #include "SkDrawCommand.h"
-#include "SkDevice.h"
 #include "SkPaintFilterCanvas.h"
 #include "SkOverdrawMode.h"