diff options
| author |  reed <reed@google.com> | 2015-02-06 08:36:15 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-06 08:36:15 -0800 |
| commit | 3cb3840c9af6f70896cf5565a38d4ee03c02d767 (patch) | |
| tree | cca84070500dbdd9b4cc1e2b1a7d125964739e81 /samplecode/SampleArc.cpp | |
| parent | c4e87724920222a218f31b22612efc5b1ec0ed6c (diff) | |
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
Diffstat (limited to 'samplecode/SampleArc.cpp')
| -rw-r--r-- | samplecode/SampleArc.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/samplecode/SampleArc.cpp b/samplecode/SampleArc.cpp index 3775de50c8..bc20e92cc3 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 @@ static void testparse() { } class ArcsView : public SampleView { - class MyDrawable : public SkCanvasDrawable { + class MyDrawable : public SkDrawable { SkRect fR; SkScalar fSweep; public: @@ -84,7 +83,7 @@ class ArcsView : public SampleView { public: SkRect fRect; MyDrawable* fAnimatingDrawable; - SkCanvasDrawable* fRootDrawable; + SkDrawable* fRootDrawable; ArcsView() { testparse(); @@ -97,7 +96,7 @@ public: SkPictureRecorder recorder; this->drawRoot(recorder.beginRecording(SkRect::MakeWH(800, 500))); - fRootDrawable = recorder.EXPERIMENTAL_endRecordingAsDrawable(); + fRootDrawable = recorder.endRecordingAsDrawable(); } ~ArcsView() SK_OVERRIDE { @@ -190,13 +189,13 @@ protected: 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 { |