| Index: src/core/SkCanvas.cpp
|
| diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
|
| index c4ce75c6c0f881e96701a8f92a132c6338be6cd9..ce18c0b65d9b40ed067e4c62930e6f16d5e8c758 100644
|
| --- a/src/core/SkCanvas.cpp
|
| +++ b/src/core/SkCanvas.cpp
|
| @@ -215,7 +215,7 @@ struct DeviceCM {
|
| }
|
|
|
| void updateMC(const SkMatrix& totalMatrix, const SkRasterClip& totalClip,
|
| - const SkClipStack& clipStack, SkRasterClip* updateClip) {
|
| + SkRasterClip* updateClip) {
|
| int x = fDevice->getOrigin().x();
|
| int y = fDevice->getOrigin().y();
|
| int width = fDevice->width();
|
| @@ -242,8 +242,6 @@ struct DeviceCM {
|
| SkRegion::kDifference_Op);
|
| }
|
|
|
| - fDevice->setMatrixClip(*fMatrix, fClip.forceGetBW(), clipStack);
|
| -
|
| #ifdef SK_DEBUG
|
| if (!fClip.isEmpty()) {
|
| SkIRect deviceR;
|
| @@ -962,11 +960,11 @@ void SkCanvas::updateDeviceCMCache() {
|
| DeviceCM* layer = fMCRec->fTopLayer;
|
|
|
| if (nullptr == layer->fNext) { // only one layer
|
| - layer->updateMC(totalMatrix, totalClip, *fClipStack, nullptr);
|
| + layer->updateMC(totalMatrix, totalClip, nullptr);
|
| } else {
|
| SkRasterClip clip(totalClip);
|
| do {
|
| - layer->updateMC(totalMatrix, clip, *fClipStack, &clip);
|
| + layer->updateMC(totalMatrix, clip, &clip);
|
| } while ((layer = layer->fNext) != nullptr);
|
| }
|
| fDeviceCMDirty = false;
|
|
|