Revert 177812 "Migrate touch events to EventHandlerRegistry"

trunk/Source/core/frame/LocalDOMWindow.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 396 matching lines @@
 
     if (m_frame->page() && m_frame->view()) {
         if (ScrollingCoordinator* scrollingCoordinator = m_frame->page()->scrollingCoordinator()) {
             scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_frame->view(), HorizontalScrollbar);
             scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_frame->view(), VerticalScrollbar);
             scrollingCoordinator->scrollableAreaScrollLayerDidChange(m_frame->view());
         }
     }
 
     m_frame->selection().updateSecureKeyboardEntryIfActive();
+
+    if (m_frame->isMainFrame()) {
+        if (m_document->hasTouchEventHandlers())
+            m_frame->host()->chrome().client().needTouchEvents(true);
+    }
     return m_document;
 }
 
 EventQueue* LocalDOMWindow::eventQueue() const
 {
     return m_eventQueue.get();
 }
 
 void LocalDOMWindow::enqueueWindowEvent(PassRefPtrWillBeRawPtr<Event> event)
 {
@@ skipping 1102 matching lines @@
 bool LocalDOMWindow::addEventListener(const AtomicString& eventType, PassRefPtr<EventListener> listener, bool useCapture)
 {
     if (!EventTarget::addEventListener(eventType, listener, useCapture))
         return false;
 
     if (m_frame && m_frame->host())
         m_frame->host()->eventHandlerRegistry().didAddEventHandler(*this, eventType);
 
     if (Document* document = this->document()) {
         document->addListenerTypeIfNeeded(eventType);
-        if (eventType == EventTypeNames::storage)
+        if (isTouchEventType(eventType))
+            document->didAddTouchEventHandler(document);
+        else if (eventType == EventTypeNames::storage)
             didAddStorageEventListener(this);
     }
 
     lifecycleNotifier().notifyAddEventListener(this, eventType);
 
     if (eventType == EventTypeNames::unload) {
         UseCounter::count(document(), UseCounter::DocumentUnloadRegistered);
         addUnloadEventListener(this);
     } else if (eventType == EventTypeNames::beforeunload) {
         UseCounter::count(document(), UseCounter::DocumentBeforeUnloadRegistered);
@@ skipping 12 matching lines @@
 }
 
 bool LocalDOMWindow::removeEventListener(const AtomicString& eventType, EventListener* listener, bool useCapture)
 {
     if (!EventTarget::removeEventListener(eventType, listener, useCapture))
         return false;
 
     if (m_frame && m_frame->host())
         m_frame->host()->eventHandlerRegistry().didRemoveEventHandler(*this, eventType);
 
+    if (Document* document = this->document()) {
+        if (isTouchEventType(eventType))
+            document->didRemoveTouchEventHandler(document);
+    }
+
     lifecycleNotifier().notifyRemoveEventListener(this, eventType);
 
     if (eventType == EventTypeNames::unload) {
         removeUnloadEventListener(this);
     } else if (eventType == EventTypeNames::beforeunload && allowsBeforeUnloadListeners(this)) {
         removeBeforeUnloadEventListener(this);
     }
 
     return true;
 }
@@ skipping 48 matching lines @@
 
 void LocalDOMWindow::removeAllEventListenersInternal(BroadcastListenerRemoval mode)
 {
     EventTarget::removeAllEventListeners();
 
     lifecycleNotifier().notifyRemoveAllEventListeners(this);
 
     if (mode == DoBroadcastListenerRemoval) {
         if (m_frame && m_frame->host())
             m_frame->host()->eventHandlerRegistry().didRemoveAllEventHandlers(*this);
+
+        if (Document* document = this->document())
+            document->didClearTouchEventHandlers(document);
     }
 
     removeAllUnloadEventListeners(this);
     removeAllBeforeUnloadEventListeners(this);
 }
 
 void LocalDOMWindow::removeAllEventListeners()
 {
     removeAllEventListenersInternal(DoBroadcastListenerRemoval);
 }
@@ skipping 277 matching lines @@
     visitor->trace(m_localStorage);
     visitor->trace(m_applicationCache);
     visitor->trace(m_performance);
     visitor->trace(m_css);
     visitor->trace(m_eventQueue);
     WillBeHeapSupplementable<LocalDOMWindow>::trace(visitor);
     EventTargetWithInlineData::trace(visitor);
 }
 
 } // namespace WebCore