Add EventHandlerRegistry

Source/core/dom/ScrollEventHandlerController.cpp

 /*
- * Copyright (C) 2013 Google, Inc. All rights reserved.
+ * Copyright (C) 2014 Google, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *  * Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  *  * Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
-#include "core/dom/WheelController.h"
+#include "core/dom/ScrollEventHandlerController.h"
 
 #include "core/dom/Document.h"
 #include "core/events/ThreadLocalEventNames.h"
-#include "core/events/WheelEvent.h"
-#include "core/frame/LocalFrame.h"
+#include "core/frame/DOMWindow.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 
 namespace WebCore {
 
-WheelController::WheelController(Document& document)
+ScrollEventHandlerController::ScrollEventHandlerController(Document& document)
     : DOMWindowLifecycleObserver(document.domWindow())
-    , m_wheelEventHandlerCount(0)
+    , m_scrollEventHandlerCount(0)
 {
 }
 
-WheelController::~WheelController()
+ScrollEventHandlerController::~ScrollEventHandlerController()
 {
 }
 
-const char* WheelController::supplementName()
+const char* ScrollEventHandlerController::supplementName()
 {
-    return "WheelController";
+    return "ScrollEventHandlerController";
 }
 
-WheelController* WheelController::from(Document& document)
+ScrollEventHandlerController* ScrollEventHandlerController::from(Document& document)
 {
-    WheelController* controller = static_cast<WheelController*>(DocumentSupplement::from(document, supplementName()));
+    ScrollEventHandlerController* controller = static_cast<ScrollEventHandlerController*>(DocumentSupplement::from(document, supplementName()));
     if (!controller) {
-        controller = new WheelController(document);
+        controller = new ScrollEventHandlerController(document);
         DocumentSupplement::provideTo(document, supplementName(), adoptPtr(controller));
     }
     return controller;
 }
 
-static void wheelEventHandlerCountChanged(Document& document)
+static void scrollEventHandlerCountChanged(Document& document)
 {
     Page* page = document.page();
     if (!page)
         return;
 
     ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator();
     if (!scrollingCoordinator)
         return;
 
     FrameView* frameView = document.view();
     if (!frameView)
         return;
 
-    scrollingCoordinator->frameViewWheelEventHandlerCountChanged(frameView);
+    scrollingCoordinator->frameViewScrollEventHandlerCountChanged(frameView);
 }

[abarth-chromium, 2014/03/20 23:42:06]

So much copy/pasted code.  Can you extract a base class to share some of this
code?

 
-void WheelController::didAddWheelEventHandler(Document& document)
+void ScrollEventHandlerController::didAddScrollEventHandler(Document& document)
 {
-    ++m_wheelEventHandlerCount;
-    Page* page = document.page();
-    LocalFrame* mainFrame = page ? page->mainFrame() : 0;
-    if (mainFrame)
-        mainFrame->notifyChromeClientWheelEventHandlerCountChanged();
-
-    wheelEventHandlerCountChanged(document);
+    ++m_scrollEventHandlerCount;
+    scrollEventHandlerCountChanged(document);
 }
 
-void WheelController::didRemoveWheelEventHandler(Document& document)
+void ScrollEventHandlerController::didRemoveScrollEventHandler(Document& document)
 {
-    ASSERT(m_wheelEventHandlerCount > 0);
-    --m_wheelEventHandlerCount;
-    Page* page = document.page();
-    LocalFrame* mainFrame = page ? page->mainFrame() : 0;
-    if (mainFrame)
-        mainFrame->notifyChromeClientWheelEventHandlerCountChanged();
-
-    wheelEventHandlerCountChanged(document);
+    ASSERT(m_scrollEventHandlerCount > 0);
+    --m_scrollEventHandlerCount;
+    scrollEventHandlerCountChanged(document);
 }
 
-void WheelController::didAddEventListener(DOMWindow* window, const AtomicString& eventType)
+void ScrollEventHandlerController::didAddEventListener(DOMWindow* window, const AtomicString& eventType)
 {
-    if (eventType != EventTypeNames::wheel && eventType != EventTypeNames::mousewheel)
+    if (eventType != EventTypeNames::scroll)
         return;
 
     Document* document = window->document();
     ASSERT(document);
-    didAddWheelEventHandler(*document);
+    didAddScrollEventHandler(*document);
 }
 
-void WheelController::didRemoveEventListener(DOMWindow* window, const AtomicString& eventType)
+void ScrollEventHandlerController::didRemoveEventListener(DOMWindow* window, const AtomicString& eventType)
 {
-    if (eventType != EventTypeNames::wheel && eventType != EventTypeNames::mousewheel)
+    if (eventType != EventTypeNames::scroll)
         return;
 
     Document* document = window->document();
     ASSERT(document);
-    didRemoveWheelEventHandler(*document);
+    didRemoveScrollEventHandler(*document);
 }
 
 } // namespace WebCore