diff options
author | Mike Reed <reed@google.com> | 2017-03-04 19:43:23 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-04 19:43:35 +0000 |
commit | 025e2444c1f5a0c3cdc0bf60d1fa59941a0b5db4 (patch) | |
tree | c353105999aa71c22d41879e2b0beb2aba5df5d9 /src/svg/SkSVGDevice.cpp | |
parent | 12da890fbdafb2a2e33ced24e207ffc8cdec54c7 (diff) |
Revert "Revert "Revert[2] "Remove SkDraw from device-draw methods, and enable device-centric clipping.""""
This reverts commit baf06bc89a0ee2ac4033281e7310f6c727faab79.
Reason for revert: reland to diagnose possible g3 failure
Original change's description:
> Revert "Revert[2] "Remove SkDraw from device-draw methods, and enable device-centric clipping."""
>
> This reverts commit cfaa63237b152ae216f1351207bce3ea9808814c.
>
> Reason for revert: speculative revert to fix Google3
>
> Original change's description:
> > Revert[2] "Remove SkDraw from device-draw methods, and enable device-centric clipping.""
> >
> > passes new (augmented) CanvasClipType unittest
> > fixed rasterclipstack::setnewsize
> >
> > This reverts commit ea5e676a7b75600edcde3912886486004ccd7626.
> >
> > BUG=skia:
> >
> > Change-Id: I004653e0f4d01454662f8516fccab0046486f273
> > Reviewed-on: https://skia-review.googlesource.com/9185
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
> > Commit-Queue: Mike Reed <reed@google.com>
> >
>
> TBR=bsalomon@google.com,reed@google.com,reviews@skia.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Change-Id: Ibd7ee6383999f008eb6ee59c1c3f1c06a86044ea
> Reviewed-on: https://skia-review.googlesource.com/9230
> Reviewed-by: Cary Clark <caryclark@google.com>
> Commit-Queue: Cary Clark <caryclark@google.com>
>
TBR=bsalomon@google.com,reviews@skia.org,caryclark@google.com,reed@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: I093fa8788056be39af01191bbf3a9e5de9f73954
Reviewed-on: https://skia-review.googlesource.com/9244
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/svg/SkSVGDevice.cpp')
-rw-r--r-- | src/svg/SkSVGDevice.cpp | 59 |
1 files changed, 27 insertions, 32 deletions
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"); |