Revert removal of events

Source/core/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
@@ skipping 151 matching lines @@
 #include "Settings.h"
 #include "ShadowRoot.h"
 #include "StaticHashSetNodeList.h"
 #include "StylePropertySet.h"
 #include "StyleResolver.h"
 #include "StyleSheetContents.h"
 #include "StyleSheetList.h"
 #include "TextAutosizer.h"
 #include "TextResourceDecoder.h"
 #include "Timer.h"
-#include "TouchList.h"
 #include "TraceEvent.h"
 #include "TransformSource.h"
 #include "TreeWalker.h"
 #include "UserActionElementSet.h"
 #include "UserContentURLPattern.h"
 #include "VisitedLinkState.h"
 #include "WebCoreMemoryInstrumentation.h"
 #include "XMLDocumentParser.h"
 #include "XMLHttpRequest.h"
 #include "XMLNSNames.h"
@@ skipping 20 matching lines @@
 #endif
 
 #if ENABLE(SVG)
 #include "SVGDocumentExtensions.h"
 #include "SVGElementFactory.h"
 #include "SVGNames.h"
 #include "SVGSVGElement.h"
 #include "SVGStyleElement.h"
 #endif
 
+#if ENABLE(TOUCH_EVENTS)
+#include "TouchList.h"
+#endif
+
 #if ENABLE(MATHML)
 #include "MathMLElement.h"
 #include "MathMLElementFactory.h"
 #include "MathMLNames.h"
 #endif
 
 #include "CaptionUserPreferences.h"
 
 using namespace std;
 using namespace WTF;
@@ skipping 322 matching lines @@
     ASSERT(!m_inPageCache);
     ASSERT(!m_savedRenderer);
     ASSERT(m_ranges.isEmpty());
     ASSERT(!m_styleRecalcTimer.isActive());
     ASSERT(!m_parentTreeScope);
     ASSERT(!hasGuardRefCount());
 
     if (m_templateDocument)
         m_templateDocument->setTemplateDocumentHost(0); // balanced in templateDocument().
 
+#if ENABLE(TOUCH_EVENT_TRACKING)
     if (Document* ownerDocument = this->ownerDocument())
         ownerDocument->didRemoveEventTargetNode(this);
+#endif
     // FIXME: Should we reset m_domWindow when we detach from the Frame?
     if (m_domWindow)
         m_domWindow->resetUnlessSuspendedForPageCache();
 
     m_scriptRunner.clear();
 
     histogramMutationEventUsage(m_listenerTypes);
 
     removeAllEventListeners();
 
@@ skipping 1432 matching lines @@
     m_focusedNode = 0;
     m_activeElement = 0;
 
     ContainerNode::detach();
 
     unscheduleStyleRecalc();
 
     if (render)
         render->destroy();
 
+#if ENABLE(TOUCH_EVENTS)
     if (m_touchEventTargets && m_touchEventTargets->size() && parentDocument())
         parentDocument()->didRemoveEventTargetNode(this);
+#endif
 
     // This is required, as our Frame might delete itself as soon as it detaches
     // us. However, this violates Node::detach() semantics, as it's never
     // possible to re-attach. Eventually Document::detach() should be renamed,
     // or this setting of the frame to 0 could be made explicit in each of the
     // callers of Document::detach().
     m_frame = 0;
     m_renderArena.clear();
 
     if (m_mediaQueryMatcher)
@@ skipping 3383 matching lines @@
     m_scriptedAnimationController->cancelCallback(id);
 }
 
 void Document::serviceScriptedAnimations(double monotonicAnimationStartTime)
 {
     if (!m_scriptedAnimationController)
         return;
     m_scriptedAnimationController->serviceScriptedAnimations(monotonicAnimationStartTime);
 }
 
+#if ENABLE(TOUCH_EVENTS)
 PassRefPtr<Touch> Document::createTouch(DOMWindow* window, EventTarget* target, int identifier, int pageX, int pageY, int screenX, int screenY, int radiusX, int radiusY, float rotationAngle, float force, ExceptionCode&) const
 {
     // FIXME: It's not clear from the documentation at
     // http://developer.apple.com/library/safari/#documentation/UserExperience/Reference/DocumentAdditionsReference/DocumentAdditions/DocumentAdditions.html
     // when this method should throw and nor is it by inspection of iOS behavior. It would be nice to verify any cases where it throws under iOS
     // and implement them here. See https://bugs.webkit.org/show_bug.cgi?id=47819
     Frame* frame = window ? window->frame() : this->frame();
     return Touch::create(frame, target, identifier, screenX, screenY, pageX, pageY, radiusX, radiusY, rotationAngle, force);
 }
+#endif
 
 static void wheelEventHandlerCountChanged(Document* document)
 {
     Page* page = document->page();
     if (!page)
         return;
 
     ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator();
     if (!scrollingCoordinator)
         return;
@@ skipping 21 matching lines @@
     --m_wheelEventHandlerCount;
     Frame* mainFrame = page() ? page()->mainFrame() : 0;
     if (mainFrame)
         mainFrame->notifyChromeClientWheelEventHandlerCountChanged();
 
     wheelEventHandlerCountChanged(this);
 }
 
 void Document::didAddTouchEventHandler(Node* handler)
 {
+#if ENABLE(TOUCH_EVENTS)
     if (!m_touchEventTargets.get())
         m_touchEventTargets = adoptPtr(new TouchEventTargetSet);
     m_touchEventTargets->add(handler);
     if (Document* parent = parentDocument()) {
         parent->didAddTouchEventHandler(this);
         return;
     }
     if (Page* page = this->page()) {
+#if ENABLE(TOUCH_EVENT_TRACKING)
         if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
             scrollingCoordinator->touchEventTargetRectsDidChange(this);
+#endif
         if (m_touchEventTargets->size() == 1)
             page->chrome()->client()->needTouchEvents(true);
     }
+#else
+    UNUSED_PARAM(handler);
+#endif
 }
 
 void Document::didRemoveTouchEventHandler(Node* handler)
 {
+#if ENABLE(TOUCH_EVENTS)
     if (!m_touchEventTargets.get())
         return;
     ASSERT(m_touchEventTargets->contains(handler));
     m_touchEventTargets->remove(handler);
     if (Document* parent = parentDocument()) {
         parent->didRemoveTouchEventHandler(this);
         return;
     }
 
     Page* page = this->page();
     if (!page)
         return;
+#if ENABLE(TOUCH_EVENT_TRACKING)
     if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
         scrollingCoordinator->touchEventTargetRectsDidChange(this);
+#endif
     if (m_touchEventTargets->size())
         return;
     for (const Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
         if (frame->document() && frame->document()->hasTouchEventHandlers())
             return;
     }
     page->chrome()->client()->needTouchEvents(false);
+#else
+    UNUSED_PARAM(handler);
+#endif
 }
 
+#if ENABLE(TOUCH_EVENTS)
 void Document::didRemoveEventTargetNode(Node* handler)
 {
     if (m_touchEventTargets) {
         m_touchEventTargets->removeAll(handler);
         if ((handler == this || m_touchEventTargets->isEmpty()) && parentDocument())
             parentDocument()->didRemoveEventTargetNode(this);
     }
 }
+#endif
 
 void Document::resetLastHandledUserGestureTimestamp()
 {
     m_lastHandledUserGestureTimestamp = currentTime();
 }
 
 HTMLIFrameElement* Document::seamlessParentIFrame() const
 {
     if (!shouldDisplaySeamlesslyWithParent())
         return 0;
@@ skipping 293 matching lines @@
     info.addMember(m_fullScreenChangeEventTargetQueue, "fullScreenChangeEventTargetQueue");
     info.addMember(m_fullScreenErrorEventTargetQueue, "fullScreenErrorEventTargetQueue");
     info.addMember(m_savedPlaceholderRenderStyle, "savedPlaceholderRenderStyle");
 #if ENABLE(DIALOG_ELEMENT)
     info.addMember(m_topLayerElements, "topLayerElements");
 #endif
     info.addMember(m_loadEventDelayTimer, "loadEventDelayTimer");
     info.addMember(m_viewportArguments, "viewportArguments");
     info.addMember(m_documentTiming, "documentTiming");
     info.addMember(m_mediaQueryMatcher, "mediaQueryMatcher");
+#if ENABLE(TOUCH_EVENTS)
     info.addMember(m_touchEventTargets, "touchEventTargets");
+#endif
     info.addMember(m_scriptedAnimationController, "scriptedAnimationController");
     info.addMember(m_pendingTasksTimer, "pendingTasksTimer");
     info.addMember(m_textAutosizer, "textAutosizer");
     info.addMember(m_namedFlows, "namedFlows");
     info.addMember(m_domSecurityPolicy, "domSecurityPolicy");
     info.addMember(m_sharedObjectPoolClearTimer, "sharedObjectPoolClearTimer");
     info.addMember(m_sharedObjectPool, "sharedObjectPool");
     info.addMember(m_localeCache, "localeCache");
     info.addMember(m_templateDocument, "templateDocument");
     info.addMember(m_templateDocumentHost, "templateDocumentHost");
@@ skipping 54 matching lines @@
         return;
 
     Vector<RefPtr<Element> > associatedFormControls;
     copyToVector(m_associatedFormControls, associatedFormControls);
 
     frame()->page()->chrome()->client()->didAssociateFormControls(associatedFormControls);
     m_associatedFormControls.clear();
 }
 
 } // namespace WebCore