diff options
| author |  Mike Reed <reed@google.com> | 2017-02-22 11:01:08 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-22 16:54:48 +0000 |
| commit | 99330ba6227137866a0dbd63478d36f335203ebd (patch) | |
| tree | 70e79529df61d1836840f70e5c814ce0be6c7d2f /src/core/SkDraw.h | |
| parent | f3ee34f1eca8f32fa0ec5494c335ce75382420a7 (diff) | |
remove device field from SkDraw
BUG=skia:6214
Change-Id: I5d57feb3e92f2c1691231c982e74020560febeca
Reviewed-on: https://skia-review.googlesource.com/8837
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core/SkDraw.h')
| -rw-r--r-- | src/core/SkDraw.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/core/SkDraw.h b/src/core/SkDraw.h index 8a2c2d44fe..534333984b 100644 --- a/src/core/SkDraw.h +++ b/src/core/SkDraw.h @@ -33,7 +33,7 @@ public: void drawPaint(const SkPaint&) const; void drawPoints(SkCanvas::PointMode, size_t count, const SkPoint[], - const SkPaint&, bool forceUseDevice = false) const; + const SkPaint&, SkBaseDevice*) const; void drawRect(const SkRect& prePaintRect, const SkPaint&, const SkMatrix* paintMatrix, const SkRect* postPaintRect) const; void drawRect(const SkRect& rect, const SkPaint& paint) const { @@ -64,10 +64,10 @@ public: const SkPaint&) const; void drawSprite(const SkBitmap&, int x, int y, const SkPaint&) const; void drawText(const char text[], size_t byteLength, SkScalar x, - SkScalar y, const SkPaint& paint) const; + SkScalar y, const SkPaint& paint, const SkSurfaceProps*) const; void drawPosText(const char text[], size_t byteLength, const SkScalar pos[], int scalarsPerPosition, - const SkPoint& offset, const SkPaint& paint) const; + const SkPoint& offset, const SkPaint&, const SkSurfaceProps*) const; void drawVertices(SkCanvas::VertexMode mode, int count, const SkPoint vertices[], const SkPoint textures[], const SkColor colors[], SkBlendMode bmode, @@ -114,11 +114,11 @@ public: SkPoint* strokeSize); static bool ShouldDrawTextAsPaths(const SkPaint&, const SkMatrix&); - void drawText_asPaths(const char text[], size_t byteLength, - SkScalar x, SkScalar y, const SkPaint&) const; - void drawPosText_asPaths(const char text[], size_t byteLength, - const SkScalar pos[], int scalarsPerPosition, - const SkPoint& offset, const SkPaint&) const; + void drawText_asPaths(const char text[], size_t byteLength, SkScalar x, SkScalar y, + const SkPaint&) const; + void drawPosText_asPaths(const char text[], size_t byteLength, const SkScalar pos[], + int scalarsPerPosition, const SkPoint& offset, + const SkPaint&, const SkSurfaceProps*) const; static SkScalar ComputeResScaleForStroking(const SkMatrix& ); private: void drawDevMask(const SkMask& mask, const SkPaint&) const; @@ -149,9 +149,7 @@ public: SkPixmap fDst; const SkMatrix* fMatrix; // required const SkRasterClip* fRC; // required - const SkClipStack* fClipStack; // optional, may be null - SkBaseDevice* fDevice; // optional, may be null #ifdef SK_DEBUG void validate() const; |