Index: src/utils/SkDeferredCanvas.cpp |
diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp |
index cce5dde538333a5a097ca692b0f01728aab4ba16..b46e92a4a09690d60da94d95a634aad43b799f7d 100644 |
--- a/src/utils/SkDeferredCanvas.cpp |
+++ b/src/utils/SkDeferredCanvas.cpp |
@@ -526,8 +526,6 @@ |
void SkDeferredCanvas::init() { |
fBitmapSizeThreshold = kDeferredCanvasBitmapSizeThreshold; |
fDeferredDrawing = true; // On by default |
- fCachedCanvasSize.setEmpty(); |
- fCachedCanvasSizeDirty = true; |
} |
void SkDeferredCanvas::setMaxRecordingStorage(size_t maxStorage) { |
@@ -589,14 +587,6 @@ |
bool SkDeferredCanvas::isFreshFrame() const { |
return this->getDeferredDevice()->isFreshFrame(); |
-} |
- |
-SkISize SkDeferredCanvas::getCanvasSize() const { |
- if (fCachedCanvasSizeDirty) { |
- fCachedCanvasSize = this->getBaseLayerSize(); |
- fCachedCanvasSizeDirty = false; |
- } |
- return fCachedCanvasSize; |
} |
bool SkDeferredCanvas::hasPendingCommands() const { |
@@ -619,7 +609,6 @@ |
// all pending commands, which can help to seamlessly recover from |
// a lost accelerated graphics context. |
deferredDevice->setSurface(surface); |
- fCachedCanvasSizeDirty = true; |
return surface; |
} |
@@ -643,7 +632,7 @@ |
bool SkDeferredCanvas::isFullFrame(const SkRect* rect, |
const SkPaint* paint) const { |
SkCanvas* canvas = this->drawingCanvas(); |
- SkISize canvasSize = this->getCanvasSize(); |
+ SkISize canvasSize = this->getDeviceSize(); |
if (rect) { |
if (!canvas->getTotalMatrix().rectStaysRect()) { |
return false; // conservative |