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/SampleHT.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/SampleHT.cpp')
| -rw-r--r-- | samplecode/SampleHT.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/samplecode/SampleHT.cpp b/samplecode/SampleHT.cpp index 1436817e76..33fb77105e 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 @@ static SkColor rand_opaque_color(uint32_t seed) { return rand.nextU() | (0xFF << 24); } -class HTDrawable : public SkCanvasDrawable { +class HTDrawable : public SkDrawable { SkRect fR; SkColor fColor; SkInterpolator* fInterp; @@ -127,7 +127,7 @@ public: HTDrawable* fDrawable; }; Rec fArray[N]; - SkAutoTUnref<SkCanvasDrawable> fRoot; + SkAutoTUnref<SkDrawable> fRoot; SkMSec fTime; HTView() { @@ -137,10 +137,10 @@ public: 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 @@ protected: } void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { - canvas->EXPERIMENTAL_drawDrawable(fRoot); + canvas->drawDrawable(fRoot); } bool onAnimate(const SkAnimTimer& timer) SK_OVERRIDE { |