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