Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

Unified Diff: src/core/SkCanvas.cpp

Issue 2448593002: Remove SkAutoTUnref and SkAutoTDelete from public includes. (Closed)
Patch Set: And Vulcan. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/xml/SkDOM.h ('k') | src/core/SkMaskGamma.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
« no previous file with comments | « include/xml/SkDOM.h ('k') | src/core/SkMaskGamma.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698