Index: Source/core/events/EventPath.h |
diff --git a/Source/core/events/EventPath.h b/Source/core/events/EventPath.h |
index 2d61dd72fc21c3eb5a6c75aff2edd7c0abf9b97d..294463e7685bce08c84c6553d1c1fe062b818651 100644 |
--- a/Source/core/events/EventPath.h |
+++ b/Source/core/events/EventPath.h |
@@ -52,12 +52,12 @@ public: |
explicit EventPath(Node*); |
void resetWith(Node*); |
- EventContext& operator[](size_t index) { return m_eventContexts[index]; } |
- const EventContext& operator[](size_t index) const { return m_eventContexts[index]; } |
- const EventContext& last() const { return m_eventContexts[size() - 1]; } |
+ NodeEventContext& operator[](size_t index) { return m_nodeEventContexts[index]; } |
+ const NodeEventContext& operator[](size_t index) const { return m_nodeEventContexts[index]; } |
+ const NodeEventContext& last() const { return m_nodeEventContexts[size() - 1]; } |
- bool isEmpty() const { return m_eventContexts.isEmpty(); } |
- size_t size() const { return m_eventContexts.size(); } |
+ bool isEmpty() const { return m_nodeEventContexts.isEmpty(); } |
+ size_t size() const { return m_nodeEventContexts.size(); } |
void adjustForRelatedTarget(Node*, EventTarget* relatedTarget); |
void adjustForTouchEvent(Node*, TouchEvent&); |
@@ -68,15 +68,15 @@ public: |
private: |
EventPath(); |
- EventContext& at(size_t index) { return m_eventContexts[index]; } |
+ NodeEventContext& at(size_t index) { return m_nodeEventContexts[index]; } |
- void addEventContext(Node*); |
+ void addNodeEventContext(Node*); |
void calculatePath(); |
void calculateAdjustedTargets(); |
void calculateAdjustedEventPath(); |
- void shrink(size_t newSize) { m_eventContexts.shrink(newSize); } |
+ void shrink(size_t newSize) { m_nodeEventContexts.shrink(newSize); } |
void shrinkIfNeeded(const Node* target, const EventTarget* relatedTarget); |
void adjustTouchList(const Node*, const TouchList*, Vector<TouchList*> adjustedTouchList, const Vector<TreeScope*>& treeScopes); |
@@ -90,7 +90,7 @@ private: |
static void checkReachability(TreeScope&, TouchList&); |
#endif |
- Vector<EventContext, 64> m_eventContexts; |
+ Vector<NodeEventContext, 64> m_nodeEventContexts; |
Node* m_node; |
Event* m_event; |
Vector<RefPtr<TreeScopeEventContext> > m_treeScopeEventContexts; |