diff options
Diffstat (limited to 'include/views')
| -rw-r--r-- | include/views/SkEvent.h | 6 | ||||
| -rw-r--r-- | include/views/SkView.h | 15 |
2 files changed, 12 insertions, 9 deletions
diff --git a/include/views/SkEvent.h b/include/views/SkEvent.h index 6495530006..b78fd6fc1d 100644 --- a/include/views/SkEvent.h +++ b/include/views/SkEvent.h @@ -8,10 +8,12 @@ #ifndef SkEvent_DEFINED #define SkEvent_DEFINED -#include "SkDOM.h" #include "SkMetaData.h" #include "SkString.h" +class SkDOM; +struct SkDOMNode; + #include "../private/SkLeanWindows.h" /** Unique 32bit id used to identify an instance of SkEventSink. When events are @@ -180,7 +182,7 @@ public: const SkMetaData& getMetaData() const { return fMeta; } /** Call this to initialize the event from the specified XML node */ - void inflate(const SkDOM&, const SkDOM::Node*); + void inflate(const SkDOM&, const SkDOMNode*); SkDEBUGCODE(void dump(const char title[] = NULL);) diff --git a/include/views/SkView.h b/include/views/SkView.h index 091eba366d..43f86f501e 100644 --- a/include/views/SkView.h +++ b/include/views/SkView.h @@ -12,12 +12,13 @@ #include "SkEventSink.h" #include "SkRect.h" -#include "SkDOM.h" #include "SkMatrix.h" #include "SkMetaData.h" class SkCanvas; class SkLayerView; +class SkDOM; +struct SkDOMNode; /** \class SkView @@ -260,10 +261,10 @@ public: void draw(SkView*, SkCanvas*); - void inflate(const SkDOM&, const SkDOM::Node*); + void inflate(const SkDOM&, const SkDOMNode*); protected: virtual void onDraw(SkView*, SkCanvas*) = 0; - virtual void onInflate(const SkDOM&, const SkDOM::Node*); + virtual void onInflate(const SkDOM&, const SkDOMNode*); private: typedef SkRefCnt INHERITED; }; @@ -288,10 +289,10 @@ public: void layoutChildren(SkView* parent); - void inflate(const SkDOM&, const SkDOM::Node*); + void inflate(const SkDOM&, const SkDOMNode*); protected: virtual void onLayoutChildren(SkView* parent) = 0; - virtual void onInflate(const SkDOM&, const SkDOM::Node*); + virtual void onInflate(const SkDOM&, const SkDOMNode*); private: typedef SkRefCnt INHERITED; }; @@ -311,7 +312,7 @@ public: /** Call this to initialize this view based on the specified XML node */ - void inflate(const SkDOM& dom, const SkDOM::Node* node); + void inflate(const SkDOM& dom, const SkDOMNode* node); SkDEBUGCODE(void dump(bool recurse) const;) @@ -349,7 +350,7 @@ protected: */ virtual bool onClick(Click*); /** Override this to initialize your subclass from the XML node. Be sure to call the inherited version too */ - virtual void onInflate(const SkDOM& dom, const SkDOM::Node* node); + virtual void onInflate(const SkDOM& dom, const SkDOMNode* node); /** 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. */ |