commit 0ed3b640c9da71fbbd73c65a4ec1992f85596271
author Florin Malita <fmalita@google.com> Fri Jan 13 16:56:38 2017 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jan 13 17:30:19 2017 +0000
tree 0dcfcb369e597b63945727fa5c42b1f4db325765
parent aa9b5a1fd9b28f763b85d3ae74567aec2773cdde

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>

src/core/SkCanvas.cpp

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();
 }