Rename SkCanvasDrawable to SkDrawable, and make public

samplecode/SampleHT.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SampleCode.h"
 #include "SkAnimTimer.h"
 #include "SkView.h"
 #include "SkCanvas.h"
-#include "SkCanvasDrawable.h"
+#include "SkDrawable.h"
 #include "SkInterpolator.h"
 #include "SkPictureRecorder.h"
 #include "SkRandom.h"
 
 const SkRect gUnitSquare = { -1, -1, 1, 1 };
 
 static void color_to_floats(SkColor c, SkScalar f[4]) {
     f[0] = SkIntToScalar(SkColorGetA(c));
     f[1] = SkIntToScalar(SkColorGetR(c));
     f[2] = SkIntToScalar(SkColorGetG(c));
@@ skipping 13 matching lines @@
     SkPoint pt;
     m.mapXY(x, y, &pt);
     return pt.lengthSqd() <= 1;
 }
 
 static SkColor rand_opaque_color(uint32_t seed) {
     SkRandom rand(seed);
     return rand.nextU() | (0xFF << 24);
 }
 
-class HTDrawable : public SkCanvasDrawable {
+class HTDrawable : public SkDrawable {
     SkRect          fR;
     SkColor         fColor;
     SkInterpolator* fInterp;
     SkMSec          fTime;
 
 public:
     HTDrawable(SkRandom& rand) {
         fR = SkRect::MakeXYWH(rand.nextRangeF(0, 640), rand.nextRangeF(0, 480),
                               rand.nextRangeF(20, 200), rand.nextRangeF(20, 200));
         fColor = rand_opaque_color(rand.nextU());
@@ skipping 63 matching lines @@
     enum {
         N = 50,
         W = 640,
         H = 480,
     };
     
     struct Rec {
         HTDrawable* fDrawable;
     };
     Rec fArray[N];
-    SkAutoTUnref<SkCanvasDrawable> fRoot;
+    SkAutoTUnref<SkDrawable> fRoot;
     SkMSec fTime;
     
     HTView() {
         SkRandom rand;
 
         SkPictureRecorder recorder;
         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:
     bool onQuery(SkEvent* evt) SK_OVERRIDE {
         if (SampleCode::TitleQ(*evt)) {
             SampleCode::TitleR(evt, "HT");
             return true;
         }
         return this->INHERITED::onQuery(evt);
     }
 
     void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
-        canvas->EXPERIMENTAL_drawDrawable(fRoot);
+        canvas->drawDrawable(fRoot);
     }
 
     bool onAnimate(const SkAnimTimer& timer) SK_OVERRIDE {
         fTime = timer.msec();
         for (int i = 0; i < N; ++i) {
             fArray[i].fDrawable->setTime(fTime);
         }
         return true;
     }
 
@@ skipping 10 matching lines @@
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new HTView; }
 static SkViewRegister reg(MyFactory);