Migrate touch events to EventHandlerRegistry

Source/web/WebPluginContainerImpl.cpp

 /*
  * Copyright (C) 2009 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
@@ skipping 35 matching lines @@
 
 #include "HTMLNames.h"
 #include "bindings/v8/ScriptController.h"
 #include "core/clipboard/Clipboard.h"
 #include "core/clipboard/DataObject.h"
 #include "core/events/GestureEvent.h"
 #include "core/events/KeyboardEvent.h"
 #include "core/events/MouseEvent.h"
 #include "core/events/TouchEvent.h"
 #include "core/events/WheelEvent.h"
+#include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLFormElement.h"
 #include "core/html/HTMLPlugInElement.h"
 #include "core/loader/FormState.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "core/plugins/PluginOcclusionSupport.h"
@@ skipping 437 matching lines @@
     if (nodes.size() != 1)
         return false;
     return nodes.first().get() == m_element;
 }
 
 void WebPluginContainerImpl::requestTouchEventType(TouchEventRequestType requestType)
 {
     if (m_touchEventRequestType == requestType)
         return;
 
-    if (requestType != TouchEventRequestTypeNone && m_touchEventRequestType == TouchEventRequestTypeNone)
-        m_element->document().didAddTouchEventHandler(m_element);
-    else if (requestType == TouchEventRequestTypeNone && m_touchEventRequestType != TouchEventRequestTypeNone)
-        m_element->document().didRemoveTouchEventHandler(m_element);
+    if (m_element->document().frameHost()) {
+        EventHandlerRegistry* registry = &m_element->document().frameHost()->eventHandlerRegistry();

[Rick Byers, 2014/06/19 17:10:36]

nit again: ref instead of pointer?

[Sami, 2014/06/27 17:58:51]

Done.

+        if (requestType != TouchEventRequestTypeNone && m_touchEventRequestType == TouchEventRequestTypeNone)
+            registry->didAddEventHandler(*m_element, EventHandlerRegistry::TouchEvent);
+        else if (requestType == TouchEventRequestTypeNone && m_touchEventRequestType != TouchEventRequestTypeNone)
+            registry->didRemoveEventHandler(*m_element, EventHandlerRegistry::TouchEvent);
+    }
     m_touchEventRequestType = requestType;
 }
 
 void WebPluginContainerImpl::setWantsWheelEvents(bool wantsWheelEvents)
 {
     if (m_wantsWheelEvents == wantsWheelEvents)
         return;
     m_wantsWheelEvents = wantsWheelEvents;
     if (Page* page = m_element->document().page()) {
         if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator()) {
@@ skipping 129 matching lines @@
     : m_element(element)
     , m_webPlugin(webPlugin)
     , m_webLayer(0)
     , m_touchEventRequestType(TouchEventRequestTypeNone)
     , m_wantsWheelEvents(false)
 {
 }
 
 WebPluginContainerImpl::~WebPluginContainerImpl()
 {
-    if (m_touchEventRequestType != TouchEventRequestTypeNone)
-        m_element->document().didRemoveTouchEventHandler(m_element);
+    if (m_touchEventRequestType != TouchEventRequestTypeNone && m_element->document().frameHost())
+        m_element->document().frameHost()->eventHandlerRegistry().didRemoveEventHandler(*m_element, EventHandlerRegistry::TouchEvent);
 
     for (size_t i = 0; i < m_pluginLoadObservers.size(); ++i)
         m_pluginLoadObservers[i]->clearPluginContainer();
     m_webPlugin->destroy();
     if (m_webLayer)
         GraphicsLayer::unregisterContentsLayer(m_webLayer);
 }
 
 void WebPluginContainerImpl::handleMouseEvent(MouseEvent* event)
 {
@@ skipping 233 matching lines @@
 
     return clipRect;
 }
 
 bool WebPluginContainerImpl::pluginShouldPersist() const
 {
     return m_webPlugin->shouldPersist();
 }
 
 } // namespace blink