diff options
| author |  mtklein <mtklein@chromium.org> | 2015-06-26 11:45:03 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-26 11:45:03 -0700 |
| commit | 2766c00fc0b6a07d46e5f74cdad45da2ef625237 (patch) | |
| tree | 152a6169021ef393f5719d511becf9f81fec8c02 /include/views | |
| parent | 46043ee50fe0532df6213172506fd16324b21e58 (diff) | |
remove SkInstCnt
It's been outclassed by Valgrind and leak sanitizer,
and it seems to be causing problems for external folks building Skia.
I'm not sure why our own builds seem unaffected.
Latest thread:
https://groups.google.com/forum/#!topic/skia-discuss/oj9FsQwwSF0
BUG=skia:
Review URL: https://codereview.chromium.org/1217573002
Diffstat (limited to 'include/views')
| -rw-r--r-- | include/views/SkEventSink.h | 2 | ||||
| -rw-r--r-- | include/views/SkView.h | 4 | ||||
| -rw-r--r-- | include/views/animated/SkWidgetViews.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/views/SkEventSink.h b/include/views/SkEventSink.h index 01d4f7a252..9714532f97 100644 --- a/include/views/SkEventSink.h +++ b/include/views/SkEventSink.h @@ -21,7 +21,7 @@ struct SkTagList; */ class SkEventSink : public SkRefCnt { public: - SK_DECLARE_INST_COUNT(SkEventSink) + SkEventSink(); virtual ~SkEventSink(); diff --git a/include/views/SkView.h b/include/views/SkView.h index db712317e5..e099e0d405 100644 --- a/include/views/SkView.h +++ b/include/views/SkView.h @@ -258,7 +258,7 @@ public: */ class Artist : public SkRefCnt { public: - SK_DECLARE_INST_COUNT(Artist) + void draw(SkView*, SkCanvas*); void inflate(const SkDOM&, const SkDOM::Node*); @@ -286,7 +286,7 @@ public: */ class Layout : public SkRefCnt { public: - SK_DECLARE_INST_COUNT(Layout) + void layoutChildren(SkView* parent); void inflate(const SkDOM&, const SkDOM::Node*); diff --git a/include/views/animated/SkWidgetViews.h b/include/views/animated/SkWidgetViews.h index 40346600c3..728eec2876 100644 --- a/include/views/animated/SkWidgetViews.h +++ b/include/views/animated/SkWidgetViews.h @@ -289,7 +289,7 @@ private: class SkListSource : public SkRefCnt { public: - SK_DECLARE_INST_COUNT(SkListSource) + virtual int countFields(); virtual void getFieldName(int index, SkString* field); |