First pass at splitting out SkPictureRecord from SkPicture

include/core/SkPictureRecorder.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 SkPictureRecorder_DEFINED
 #define SkPictureRecorder_DEFINED
 
 #include "SkBBHFactory.h"
+#include "SkCanvas.h"
 #include "SkPicture.h"
 #include "SkRefCnt.h"
 
 class SkCanvas;
 
 class SK_API SkPictureRecorder : SkNoncopyable {
 public:
+    SkPictureRecorder() { }
+
     /** Returns the canvas that records the drawing commands.
         @param width the base width for the picture, as if the recording
                      canvas' bitmap had this width.
         @param height the base width for the picture, as if the recording
                      canvas' bitmap had this height.
         @param bbhFactory factory to create desired acceleration structure
         @param recordFlags optional flags that control recording.
         @return the canvas.
     */
     // TODO: allow default parameters once the other beginRecoding entry point is gone
     SkCanvas* beginRecording(int width, int height,
                              SkBBHFactory* bbhFactory /* = NULL */,
                              uint32_t recordFlags /* = 0 */);
 
     /** Returns the recording canvas if one is active, or NULL if recording is
         not active. This does not alter the refcnt on the canvas (if present).
     */
     SkCanvas* getRecordingCanvas() {
-        if (NULL != fPicture.get()) {
-            return fPicture->getRecordingCanvas();
-        }
-        return NULL;
+        return fCanvas.get();
     }
 
     /** Signal that the caller is done recording. This invalidates the canvas
         returned by beginRecording/getRecordingCanvas, and returns the
         created SkPicture. Note that the returned picture has its creation
         ref which the caller must take ownership of.
     */
-    SkPicture* endRecording() {
-        if (NULL != fPicture.get()) {
-            fPicture->endRecording();
-            return fPicture.detach();
-        }
-        return NULL;
-    }
+    SkPicture* endRecording();
 
     /** Enable/disable all the picture recording optimizations (i.e.,
         those in SkPictureRecord). It is mainly intended for testing the
         existing optimizations (i.e., to actually have the pattern
         appear in an .skp we have to disable the optimization). Call right
         after 'beginRecording'.
     */
-    void internalOnly_EnableOpts(bool enableOpts) {
-        if (NULL != fPicture.get()) {
-            fPicture->internalOnly_EnableOpts(enableOpts);
-        }
-    }
+    void internalOnly_EnableOpts(bool enableOpts);
 
 private:
 #ifdef SK_BUILD_FOR_ANDROID
     /** Replay the current (partially recorded) operation stream into
         canvas. This call doesn't close the current recording.
     */
     friend class AndroidPicture;
     friend class SkPictureRecorderReplayTester; // for unit testing
     void partialReplay(SkCanvas* canvas) const;
 #endif
 
     SkAutoTUnref<SkPicture>         fPicture;
+    SkAutoTUnref<SkCanvas>          fCanvas;
 
     typedef SkNoncopyable INHERITED;
 };
 
 #endif