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
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 {