Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(230)

Unified Diff: Source/WebCore/dom/Document.h

Issue 11644048: Revert 138209 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | Source/WebCore/dom/Document.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/dom/Document.h
===================================================================
--- Source/WebCore/dom/Document.h (revision 138265)
+++ Source/WebCore/dom/Document.h (working copy)
@@ -207,6 +207,8 @@
};
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)
@@ -1118,14 +1120,24 @@
void didRemoveWheelEventHandler();
#if ENABLE(TOUCH_EVENTS)
- unsigned touchEventHandlerCount() const { return m_touchEventHandlerCount; }
+ bool hasTouchEventHandlers() const { return (m_touchEventTargets.get()) ? m_touchEventTargets->size() : false; }
#else
- unsigned touchEventHandlerCount() const { return 0; }
+ bool hasTouchEventHandlers() const { return false; }
#endif
- void didAddTouchEventHandler();
- void didRemoveTouchEventHandler();
+ void didAddTouchEventHandler(Node*);
+ void didRemoveTouchEventHandler(Node*);
+#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)
@@ -1503,7 +1515,7 @@
unsigned m_wheelEventHandlerCount;
#if ENABLE(TOUCH_EVENTS)
- unsigned m_touchEventHandlerCount;
+ OwnPtr<TouchEventTargetSet> m_touchEventTargets;
#endif
#if ENABLE(REQUEST_ANIMATION_FRAME)
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | Source/WebCore/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698