commit 3cb3840c9af6f70896cf5565a38d4ee03c02d767
author reed <reed@google.com> Fri Feb 06 08:36:15 2015 -0800
committer Commit bot <commit-bot@chromium.org> Fri Feb 06 08:36:15 2015 -0800
tree cca84070500dbdd9b4cc1e2b1a7d125964739e81
parent c4e87724920222a218f31b22612efc5b1ec0ed6c

Rename SkCanvasDrawable to SkDrawable, and make public

 (patchset #2 id:20001 of https://codereview.chromium.org/903993002/)"

This reverts commit c4e87724920222a218f31b22612efc5b1ec0ed6c.

BUG=skia:
TBR=
NOTREECHECKS=True

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

samplecode/SampleArc.cpp

diff --git a/samplecode/SampleArc.cpp b/samplecode/SampleArc.cpp
index 3775de5..bc20e92 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 @@
 }
 
 class ArcsView : public SampleView {
-    class MyDrawable : public SkCanvasDrawable {
+    class MyDrawable : public SkDrawable {
         SkRect   fR;
         SkScalar fSweep;
     public:
@@ -84,7 +83,7 @@
 public:
     SkRect fRect;
     MyDrawable* fAnimatingDrawable;
-    SkCanvasDrawable* fRootDrawable;
+    SkDrawable* fRootDrawable;
 
     ArcsView() {
         testparse();
@@ -97,7 +96,7 @@
 
         SkPictureRecorder recorder;
         this->drawRoot(recorder.beginRecording(SkRect::MakeWH(800, 500)));
-        fRootDrawable = recorder.EXPERIMENTAL_endRecordingAsDrawable();
+        fRootDrawable = recorder.endRecordingAsDrawable();
     }
 
     ~ArcsView() SK_OVERRIDE {
@@ -190,13 +189,13 @@
 
         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 {

samplecode/SampleHT.cpp

diff --git a/samplecode/SampleHT.cpp b/samplecode/SampleHT.cpp
index 1436817..33fb771 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 @@
     return rand.nextU() | (0xFF << 24);
 }
 
-class HTDrawable : public SkCanvasDrawable {
+class HTDrawable : public SkDrawable {
     SkRect          fR;
     SkColor         fColor;
     SkInterpolator* fInterp;
@@ -127,7 +127,7 @@
         HTDrawable* fDrawable;
     };
     Rec fArray[N];
-    SkAutoTUnref<SkCanvasDrawable> fRoot;
+    SkAutoTUnref<SkDrawable> 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->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 @@
     }
 
     void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
-        canvas->EXPERIMENTAL_drawDrawable(fRoot);
+        canvas->drawDrawable(fRoot);
     }
 
     bool onAnimate(const SkAnimTimer& timer) SK_OVERRIDE {