aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/views
diff options
context:
space:
mode:
authorGravatar Herb Derby <herb@google.com>2017-01-24 11:44:52 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-01-24 17:24:50 +0000
commit5d72f7deb1807c4ee1c1d0901124d5ea07e556f2 (patch)
tree1e2ef54e51f0ea63c19337f79d172531ebe12c18 /include/views
parent80d22ea13a549cc70a44eca1407933a1efdaeddc (diff)
Remove SkTDict and calls from SkView.
R=reed@google.com Change-Id: Iebfddf752a2ac210a3f5c69de8decd06d0c35617 Reviewed-on: https://skia-review.googlesource.com/7436 Commit-Queue: Herb Derby <herb@google.com> Commit-Queue: Mike Reed <reed@google.com> Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'include/views')
-rw-r--r--include/views/SkView.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/include/views/SkView.h b/include/views/SkView.h
index 17eb3800f4..091eba366d 100644
--- a/include/views/SkView.h
+++ b/include/views/SkView.h
@@ -13,7 +13,6 @@
#include "SkEventSink.h"
#include "SkRect.h"
#include "SkDOM.h"
-#include "../private/SkTDict.h"
#include "SkMatrix.h"
#include "SkMetaData.h"
@@ -258,7 +257,7 @@ public:
*/
class Artist : public SkRefCnt {
public:
-
+
void draw(SkView*, SkCanvas*);
void inflate(const SkDOM&, const SkDOM::Node*);
@@ -286,7 +285,7 @@ public:
*/
class Layout : public SkRefCnt {
public:
-
+
void layoutChildren(SkView* parent);
void inflate(const SkDOM&, const SkDOM::Node*);
@@ -313,14 +312,6 @@ public:
/** Call this to initialize this view based on the specified XML node
*/
void inflate(const SkDOM& dom, const SkDOM::Node* node);
- /** After a view hierarchy is inflated, this may be called with a dictionary
- containing pairs of <name, view*>, where the name string was the view's
- "id" attribute when it was inflated.
-
- This will call the virtual onPostInflate for this view, and the recursively
- call postInflate on all of the view's children.
- */
- void postInflate(const SkTDict<SkView*>& ids);
SkDEBUGCODE(void dump(bool recurse) const;)
@@ -362,7 +353,6 @@ protected:
/** Override this if you want to perform post initialization work based on the ID dictionary built
during XML parsing. Be sure to call the inherited version too.
*/
- virtual void onPostInflate(const SkTDict<SkView*>&);
public:
#ifdef SK_DEBUG