From e050ca783297db6d88d4d8d0f466f12020747cb8 Mon Sep 17 00:00:00 2001 From: Florin Malita Date: Fri, 13 Jan 2017 15:13:09 +0000 Subject: Revert "Hide SkCanvas getDevice() & getTopDevice()}" This reverts commit 76467a11a0aa4ba15f0f2e3ee078ba9b6ecbaa91. Reason for revert: we may need to revert the Chromium GDI change. Original change's description: > Hide SkCanvas getDevice() & getTopDevice()} > > No longer used externally. > > R=reed@google.com > > Change-Id: I450148010852c2567d136d2c85c8837c6dcbc6b9 > Reviewed-on: https://skia-review.googlesource.com/6974 > Reviewed-by: Mike Reed > Commit-Queue: Florin Malita > TBR=fmalita@chromium.org,reed@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: If8480aa5d36ff843c28409a5c94d51570ba0fc1c Reviewed-on: https://skia-review.googlesource.com/6991 Commit-Queue: Florin Malita Reviewed-by: Florin Malita --- src/core/SkCanvas.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/core') diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index e3374dde52..067ccdc4ef 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -853,7 +853,10 @@ SkBaseDevice* SkCanvas::getDevice() const { return rec->fLayer->fDevice; } -SkBaseDevice* SkCanvas::getTopDevice() const { +SkBaseDevice* SkCanvas::getTopDevice(bool updateMatrixClip) const { + if (updateMatrixClip) { + const_cast(this)->updateDeviceCMCache(); + } return fMCRec->fTopLayer->fDevice; } @@ -1400,7 +1403,7 @@ void* SkCanvas::accessTopLayerPixels(SkImageInfo* info, size_t* rowBytes, SkIPoi *rowBytes = pmap.rowBytes(); } if (origin) { - *origin = this->getTopDevice()->getOrigin(); + *origin = this->getTopDevice(false)->getOrigin(); } return pmap.writable_addr(); } -- cgit v1.2.3