aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/views/SkView.h
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-06-14 17:46:07 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-06-14 17:46:07 +0000
commit079813e2da59f35e2744af7a785d01d9f490e280 (patch)
tree324225786afe45649c38faa629dc8f021737cee9 /include/views/SkView.h
parent07a052484f684056d87eb13229d80011e9985e95 (diff)
speculative fix in TransitionView. don't validate after detachFromParent (we may have been deleted)
git-svn-id: http://skia.googlecode.com/svn/trunk@9619 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/views/SkView.h')
-rw-r--r--include/views/SkView.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/include/views/SkView.h b/include/views/SkView.h
index 66709ee2ce..d03c7415eb 100644
--- a/include/views/SkView.h
+++ b/include/views/SkView.h
@@ -365,19 +365,20 @@ protected:
virtual void onPostInflate(const SkTDict<SkView*>&);
public:
+#ifdef SK_DEBUG
+ void validate() const;
+#else
+ void validate() const {}
+#endif
// default action is to inval the view
virtual void onFocusChange(bool gainFocusP);
+
protected:
// override these if you're acting as a layer/host
virtual bool onGetFocusView(SkView**) const { return false; }
virtual bool onSetFocusView(SkView*) { return false; }
-#ifdef SK_DEBUG
- void validate() const;
-#else
- void validate() const {}
-#endif
private:
SkScalar fWidth, fHeight;
SkMatrix fMatrix;