Revert of rename SkCanvasDrawable to SkDrawable, and make public

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 "SkPicture.h"
 #include "SkRefCnt.h"
 
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
 namespace android {
     class Picture;
 };
 #endif
 
 class SkCanvas;
-class SkDrawable;
+class SkCanvasDrawable;
 class SkPictureRecord;
 class SkRecord;
 class SkRecorder;
 
 class SK_API SkPictureRecorder : SkNoncopyable {
 public:
     SkPictureRecorder();
     ~SkPictureRecorder();
 
     enum RecordFlags {
@@ skipping 39 matching lines @@
     /**
      *  Signal that the caller is done recording. This invalidates the canvas returned by
      *  beginRecording/getRecordingCanvas. Ownership of the object is passed to the caller, who
      *  must call unref() when they are done using it.
      *
      *  Unlike endRecordingAsPicture(), which returns an immutable picture, the returned drawable
      *  may contain live references to other drawables (if they were added to the recording canvas)
      *  and therefore this drawable will reflect the current state of those nested drawables anytime
      *  it is drawn or a new picture is snapped from it (by calling drawable->newPictureSnapshot()).
      */
-    SkDrawable* endRecordingAsDrawable();
+    SkCanvasDrawable* EXPERIMENTAL_endRecordingAsDrawable();
 
     // Legacy API -- use endRecordingAsPicture instead.
     SkPicture* endRecording() { return this->endRecordingAsPicture(); }
 
 private:
     void reset();
 
     /** Replay the current (partially recorded) operation stream into
         canvas. This call doesn't close the current recording.
     */
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
     friend class android::Picture;
 #endif
     friend class SkPictureRecorderReplayTester; // for unit testing
     void partialReplay(SkCanvas* canvas) const;
 
     uint32_t                      fFlags;
     SkRect                        fCullRect;
     SkAutoTUnref<SkBBoxHierarchy> fBBH;
     SkAutoTUnref<SkRecorder>      fRecorder;
     SkAutoTUnref<SkRecord>        fRecord;
 
     typedef SkNoncopyable INHERITED;
 };
 
 #endif