Picture Recording: fix the performance bottleneck in SkDeferredCanvas::isFullFrame

src/utils/SkDeferredCanvas.cpp

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDeferredCanvas.h"
 
@@ skipping 352 matching lines @@
             fNotificationClient->flushedDrawCommands();
         }
     }
 
     fPreviousStorageAllocated = storageAllocatedForRecording();
 }
 
 void SkDeferredDevice::flush() {
     this->flushPendingCommands(kNormal_PlaybackMode);
     fImmediateCanvas->flush();
+    fFreshFrame = true;
 }
 
 size_t SkDeferredDevice::freeMemoryIfPossible(size_t bytesToFree) {
     size_t val = fPipeWriter.freeMemoryIfPossible(bytesToFree);
     fPreviousStorageAllocated = storageAllocatedForRecording();
     return val;
 }
 
 size_t SkDeferredDevice::storageAllocatedForRecording() const {
     return (fPipeController.storageAllocatedForRecording()
@@ skipping 240 matching lines @@
     return notificationClient;
 }
 
 SkImage* SkDeferredCanvas::newImageSnapshot() {
     SkDeferredDevice* deferredDevice = this->getDeferredDevice();
     SkASSERT(deferredDevice);
     return deferredDevice ? deferredDevice->newImageSnapshot() : NULL;
 }
 
 bool SkDeferredCanvas::isFullFrame(const SkRect* rect,
-                                   const SkPaint* paint) const {
+                                   const SkPaint* paint) {
     SkCanvas* canvas = this->drawingCanvas();
-    SkISize canvasSize = this->getDeviceSize();
+    if (isFreshFrame()) {

[yunchao, 2014/09/05 08:43:13]

maybe I should implement a new method named isNewFrame(), and update fNewFrame
only in SkDeferredDevice::flush. Don't update it in
SkDeferredDevice::skipPendingCommands.

[reed1, 2014/09/05 13:18:33]

nit: this->isFreshFrame()

[Justin Novosad, 2014/09/05 13:54:49]

isFreshFrame is not the right condition for refreshing the cached size. In
general, caches should be invalidated by actions that affect the value that is
cached.  The only calls that could affect the device size are: setSurface(),
saveLayer, and a restore call that is associated with a saveLayer.  These
actions are completely independent of flushing.

[yunchao, 2014/09/09 08:58:00]

Done.

[yunchao, 2014/09/09 08:58:00]

Done. Added a new interface SkDeferredCanvas::canvasSizeChanged.

+        canvasSize = this->getDeviceSize();
+    }
     if (rect) {
         if (!canvas->getTotalMatrix().rectStaysRect()) {
             return false; // conservative
         }
 
         SkRect transformedRect;
         canvas->getTotalMatrix().mapRect(&transformedRect, *rect);
 
         if (paint) {
             SkPaint::Style paintStyle = paint->getStyle();
@@ skipping 291 matching lines @@
 SkDrawFilter* SkDeferredCanvas::setDrawFilter(SkDrawFilter* filter) {
     this->drawingCanvas()->setDrawFilter(filter);
     this->INHERITED::setDrawFilter(filter);
     this->recordedDrawCommand();
     return filter;
 }
 
 SkCanvas* SkDeferredCanvas::canvasForDrawIter() {
     return this->drawingCanvas();
 }