Implement all SkCanvas overrides that SkPictureRecord does.

src/core/SkRecorder.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkRecorder_DEFINED
 #define SkRecorder_DEFINED
 
 #include "SkCanvas.h"
 #include "SkRecord.h"
 #include "SkRecords.h"
+#include "SkTDArray.h"
 
 // SkRecorder provides an SkCanvas interface for recording into an SkRecord.
 
 class SkRecorder : public SkCanvas {
 public:
     // Does not take ownership of the SkRecord.
     SkRecorder(SkRecord*, int width, int height);
 
     // Make SkRecorder forget entirely about its SkRecord*; all calls to SkRecorder will fail.
     void forgetRecord();
@@ skipping 33 matching lines @@
                       const SkPoint vertices[],
                       const SkPoint texs[],
                       const SkColor colors[],
                       SkXfermode* xmode,
                       const uint16_t indices[],
                       int indexCount,
                       const SkPaint& paint) SK_OVERRIDE;
 
     void willSave() SK_OVERRIDE;
     SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SkCanvas::SaveFlags) SK_OVERRIDE;
+    void willRestore() SK_OVERRIDE {}
     void didRestore() SK_OVERRIDE;
 
     void didConcat(const SkMatrix&) SK_OVERRIDE;
     void didSetMatrix(const SkMatrix&) SK_OVERRIDE;
 
     void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE;
     void onDrawText(const void* text,
                     size_t byteLength,
                     SkScalar x,
                     SkScalar y,
@@ skipping 26 matching lines @@
     void onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) SK_OVERRIDE;
 
     void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE;
 
     void onPushCull(const SkRect& cullRect) SK_OVERRIDE;
     void onPopCull() SK_OVERRIDE;
 
     void beginCommentGroup(const char*) SK_OVERRIDE;
     void addComment(const char*, const char*) SK_OVERRIDE;
     void endCommentGroup() SK_OVERRIDE;
+    void drawData(const void*, size_t) SK_OVERRIDE;
+
+    bool isDrawingToLayer() const SK_OVERRIDE;
+    SkSurface* onNewSurface(const SkImageInfo&) SK_OVERRIDE { return NULL; }
 
 private:
     template <typename T>
     T* copy(const T*);
 
     template <typename T>
     T* copy(const T[], size_t count);
 
     SkIRect devBounds() const {
         SkIRect devBounds;
         this->getClipDeviceBounds(&devBounds);
         return devBounds;
     }
 
     SkRecord* fRecord;
+
+    int fSaveLayerCount;
+    SkTDArray<bool> fSaveIsSaveLayer;

[reed1, 2014/09/04 20:53:04]

absurd nit: SkBool8 may be smaller than bool

[mtklein, 2014/09/04 20:57:15]

Done.

 };
 
 #endif//SkRecorder_DEFINED