commit 443ec1b794ec5ec8a155a9cdc641e95a95914533
author Christopher Dalton <csmartdalton@google.com> Fri Feb 24 13:22:53 2017 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Feb 24 22:37:34 2017 +0000
tree e84d1b1e624d8344527086aca090af62950fe43d
parent 0354c62e0bb89607a29ce2150e77e3308a795cc4

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>

tools/viewer/SampleSlide.cpp

diff --git a/tools/viewer/SampleSlide.cpp b/tools/viewer/SampleSlide.cpp
index 00ee534..93a495e 100644
--- a/tools/viewer/SampleSlide.cpp
+++ b/tools/viewer/SampleSlide.cpp
@@ -21,22 +21,25 @@
 SampleSlide::~SampleSlide() {}
 
 void SampleSlide::draw(SkCanvas* canvas) {
+    SkASSERT(fView);
     fView->draw(canvas);
 }
 
 void SampleSlide::load(SkScalar winWidth, SkScalar winHeight) {
-    fView = (*fViewFactory)();
+    fView.reset((*fViewFactory)());
     fView->setVisibleP(true);
     fView->setClipToBounds(false);
     fView->setSize(winWidth, winHeight);
 }
 
 void SampleSlide::unload() {
-    fView->unref();
-    fView = nullptr;
+    fView.reset();
 }
 
 bool SampleSlide::onChar(SkUnichar c) {
+    if (!fView) {
+        return false;
+    }
     SkEvent evt(gCharEvtName);
     evt.setFast32(c);
     return fView->doQuery(&evt);