Index: Source/WebCore/dom/Document.h |
=================================================================== |
--- Source/WebCore/dom/Document.h (revision 138019) |
+++ Source/WebCore/dom/Document.h (working copy) |
@@ -207,8 +207,6 @@ |
}; |
const int numNodeListInvalidationTypes = InvalidateOnAnyAttrChange + 1; |
-typedef HashCountedSet<Node*> TouchEventTargetSet; |
- |
class Document : public ContainerNode, public TreeScope, public ScriptExecutionContext { |
public: |
static PassRefPtr<Document> create(Frame* frame, const KURL& url) |
@@ -1120,24 +1118,14 @@ |
void didRemoveWheelEventHandler(); |
#if ENABLE(TOUCH_EVENTS) |
- bool hasTouchEventHandlers() const { return (m_touchEventTargets.get()) ? m_touchEventTargets->size() : false; } |
+ unsigned touchEventHandlerCount() const { return m_touchEventHandlerCount; } |
#else |
- bool hasTouchEventHandlers() const { return false; } |
+ unsigned touchEventHandlerCount() const { return 0; } |
#endif |
- void didAddTouchEventHandler(Node*); |
- void didRemoveTouchEventHandler(Node*); |
+ void didAddTouchEventHandler(); |
+ void didRemoveTouchEventHandler(); |
-#if ENABLE(TOUCH_EVENT_TRACKING) |
- void didRemoveEventTargetNode(Node*); |
-#endif |
- |
-#if ENABLE(TOUCH_EVENTS) |
- const TouchEventTargetSet* touchEventTargets() const { return m_touchEventTargets.get(); } |
-#else |
- const TouchEventTargetSet* touchEventTargets() const { return 0; } |
-#endif |
- |
bool visualUpdatesAllowed() const { return m_visualUpdatesAllowed; } |
#if ENABLE(MICRODATA) |
@@ -1515,7 +1503,7 @@ |
unsigned m_wheelEventHandlerCount; |
#if ENABLE(TOUCH_EVENTS) |
- OwnPtr<TouchEventTargetSet> m_touchEventTargets; |
+ unsigned m_touchEventHandlerCount; |
#endif |
#if ENABLE(REQUEST_ANIMATION_FRAME) |