rename SkCanvasDrawable to SkDrawable, and make public

BUG=skia:
NOTRY=True
... winbuilder flake

Review URL: https://codereview.chromium.org/903993002

2 files changed, 12 insertions, 13 deletions

diff --git a/samplecode/SampleArc.cpp b/samplecode/SampleArc.cpp
index 3775de50c8..bc20e92cc3 100644
--- a/samplecode/SampleArc.cpp
+++ b/samplecode/SampleArc.cpp
@@ -9,6 +9,7 @@
 #include "SkAnimTimer.h"
 #include "SkView.h"
 #include "SkCanvas.h"
+#include "SkDrawable.h"
 #include "SkGradientShader.h"
 #include "SkPath.h"
 #include "SkRegion.h"
@@ -24,8 +25,6 @@
 #include "SkColorFilter.h"
 #include "SkLayerRasterizer.h"
 
-#include "SkCanvasDrawable.h"
-
 #include "SkParsePath.h"
 static void testparse() {
     SkRect r;
@@ -40,7 +39,7 @@ static void testparse() {
 }
 
 class ArcsView : public SampleView {
-    class MyDrawable : public SkCanvasDrawable {
+    class MyDrawable : public SkDrawable {
         SkRect   fR;
         SkScalar fSweep;
     public:
@@ -84,7 +83,7 @@ class ArcsView : public SampleView {
 public:
     SkRect fRect;
     MyDrawable* fAnimatingDrawable;
-    SkCanvasDrawable* fRootDrawable;
+    SkDrawable* fRootDrawable;
 
     ArcsView() {
         testparse();
@@ -97,7 +96,7 @@ public:
 
         SkPictureRecorder recorder;
         this->drawRoot(recorder.beginRecording(SkRect::MakeWH(800, 500)));
-        fRootDrawable = recorder.EXPERIMENTAL_endRecordingAsDrawable();
+        fRootDrawable = recorder.endRecordingAsDrawable();
     }
 
     ~ArcsView() SK_OVERRIDE {
@@ -190,13 +189,13 @@ protected:
 
         DrawRectWithLines(canvas, fRect, paint);
 
-        canvas->EXPERIMENTAL_drawDrawable(fAnimatingDrawable);
+        canvas->drawDrawable(fAnimatingDrawable);
 
         DrawArcs(canvas);
     }
 
     void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
-        canvas->EXPERIMENTAL_drawDrawable(fRootDrawable);
+        canvas->drawDrawable(fRootDrawable);
     }
 
     bool onAnimate(const SkAnimTimer& timer) SK_OVERRIDE {
diff --git a/samplecode/SampleHT.cpp b/samplecode/SampleHT.cpp
index 1436817e76..33fb77105e 100644
--- a/samplecode/SampleHT.cpp
+++ b/samplecode/SampleHT.cpp
@@ -9,7 +9,7 @@
 #include "SkAnimTimer.h"
 #include "SkView.h"
 #include "SkCanvas.h"
-#include "SkCanvasDrawable.h"
+#include "SkDrawable.h"
 #include "SkInterpolator.h"
 #include "SkPictureRecorder.h"
 #include "SkRandom.h"
@@ -43,7 +43,7 @@ static SkColor rand_opaque_color(uint32_t seed) {
     return rand.nextU() | (0xFF << 24);
 }
 
-class HTDrawable : public SkCanvasDrawable {
+class HTDrawable : public SkDrawable {
     SkRect          fR;
     SkColor         fColor;
     SkInterpolator* fInterp;
@@ -127,7 +127,7 @@ public:
         HTDrawable* fDrawable;
     };
     Rec fArray[N];
-    SkAutoTUnref<SkCanvasDrawable> fRoot;
+    SkAutoTUnref<SkDrawable> fRoot;
     SkMSec fTime;
     
     HTView() {
@@ -137,10 +137,10 @@ public:
         SkCanvas* canvas = recorder.beginRecording(SkRect::MakeWH(W, H));
         for (int i = 0; i < N; ++i) {
             fArray[i].fDrawable = new HTDrawable(rand);
-            canvas->EXPERIMENTAL_drawDrawable(fArray[i].fDrawable);
+            canvas->drawDrawable(fArray[i].fDrawable);
             fArray[i].fDrawable->unref();
         }
-        fRoot.reset(recorder.EXPERIMENTAL_endRecordingAsDrawable());
+        fRoot.reset(recorder.endRecordingAsDrawable());
     }
 
 protected:
@@ -153,7 +153,7 @@ protected:
     }
 
     void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
-        canvas->EXPERIMENTAL_drawDrawable(fRoot);
+        canvas->drawDrawable(fRoot);
     }
 
     bool onAnimate(const SkAnimTimer& timer) SK_OVERRIDE {