| Index: Source/core/dom/Document.h
|
| diff --git a/Source/core/dom/Document.h b/Source/core/dom/Document.h
|
| index f10187a3445e7ddd6d9f0129cea9e0f26a06b2f5..3e89ab8e892917918d51bc872768600eb156518b 100644
|
| --- a/Source/core/dom/Document.h
|
| +++ b/Source/core/dom/Document.h
|
| @@ -149,8 +149,6 @@ class StyleSheetList;
|
| class Text;
|
| class TextAutosizer;
|
| class TextResourceDecoder;
|
| -class Touch;
|
| -class TouchList;
|
| class TransformSource;
|
| class TreeWalker;
|
| class VisitedLinkState;
|
| @@ -166,6 +164,11 @@ class SVGDocumentExtensions;
|
|
|
| struct AnnotatedRegionValue;
|
|
|
| +#if ENABLE(TOUCH_EVENTS)
|
| +class Touch;
|
| +class TouchList;
|
| +#endif
|
| +
|
| class FontLoader;
|
|
|
| typedef int ExceptionCode;
|
| @@ -264,10 +267,12 @@ public:
|
| DEFINE_ATTRIBUTE_EVENT_LISTENER(search);
|
| DEFINE_ATTRIBUTE_EVENT_LISTENER(selectstart);
|
| DEFINE_ATTRIBUTE_EVENT_LISTENER(selectionchange);
|
| +#if ENABLE(TOUCH_EVENTS)
|
| DEFINE_ATTRIBUTE_EVENT_LISTENER(touchstart);
|
| DEFINE_ATTRIBUTE_EVENT_LISTENER(touchmove);
|
| DEFINE_ATTRIBUTE_EVENT_LISTENER(touchend);
|
| DEFINE_ATTRIBUTE_EVENT_LISTENER(touchcancel);
|
| +#endif
|
| DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitfullscreenchange);
|
| DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitfullscreenerror);
|
| DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitpointerlockchange);
|
| @@ -1036,7 +1041,9 @@ public:
|
| void decrementLoadEventDelayCount();
|
| bool isDelayingLoadEvent() const { return m_loadEventDelayCount; }
|
|
|
| +#if ENABLE(TOUCH_EVENTS)
|
| PassRefPtr<Touch> createTouch(DOMWindow*, EventTarget*, int identifier, int pageX, int pageY, int screenX, int screenY, int radiusX, int radiusY, float rotationAngle, float force, ExceptionCode&) const;
|
| +#endif
|
|
|
| const DocumentTiming* timing() const { return &m_documentTiming; }
|
|
|
| @@ -1056,14 +1063,24 @@ public:
|
| double lastHandledUserGestureTimestamp() const { return m_lastHandledUserGestureTimestamp; }
|
| void resetLastHandledUserGestureTimestamp();
|
|
|
| +#if ENABLE(TOUCH_EVENTS)
|
| bool hasTouchEventHandlers() const { return (m_touchEventTargets.get()) ? m_touchEventTargets->size() : false; }
|
| +#else
|
| + bool hasTouchEventHandlers() const { return false; }
|
| +#endif
|
|
|
| void didAddTouchEventHandler(Node*);
|
| void didRemoveTouchEventHandler(Node*);
|
|
|
| +#if ENABLE(TOUCH_EVENTS)
|
| 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 isInDocumentWrite() { return m_writeRecursionDepth > 0; }
|
|
|
| @@ -1438,7 +1455,9 @@ private:
|
| unsigned m_writeRecursionDepth;
|
|
|
| unsigned m_wheelEventHandlerCount;
|
| +#if ENABLE(TOUCH_EVENTS)
|
| OwnPtr<TouchEventTargetSet> m_touchEventTargets;
|
| +#endif
|
|
|
| double m_lastHandledUserGestureTimestamp;
|
|
|
|
|