From 6987dcaf257dd7c2c8e0014cf7452fde82bcba5b Mon Sep 17 00:00:00 2001 From: fmalita Date: Thu, 13 Nov 2014 08:33:37 -0800 Subject: Rename onCreateDevice -> onCreateCompatibleDevice This is a port of https://codereview.chromium.org/723743002/ with the following changes: * drop the legacy onCreateDevice variant completely * also convert SkXPSDevice & SkGatherPixelRefsAndRects to the new API This is expected to break canaries and will require a manual/cowboy roll. TBR=reed@google.com NOTREECHECKS=true Review URL: https://codereview.chromium.org/720213002 --- src/utils/SkDeferredCanvas.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/utils/SkDeferredCanvas.cpp') diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp index 06f7bb089a..c8216e4690 100644 --- a/src/utils/SkDeferredCanvas.cpp +++ b/src/utils/SkDeferredCanvas.cpp @@ -159,7 +159,7 @@ public: virtual GrRenderTarget* accessRenderTarget() SK_OVERRIDE; - virtual SkBaseDevice* onCreateDevice(const SkImageInfo&, Usage) SK_OVERRIDE; + virtual SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) SK_OVERRIDE; virtual SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE; @@ -463,15 +463,15 @@ const SkBitmap& SkDeferredDevice::onAccessBitmap() { return immediateDevice()->accessBitmap(false); } -SkBaseDevice* SkDeferredDevice::onCreateDevice(const SkImageInfo& info, Usage usage) { +SkBaseDevice* SkDeferredDevice::onCreateCompatibleDevice(const CreateInfo& cinfo) { // Save layer usage not supported, and not required by SkDeferredCanvas. - SkASSERT(usage != kSaveLayer_Usage); + SkASSERT(cinfo.fUsage != kSaveLayer_Usage); // Create a compatible non-deferred device. // We do not create a deferred device because we know the new device // will not be used with a deferred canvas (there is no API for that). // And connecting a SkDeferredDevice to non-deferred canvas can result // in unpredictable behavior. - return immediateDevice()->createCompatibleDevice(info); + return immediateDevice()->onCreateCompatibleDevice(cinfo); } SkSurface* SkDeferredDevice::newSurface(const SkImageInfo& info, const SkSurfaceProps& props) { -- cgit v1.2.3