| Index: src/core/SkCanvas.cpp
|
| diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
|
| index bcda0f2526ca712a95eb4525da0dc8172f1ee707..7c9f5c6cd5259e3bca93f3e16a6bf036912f4bc7 100644
|
| --- a/src/core/SkCanvas.cpp
|
| +++ b/src/core/SkCanvas.cpp
|
| @@ -319,15 +319,14 @@ static SkIRect compute_device_bounds(SkBaseDevice* device) {
|
| class SkDrawIter : public SkDraw {
|
| public:
|
| SkDrawIter(SkCanvas* canvas) {
|
| - canvas = canvas->canvasForDrawIter();
|
| canvas->updateDeviceCMCache();
|
|
|
| - fClipStack = canvas->fClipStack;
|
| + fClipStack = canvas->getClipStack();
|
| fCurrLayer = canvas->fMCRec->fTopLayer;
|
|
|
| fMultiDeviceCS = nullptr;
|
| if (fCurrLayer->fNext) {
|
| - fMultiDeviceCS = canvas->fClipStack;
|
| + fMultiDeviceCS = canvas->fClipStack.get();
|
| fMultiDeviceCS->save();
|
| }
|
| }
|
| @@ -966,10 +965,6 @@ bool SkCanvas::writePixels(const SkImageInfo& origInfo, const void* pixels, size
|
| return device->writePixels(info, pixels, rowBytes, target.x(), target.y());
|
| }
|
|
|
| -SkCanvas* SkCanvas::canvasForDrawIter() {
|
| - return this;
|
| -}
|
| -
|
| //////////////////////////////////////////////////////////////////////////////
|
|
|
| void SkCanvas::updateDeviceCMCache() {
|
|
|