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

diff --git a/bench/LightingBench.cpp b/bench/LightingBench.cpp
index 72f37bf4d0e84bfe9b2d14dad03db7a18a45ce4c..bbe0af343ca40e69d193af353e9fd8ab8e2b7726 100644 (file)
--- a/bench/LightingBench.cpp
+++ b/bench/LightingBench.cpp
@@ -6,7 +6,6 @@
  */
 #include "Benchmark.h"
 #include "SkCanvas.h"
-#include "SkDevice.h"
 #include "SkLightingImageFilter.h"
 #include "SkPoint3.h"
 

diff --git a/debugger/QT/SkGLWidget.h b/debugger/QT/SkGLWidget.h
index 28cbcffd7c3af8e4e514bbe36f1e0aa645660dba..bb00857cd430fb76c4d37c7ab543d2547e8b51f0 100644 (file)
--- a/debugger/QT/SkGLWidget.h
+++ b/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"

diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
index 84e2a69e1954a19a2b13b88f876d113469ffee9d..61d3795225ee0b3c9c20f276b8543382e00eb261 100644 (file)
--- a/gm/beziereffects.cpp
+++ b/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"

diff --git a/gm/bigrrectaaeffect.cpp b/gm/bigrrectaaeffect.cpp
index f24d072dfdd2ca1a7257f5a321ba434201eb082e..f4a12523683b4cfffaead2c06428b4804f30ebc6 100644 (file)
--- a/gm/bigrrectaaeffect.cpp
+++ b/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"

diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp
index f8d184958dd5ae6a84d8ec7d5f86672a335941c0..28a4d5e97b1d1246799125dabb8a218ada181dbf 100644 (file)
--- a/gm/convexpolyeffect.cpp
+++ b/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"
 

diff --git a/gm/extractbitmap.cpp b/gm/extractbitmap.cpp
index 1b9f0188c28e6a145063c365ab3d71ffe58ab16f..3fdd5010b6e6efdd488f880f551382b2860e2c8a 100644 (file)
--- a/gm/extractbitmap.cpp
+++ b/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"
 

diff --git a/gm/pathopsskpclip.cpp b/gm/pathopsskpclip.cpp
index b52e8bbc902a934a20ed05b752ca4698c4361518..4e575cae245058cdfac76b6413a686e73e4a19e2 100644 (file)
--- a/gm/pathopsskpclip.cpp
+++ b/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"

diff --git a/gm/rrects.cpp b/gm/rrects.cpp
index e698e6bd34a75d16b4b56276afe03d133e751838..d8b5e388eb953fea2fdc739d1793346f5a730c7c 100644 (file)
--- a/gm/rrects.cpp
+++ b/gm/rrects.cpp
@@ -13,7 +13,6 @@
 #include "batches/GrRectBatchFactory.h"
 #include "effects/GrRRectEffect.h"
 #endif
-#include "SkDevice.h"
 #include "SkRRect.h"
 
 namespace skiagm {

diff --git a/samplecode/SampleAARectModes.cpp b/samplecode/SampleAARectModes.cpp
index 8066e682b18b2cb17a2528a2fa6594c9aa2d4e87..65b1da140536ff6d6600da6014880f3ac3979288 100644 (file)
--- a/samplecode/SampleAARectModes.cpp
+++ b/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"
 

diff --git a/samplecode/SampleAARects.cpp b/samplecode/SampleAARects.cpp
index 41507d973a7e5c7aaa9628500b37a381403d0349..942242b02e77d17a7ab71006adb9ffeb97e8be03 100644 (file)
--- a/samplecode/SampleAARects.cpp
+++ b/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"
 

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index b7ba6f9580f85745e5b678399cd2eea24264a9b2..12580cbb25931ce46e46d1b4558548de5bf9ab98 100644 (file)
--- a/samplecode/SampleApp.cpp
+++ b/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"

diff --git a/samplecode/SampleCircle.cpp b/samplecode/SampleCircle.cpp
index 938b5752ea51613a06e163537dbbb5fa942a99f2..ff88ac4b9b7c7c96aacb4d3f4a09298a27043400 100644 (file)
--- a/samplecode/SampleCircle.cpp
+++ b/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"

diff --git a/samplecode/SampleClip.cpp b/samplecode/SampleClip.cpp
index 2014278ceb2b06fd0c8bfe40b0c066b0b46151e2..16390d8fb4efec346525eb355c561a3b60409500 100644 (file)
--- a/samplecode/SampleClip.cpp
+++ b/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"

diff --git a/samplecode/SampleColorFilter.cpp b/samplecode/SampleColorFilter.cpp
index 8a8eef699b7630d58f280ef80aa3eca9f18def15..3da77a441f4f9e908ef16d2506d06daa13010175 100644 (file)
--- a/samplecode/SampleColorFilter.cpp
+++ b/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"
 

diff --git a/samplecode/SampleHairModes.cpp b/samplecode/SampleHairModes.cpp
index fd937e22a74da80075aea42d1703629ed5a3bec2..26037d7dc9e55b7148674ae4ed8074d6d409b695 100644 (file)
--- a/samplecode/SampleHairModes.cpp
+++ b/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"
 

diff --git a/samplecode/SampleLCD.cpp b/samplecode/SampleLCD.cpp
index 862d935b2e60ce19dc8889eec40ac398204c6ff4..ca7d3f69c437571820a8056f209a1453d43f4457 100644 (file)
--- a/samplecode/SampleLCD.cpp
+++ b/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"
 

diff --git a/samplecode/SampleManyRects.cpp b/samplecode/SampleManyRects.cpp
index 950b9833b06743e28e1489ac78fa004b905c9623..b5eb6b00bf9ac41ee902061e9c7672ce3d036d75 100644 (file)
--- a/samplecode/SampleManyRects.cpp
+++ b/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"

diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp
index 4748a766a06d8460112ce2a1b10ff4d308a796a5..9f57907626913c4635a309c6dfc98ba0fc49a2d5 100644 (file)
--- a/samplecode/SampleSlides.cpp
+++ b/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"

diff --git a/samplecode/SampleStrokeRect.cpp b/samplecode/SampleStrokeRect.cpp
index a0cc5b288bc974a51c9e9e1930ecaae055e9c52d..805d5102f157d05e32c01f9d1612f4e642a3e340 100644 (file)
--- a/samplecode/SampleStrokeRect.cpp
+++ b/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 {

diff --git a/samplecode/SampleTextAlpha.cpp b/samplecode/SampleTextAlpha.cpp
index cb07e92b5541f15744e2aefefe2467f0f9ca6b36..48625ad79a6b7c9b1a5540242512b315c2f5b32a 100644 (file)
--- a/samplecode/SampleTextAlpha.cpp
+++ b/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"

diff --git a/src/animator/SkSnapshot.cpp b/src/animator/SkSnapshot.cpp
index b61d602047a67811d15c0d62a987d750bee13e45..4d35432bd7e3befb11dc9cf71b89c7fd4a50da7e 100644 (file)
--- a/src/animator/SkSnapshot.cpp
+++ b/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);

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 9d7a3d5c0a034f5d352ac7a07baeed9a82502d4e..b07b4316b91dfdbef1a291a38b12b22f511a69f3 100644 (file)
--- a/src/core/SkCanvas.cpp
+++ b/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"

diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp
index d73934cd38759d968acc185781c2e21750eb9336..b71b79a57b6be28ffc813f083929835ad365b021 100644 (file)
--- a/src/core/SkImageFilter.cpp
+++ b/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"

diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp
index fc502aa6fce8522dfe5bbf1ce075a3807149f79a..afde01bbfb00907d12c1eb9edb665f5ebbc42ca9 100644 (file)
--- a/src/core/SkPictureRecord.cpp
+++ b/src/core/SkPictureRecord.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "SkPictureRecord.h"
-#include "SkDevice.h"
 #include "SkImage_Base.h"
 #include "SkPatchUtils.h"
 #include "SkPixelRef.h"

diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index 33575d53dd831c021db98fdba1a6846f4320186e..c4d6e12e226b2339dcf7e99fc0dbc00d03615106 100644 (file)
--- a/tests/ImageTest.cpp
+++ b/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"

diff --git a/tests/PathOpsSkpClipTest.cpp b/tests/PathOpsSkpClipTest.cpp
index b5fd58d3d5406b746509a73ca287895b9850f6ef..c96e5bf66cd064d0e35d9bf1589858d9b7e79edb 100644 (file)
--- a/tests/PathOpsSkpClipTest.cpp
+++ b/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"

diff --git a/tests/SkpSkGrTest.cpp b/tests/SkpSkGrTest.cpp
index e5553a9a75171f37d649e7f4b07bf75fa633bab6..bf534f4820c638e5830ebdf26bf205d137430ac1 100644 (file)
--- a/tests/SkpSkGrTest.cpp
+++ b/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"

diff --git a/tools/debugger/SkDebugCanvas.cpp b/tools/debugger/SkDebugCanvas.cpp
index 6b629c8959ffcb4ac70ed45e8a529fdaa897874b..8568029d38e970257c599052577703d703a6e600 100644 (file)
--- a/tools/debugger/SkDebugCanvas.cpp
+++ b/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"