Revert "Revert "Hide SkCanvas getDevice() & getTopDevice()}""
This reverts commit e050ca783297db6d88d4d8d0f466f12020747cb8.
Reason for revert: Chromium change is sticking, revert not needed.
Change-Id: Ic3004460606e4c512f79ba0923746706b960881a
Reviewed-on: https://skia-review.googlesource.com/7021
Commit-Queue: Florin Malita <fmalita@chromium.org>
Reviewed-by: Florin Malita <fmalita@google.com>
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 067ccdc..e3374dd 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -853,10 +853,7 @@
return rec->fLayer->fDevice;
}
-SkBaseDevice* SkCanvas::getTopDevice(bool updateMatrixClip) const {
- if (updateMatrixClip) {
- const_cast<SkCanvas*>(this)->updateDeviceCMCache();
- }
+SkBaseDevice* SkCanvas::getTopDevice() const {
return fMCRec->fTopLayer->fDevice;
}
@@ -1403,7 +1400,7 @@
*rowBytes = pmap.rowBytes();
}
if (origin) {
- *origin = this->getTopDevice(false)->getOrigin();
+ *origin = this->getTopDevice()->getOrigin();
}
return pmap.writable_addr();
}