Revert of rename SkCanvasDrawable to SkDrawable, and make public

samplecode/SampleHT.cpp

Index: samplecode/SampleHT.cpp
diff --git a/samplecode/SampleHT.cpp b/samplecode/SampleHT.cpp
index 33fb77105ec081f0c701f83ccdd337bde90fa2c1..1436817e769e91a28f0b6a3d6d2753b1c58ebde3 100644
--- a/samplecode/SampleHT.cpp
+++ b/samplecode/SampleHT.cpp
@@ -9,7 +9,7 @@
 #include "SkAnimTimer.h"
 #include "SkView.h"
 #include "SkCanvas.h"
-#include "SkDrawable.h"
+#include "SkCanvasDrawable.h"
 #include "SkInterpolator.h"
 #include "SkPictureRecorder.h"
 #include "SkRandom.h"
@@ -43,7 +43,7 @@
     return rand.nextU() | (0xFF << 24);
 }
 
-class HTDrawable : public SkDrawable {
+class HTDrawable : public SkCanvasDrawable {
     SkRect          fR;
     SkColor         fColor;
     SkInterpolator* fInterp;
@@ -127,7 +127,7 @@
         HTDrawable* fDrawable;
     };
     Rec fArray[N];
-    SkAutoTUnref<SkDrawable> fRoot;
+    SkAutoTUnref<SkCanvasDrawable> fRoot;
     SkMSec fTime;
     
     HTView() {
@@ -137,10 +137,10 @@
         SkCanvas* canvas = recorder.beginRecording(SkRect::MakeWH(W, H));
         for (int i = 0; i < N; ++i) {
             fArray[i].fDrawable = new HTDrawable(rand);
-            canvas->drawDrawable(fArray[i].fDrawable);
+            canvas->EXPERIMENTAL_drawDrawable(fArray[i].fDrawable);
             fArray[i].fDrawable->unref();
         }
-        fRoot.reset(recorder.endRecordingAsDrawable());
+        fRoot.reset(recorder.EXPERIMENTAL_endRecordingAsDrawable());
     }
 
 protected:
@@ -153,7 +153,7 @@
     }
 
     void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
-        canvas->drawDrawable(fRoot);
+        canvas->EXPERIMENTAL_drawDrawable(fRoot);
     }
 
     bool onAnimate(const SkAnimTimer& timer) SK_OVERRIDE {