| Index: Source/web/WebPluginContainerImpl.cpp
|
| diff --git a/Source/web/WebPluginContainerImpl.cpp b/Source/web/WebPluginContainerImpl.cpp
|
| index f227705385a922aabfabcb7b8fbb89ed22cfa394..6b3d5096b486314a65bb213b0005bc2f8d6ce035 100644
|
| --- a/Source/web/WebPluginContainerImpl.cpp
|
| +++ b/Source/web/WebPluginContainerImpl.cpp
|
| @@ -49,6 +49,7 @@
|
| #include "bindings/v8/ScriptController.h"
|
| #include "core/clipboard/Clipboard.h"
|
| #include "core/clipboard/DataObject.h"
|
| +#include "core/dom/EventHandlerRegistry.h"
|
| #include "core/events/GestureEvent.h"
|
| #include "core/events/KeyboardEvent.h"
|
| #include "core/events/MouseEvent.h"
|
| @@ -516,9 +517,9 @@ void WebPluginContainerImpl::requestTouchEventType(TouchEventRequestType request
|
| return;
|
|
|
| if (requestType != TouchEventRequestTypeNone && m_touchEventRequestType == TouchEventRequestTypeNone)
|
| - m_element->document().didAddTouchEventHandler(m_element);
|
| + EventHandlerRegistry::from(m_element->document())->didAddEventHandler(*m_element, EventHandlerRegistry::TouchEvent);
|
| else if (requestType == TouchEventRequestTypeNone && m_touchEventRequestType != TouchEventRequestTypeNone)
|
| - m_element->document().didRemoveTouchEventHandler(m_element);
|
| + EventHandlerRegistry::from(m_element->document())->didRemoveEventHandler(*m_element, EventHandlerRegistry::TouchEvent);
|
| m_touchEventRequestType = requestType;
|
| }
|
|
|
| @@ -669,7 +670,7 @@ WebPluginContainerImpl::WebPluginContainerImpl(WebCore::HTMLPlugInElement* eleme
|
| WebPluginContainerImpl::~WebPluginContainerImpl()
|
| {
|
| if (m_touchEventRequestType != TouchEventRequestTypeNone)
|
| - m_element->document().didRemoveTouchEventHandler(m_element);
|
| + EventHandlerRegistry::from(m_element->document())->didRemoveEventHandler(*m_element, EventHandlerRegistry::TouchEvent);
|
|
|
| for (size_t i = 0; i < m_pluginLoadObservers.size(); ++i)
|
| m_pluginLoadObservers[i]->clearPluginContainer();
|
|
|