| Index: src/utils/SkDeferredCanvas.cpp
|
| diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp
|
| index 06f7bb089ab07ebebfd9ad7a99c9f8af0a5e11d9..c8216e46900dc2af1f90efc1bc5762e7558a3a1c 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) {
|
|
|