diff options
| author |  Christopher Dalton <csmartdalton@google.com> | 2017-02-24 13:22:53 -0700 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-24 22:37:34 +0000 |
| commit | 443ec1b794ec5ec8a155a9cdc641e95a95914533 (patch) | |
| tree | e84d1b1e624d8344527086aca090af62950fe43d /tools/viewer/SampleSlide.h | |
| parent | 0354c62e0bb89607a29ce2150e77e3308a795cc4 (diff) | |
Add onBackendCreated callback to Viewer
Also removes fWidth and fHeight from Window and instead
calls into WindowContent to get these values.
BUG=skia:
Change-Id: I72ee506004b7da73db9abb607a3bc82edfcf7d43
Reviewed-on: https://skia-review.googlesource.com/8795
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Yuqian Li <liyuqian@google.com>
Diffstat (limited to 'tools/viewer/SampleSlide.h')
| -rw-r--r-- | tools/viewer/SampleSlide.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/viewer/SampleSlide.h b/tools/viewer/SampleSlide.h index ab45c01c70..24325c91a0 100644 --- a/tools/viewer/SampleSlide.h +++ b/tools/viewer/SampleSlide.h @@ -20,8 +20,8 @@ public: void load(SkScalar winWidth, SkScalar winHeight) override; void unload() override; bool animate(const SkAnimTimer& timer) override { - if (SampleView::IsSampleView(fView)) { - return ((SampleView*)fView)->animate(timer); + if (fView && SampleView::IsSampleView(fView.get())) { + return ((SampleView*)fView.get())->animate(timer); } return false; } @@ -30,7 +30,7 @@ public: private: const SkViewFactory* fViewFactory; - SkView* fView; + sk_sp<SkView> fView; }; #endif |