diff options
28 files changed, 0 insertions, 29 deletions
diff --git a/bench/LightingBench.cpp b/bench/LightingBench.cpp index 72f37bf4d0..bbe0af343c 100644 --- 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 28cbcffd7c..bb00857cd4 100644 --- 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 84e2a69e19..61d3795225 100644 --- 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 f24d072dfd..f4a1252368 100644 --- 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 f8d184958d..28a4d5e97b 100644 --- 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 1b9f0188c2..3fdd5010b6 100644 --- 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 b52e8bbc90..4e575cae24 100644 --- 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 e698e6bd34..d8b5e388eb 100644 --- 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 8066e682b1..65b1da1405 100644 --- 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 41507d973a..942242b02e 100644 --- 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 b7ba6f9580..12580cbb25 100644 --- 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 938b5752ea..ff88ac4b9b 100644 --- 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 2014278ceb..16390d8fb4 100644 --- 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 8a8eef699b..3da77a441f 100644 --- 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 fd937e22a7..26037d7dc9 100644 --- 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 862d935b2e..ca7d3f69c4 100644 --- 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 950b9833b0..b5eb6b00bf 100644 --- 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 4748a766a0..9f57907626 100644 --- 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 a0cc5b288b..805d5102f1 100644 --- 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 cb07e92b55..48625ad79a 100644 --- 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 b61d602047..4d35432bd7 100644 --- 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 9d7a3d5c0a..b07b4316b9 100644 --- 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 d73934cd38..b71b79a57b 100644 --- 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 fc502aa6fc..afde01bbfb 100644 --- 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 33575d53dd..c4d6e12e22 100644 --- 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 b5fd58d3d5..c96e5bf66c 100644 --- 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 e5553a9a75..bf534f4820 100644 --- 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 6b629c8959..8568029d38 100644 --- 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" |