diff options
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/SkLuaCanvas.cpp | 3 | ||||
| -rw-r--r-- | src/utils/SkNWayCanvas.cpp | 6 | ||||
| -rw-r--r-- | src/utils/SkPaintFilterCanvas.cpp | 5 | ||||
| -rw-r--r-- | src/utils/SkShadowUtils.cpp | 6 |
4 files changed, 11 insertions, 9 deletions
diff --git a/src/utils/SkLuaCanvas.cpp b/src/utils/SkLuaCanvas.cpp index c7e3064c9b..441857f664 100644 --- a/src/utils/SkLuaCanvas.cpp +++ b/src/utils/SkLuaCanvas.cpp @@ -314,7 +314,8 @@ void SkLuaCanvas::onDrawDrawable(SkDrawable* drawable, const SkMatrix* matrix) { this->INHERITED::onDrawDrawable(drawable, matrix); } -void SkLuaCanvas::onDrawVerticesObject(const SkVertices*, SkBlendMode, const SkPaint& paint) { +void SkLuaCanvas::onDrawVerticesObject(const SkVertices*, const SkMatrix*, int, SkBlendMode, + const SkPaint& paint) { AUTO_LUA("drawVertices"); lua.pushPaint(paint, "paint"); } diff --git a/src/utils/SkNWayCanvas.cpp b/src/utils/SkNWayCanvas.cpp index c9f9768e7c..017ec0551b 100644 --- a/src/utils/SkNWayCanvas.cpp +++ b/src/utils/SkNWayCanvas.cpp @@ -320,11 +320,11 @@ void SkNWayCanvas::onDrawDrawable(SkDrawable* drawable, const SkMatrix* matrix) } } -void SkNWayCanvas::onDrawVerticesObject(const SkVertices* vertices, SkBlendMode bmode, - const SkPaint& paint) { +void SkNWayCanvas::onDrawVerticesObject(const SkVertices* vertices, const SkMatrix* bones, + int boneCount, SkBlendMode bmode, const SkPaint& paint) { Iter iter(fList); while (iter.next()) { - iter->drawVertices(vertices, bmode, paint); + iter->drawVertices(vertices, bones, boneCount, bmode, paint); } } diff --git a/src/utils/SkPaintFilterCanvas.cpp b/src/utils/SkPaintFilterCanvas.cpp index c17990d536..929488caea 100644 --- a/src/utils/SkPaintFilterCanvas.cpp +++ b/src/utils/SkPaintFilterCanvas.cpp @@ -173,11 +173,12 @@ void SkPaintFilterCanvas::onDrawImageLattice(const SkImage* image, const Lattice } } -void SkPaintFilterCanvas::onDrawVerticesObject(const SkVertices* vertices, SkBlendMode bmode, +void SkPaintFilterCanvas::onDrawVerticesObject(const SkVertices* vertices, const SkMatrix* bones, + int boneCount, SkBlendMode bmode, const SkPaint& paint) { AutoPaintFilter apf(this, kVertices_Type, paint); if (apf.shouldDraw()) { - this->SkNWayCanvas::onDrawVerticesObject(vertices, bmode, *apf.paint()); + this->SkNWayCanvas::onDrawVerticesObject(vertices, bones, boneCount, bmode, *apf.paint()); } } diff --git a/src/utils/SkShadowUtils.cpp b/src/utils/SkShadowUtils.cpp index 6d5b7e16b4..c6b92ad985 100644 --- a/src/utils/SkShadowUtils.cpp +++ b/src/utils/SkShadowUtils.cpp @@ -545,7 +545,7 @@ void SkBaseDevice::drawShadow(const SkPath& path, const SkDrawShadowRec& rec) { if (vertices->vertexCount()) { SkAutoDeviceCTMRestore adr(this, SkMatrix::Concat(this->ctm(), SkMatrix::MakeTrans(tx, ty))); - this->drawVertices(vertices, mode, paint); + this->drawVertices(vertices, nullptr, 0, mode, paint); } }; @@ -580,7 +580,7 @@ void SkBaseDevice::drawShadow(const SkPath& path, const SkDrawShadowRec& rec) { SkColorFilter::MakeModeFilter(rec.fAmbientColor, SkBlendMode::kModulate)->makeComposed( SkGaussianColorFilter::Make())); - this->drawVertices(vertices.get(), SkBlendMode::kModulate, paint); + this->drawVertices(vertices.get(), nullptr, 0, SkBlendMode::kModulate, paint); success = true; } } @@ -661,7 +661,7 @@ void SkBaseDevice::drawShadow(const SkPath& path, const SkDrawShadowRec& rec) { SkColorFilter::MakeModeFilter(rec.fSpotColor, SkBlendMode::kModulate)->makeComposed( SkGaussianColorFilter::Make())); - this->drawVertices(vertices.get(), SkBlendMode::kModulate, paint); + this->drawVertices(vertices.get(), nullptr, 0, SkBlendMode::kModulate, paint); success = true; } } |