From a1361364e64138adda3dc5f71d50d7503838bb6d Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Tue, 7 Mar 2017 09:37:29 -0500 Subject: Revert[6] "Remove SkDraw from device-draw methods, and enable device-centric clipping."""""" Previous failure was failure to detect that the clip wasn't wide-open when optimizing for retain-vs-discard in copy-on-write. gm:copy_on_write_retain detected this. Now fixed by adding new method to SkBaseDevice.h This reverts commit 27d07f0acb85eea4062075dfbe9148ce12d92c66. BUG=skia:6214 Change-Id: I532d16ec075a4525c2a550b1157bcec695dd8efd Reviewed-on: https://skia-review.googlesource.com/9341 Reviewed-by: Florin Malita Commit-Queue: Mike Reed --- src/svg/SkSVGDevice.cpp | 59 ++++++++++++++++++++++--------------------------- src/svg/SkSVGDevice.h | 28 +++++++++++------------ 2 files changed, 41 insertions(+), 46 deletions(-) (limited to 'src/svg') diff --git a/src/svg/SkSVGDevice.cpp b/src/svg/SkSVGDevice.cpp index 360bb07d44..7ce616436c 100644 --- a/src/svg/SkSVGDevice.cpp +++ b/src/svg/SkSVGDevice.cpp @@ -278,14 +278,9 @@ struct SkSVGDevice::MxCp { const SkMatrix* fMatrix; const SkClipStack* fClipStack; - MxCp(SkSVGDevice* device, const SkDraw& draw) { -#ifdef SK_USE_DEVICE_CLIPPING + MxCp(SkSVGDevice* device) { fMatrix = &device->ctm(); fClipStack = &device->cs(); -#else - fMatrix = draw.fMatrix; - fClipStack = draw.fClipStack; -#endif } }; @@ -607,13 +602,13 @@ SkSVGDevice::SkSVGDevice(const SkISize& size, SkXMLWriter* writer) SkSVGDevice::~SkSVGDevice() { } -void SkSVGDevice::drawPaint(const SkDraw& draw, const SkPaint& paint) { - AutoElement rect("rect", fWriter, fResourceBucket.get(), MxCp(this, draw), paint); +void SkSVGDevice::drawPaint(const SkPaint& paint) { + AutoElement rect("rect", fWriter, fResourceBucket.get(), MxCp(this), paint); rect.addRectAttributes(SkRect::MakeWH(SkIntToScalar(this->width()), SkIntToScalar(this->height()))); } -void SkSVGDevice::drawPoints(const SkDraw& draw, SkCanvas::PointMode mode, size_t count, +void SkSVGDevice::drawPoints(SkCanvas::PointMode mode, size_t count, const SkPoint pts[], const SkPaint& paint) { SkPath path; @@ -628,7 +623,7 @@ void SkSVGDevice::drawPoints(const SkDraw& draw, SkCanvas::PointMode mode, size_ path.rewind(); path.moveTo(pts[i]); path.lineTo(pts[i+1]); - AutoElement elem("path", fWriter, fResourceBucket.get(), MxCp(this, draw), paint); + AutoElement elem("path", fWriter, fResourceBucket.get(), MxCp(this), paint); elem.addPathAttributes(path); } break; @@ -636,37 +631,37 @@ void SkSVGDevice::drawPoints(const SkDraw& draw, SkCanvas::PointMode mode, size_ if (count > 1) { path.addPoly(pts, SkToInt(count), false); path.moveTo(pts[0]); - AutoElement elem("path", fWriter, fResourceBucket.get(), MxCp(this, draw), paint); + AutoElement elem("path", fWriter, fResourceBucket.get(), MxCp(this), paint); elem.addPathAttributes(path); } break; } } -void SkSVGDevice::drawRect(const SkDraw& draw, const SkRect& r, const SkPaint& paint) { - AutoElement rect("rect", fWriter, fResourceBucket.get(), MxCp(this, draw), paint); +void SkSVGDevice::drawRect(const SkRect& r, const SkPaint& paint) { + AutoElement rect("rect", fWriter, fResourceBucket.get(), MxCp(this), paint); rect.addRectAttributes(r); } -void SkSVGDevice::drawOval(const SkDraw& draw, const SkRect& oval, const SkPaint& paint) { - AutoElement ellipse("ellipse", fWriter, fResourceBucket.get(), MxCp(this, draw), paint); +void SkSVGDevice::drawOval(const SkRect& oval, const SkPaint& paint) { + AutoElement ellipse("ellipse", fWriter, fResourceBucket.get(), MxCp(this), paint); ellipse.addAttribute("cx", oval.centerX()); ellipse.addAttribute("cy", oval.centerY()); ellipse.addAttribute("rx", oval.width() / 2); ellipse.addAttribute("ry", oval.height() / 2); } -void SkSVGDevice::drawRRect(const SkDraw& draw, const SkRRect& rr, const SkPaint& paint) { +void SkSVGDevice::drawRRect(const SkRRect& rr, const SkPaint& paint) { SkPath path; path.addRRect(rr); - AutoElement elem("path", fWriter, fResourceBucket.get(), MxCp(this, draw), paint); + AutoElement elem("path", fWriter, fResourceBucket.get(), MxCp(this), paint); elem.addPathAttributes(path); } -void SkSVGDevice::drawPath(const SkDraw& draw, const SkPath& path, const SkPaint& paint, +void SkSVGDevice::drawPath(const SkPath& path, const SkPaint& paint, const SkMatrix* prePathMatrix, bool pathIsMutable) { - AutoElement elem("path", fWriter, fResourceBucket.get(), MxCp(this, draw), paint); + AutoElement elem("path", fWriter, fResourceBucket.get(), MxCp(this), paint); elem.addPathAttributes(path); // TODO: inverse fill types? @@ -711,9 +706,9 @@ void SkSVGDevice::drawBitmapCommon(const MxCp& mc, const SkBitmap& bm, const SkP } } -void SkSVGDevice::drawBitmap(const SkDraw& draw, const SkBitmap& bitmap, +void SkSVGDevice::drawBitmap(const SkBitmap& bitmap, const SkMatrix& matrix, const SkPaint& paint) { - MxCp mc(this, draw); + MxCp mc(this); SkMatrix adjustedMatrix = *mc.fMatrix; adjustedMatrix.preConcat(matrix); mc.fMatrix = &adjustedMatrix; @@ -721,9 +716,9 @@ void SkSVGDevice::drawBitmap(const SkDraw& draw, const SkBitmap& bitmap, drawBitmapCommon(mc, bitmap, paint); } -void SkSVGDevice::drawSprite(const SkDraw& draw, const SkBitmap& bitmap, +void SkSVGDevice::drawSprite(const SkBitmap& bitmap, int x, int y, const SkPaint& paint) { - MxCp mc(this, draw); + MxCp mc(this); SkMatrix adjustedMatrix = *mc.fMatrix; adjustedMatrix.preTranslate(SkIntToScalar(x), SkIntToScalar(y)); mc.fMatrix = &adjustedMatrix; @@ -731,10 +726,10 @@ void SkSVGDevice::drawSprite(const SkDraw& draw, const SkBitmap& bitmap, drawBitmapCommon(mc, bitmap, paint); } -void SkSVGDevice::drawBitmapRect(const SkDraw& draw, const SkBitmap& bm, const SkRect* srcOrNull, +void SkSVGDevice::drawBitmapRect(const SkBitmap& bm, const SkRect* srcOrNull, const SkRect& dst, const SkPaint& paint, SkCanvas::SrcRectConstraint) { - MxCp mc(this, draw); + MxCp mc(this); SkClipStack adjustedClipStack; if (srcOrNull && *srcOrNull != SkRect::Make(bm.bounds())) { @@ -754,9 +749,9 @@ void SkSVGDevice::drawBitmapRect(const SkDraw& draw, const SkBitmap& bm, const S drawBitmapCommon(mc, bm, paint); } -void SkSVGDevice::drawText(const SkDraw& draw, const void* text, size_t len, +void SkSVGDevice::drawText(const void* text, size_t len, SkScalar x, SkScalar y, const SkPaint& paint) { - AutoElement elem("text", fWriter, fResourceBucket.get(), MxCp(this, draw), paint); + AutoElement elem("text", fWriter, fResourceBucket.get(), MxCp(this), paint); elem.addTextAttributes(paint); SVGTextBuilder builder(text, len, paint, SkPoint::Make(x, y), 0); @@ -765,12 +760,12 @@ void SkSVGDevice::drawText(const SkDraw& draw, const void* text, size_t len, elem.addText(builder.text()); } -void SkSVGDevice::drawPosText(const SkDraw& draw, const void* text, size_t len, +void SkSVGDevice::drawPosText(const void* text, size_t len, const SkScalar pos[], int scalarsPerPos, const SkPoint& offset, const SkPaint& paint) { SkASSERT(scalarsPerPos == 1 || scalarsPerPos == 2); - AutoElement elem("text", fWriter, fResourceBucket.get(), MxCp(this, draw), paint); + AutoElement elem("text", fWriter, fResourceBucket.get(), MxCp(this), paint); elem.addTextAttributes(paint); SVGTextBuilder builder(text, len, paint, offset, scalarsPerPos, pos); @@ -779,7 +774,7 @@ void SkSVGDevice::drawPosText(const SkDraw& draw, const void* text, size_t len, elem.addText(builder.text()); } -void SkSVGDevice::drawTextOnPath(const SkDraw&, const void* text, size_t len, const SkPath& path, +void SkSVGDevice::drawTextOnPath(const void* text, size_t len, const SkPath& path, const SkMatrix* matrix, const SkPaint& paint) { SkString pathID = fResourceBucket->addPath(); @@ -816,7 +811,7 @@ void SkSVGDevice::drawTextOnPath(const SkDraw&, const void* text, size_t len, co } } -void SkSVGDevice::drawVertices(const SkDraw&, SkCanvas::VertexMode, int vertexCount, +void SkSVGDevice::drawVertices(SkCanvas::VertexMode, int vertexCount, const SkPoint verts[], const SkPoint texs[], const SkColor colors[], SkBlendMode, const uint16_t indices[], int indexCount, @@ -825,7 +820,7 @@ void SkSVGDevice::drawVertices(const SkDraw&, SkCanvas::VertexMode, int vertexCo SkDebugf("unsupported operation: drawVertices()\n"); } -void SkSVGDevice::drawDevice(const SkDraw&, SkBaseDevice*, int x, int y, +void SkSVGDevice::drawDevice(SkBaseDevice*, int x, int y, const SkPaint&) { // todo SkDebugf("unsupported operation: drawDevice()\n"); diff --git a/src/svg/SkSVGDevice.h b/src/svg/SkSVGDevice.h index 106537e4ed..78f4cea834 100644 --- a/src/svg/SkSVGDevice.h +++ b/src/svg/SkSVGDevice.h @@ -18,40 +18,40 @@ public: static SkBaseDevice* Create(const SkISize& size, SkXMLWriter* writer); protected: - void drawPaint(const SkDraw&, const SkPaint& paint) override; - void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count, + void drawPaint(const SkPaint& paint) override; + void drawPoints(SkCanvas::PointMode mode, size_t count, const SkPoint[], const SkPaint& paint) override; - void drawRect(const SkDraw&, const SkRect& r, const SkPaint& paint) override; - void drawOval(const SkDraw&, const SkRect& oval, const SkPaint& paint) override; - void drawRRect(const SkDraw&, const SkRRect& rr, const SkPaint& paint) override; - void drawPath(const SkDraw&, const SkPath& path, + void drawRect(const SkRect& r, const SkPaint& paint) override; + void drawOval(const SkRect& oval, const SkPaint& paint) override; + void drawRRect(const SkRRect& rr, const SkPaint& paint) override; + void drawPath(const SkPath& path, const SkPaint& paint, const SkMatrix* prePathMatrix = nullptr, bool pathIsMutable = false) override; - void drawBitmap(const SkDraw&, const SkBitmap& bitmap, + void drawBitmap(const SkBitmap& bitmap, const SkMatrix& matrix, const SkPaint& paint) override; - void drawSprite(const SkDraw&, const SkBitmap& bitmap, + void drawSprite(const SkBitmap& bitmap, int x, int y, const SkPaint& paint) override; - void drawBitmapRect(const SkDraw&, const SkBitmap&, + void drawBitmapRect(const SkBitmap&, const SkRect* srcOrNull, const SkRect& dst, const SkPaint& paint, SkCanvas::SrcRectConstraint) override; - void drawText(const SkDraw&, const void* text, size_t len, + void drawText(const void* text, size_t len, SkScalar x, SkScalar y, const SkPaint& paint) override; - void drawPosText(const SkDraw&, const void* text, size_t len, + void drawPosText(const void* text, size_t len, const SkScalar pos[], int scalarsPerPos, const SkPoint& offset, const SkPaint& paint) override; - void drawTextOnPath(const SkDraw&, const void* text, size_t len, + void drawTextOnPath(const void* text, size_t len, const SkPath& path, const SkMatrix* matrix, const SkPaint& paint) override; - void drawVertices(const SkDraw&, SkCanvas::VertexMode, int vertexCount, + void drawVertices(SkCanvas::VertexMode, int vertexCount, const SkPoint verts[], const SkPoint texs[], const SkColor colors[], SkBlendMode, const uint16_t indices[], int indexCount, const SkPaint& paint) override; - void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y, + void drawDevice(SkBaseDevice*, int x, int y, const SkPaint&) override; private: -- cgit v1.2.3