Index: trunk/Source/core/rendering/RenderObject.cpp |
=================================================================== |
--- trunk/Source/core/rendering/RenderObject.cpp (revision 177995) |
+++ trunk/Source/core/rendering/RenderObject.cpp (working copy) |
@@ -38,7 +38,6 @@ |
#include "core/editing/htmlediting.h" |
#include "core/fetch/ResourceLoadPriorityOptimizer.h" |
#include "core/fetch/ResourceLoader.h" |
-#include "core/frame/EventHandlerRegistry.h" |
#include "core/frame/FrameView.h" |
#include "core/frame/LocalFrame.h" |
#include "core/html/HTMLAnchorElement.h" |
@@ -2169,11 +2168,10 @@ |
// handler will have already been added for its parent so ignore it. |
TouchAction oldTouchAction = m_style ? m_style->touchAction() : TouchActionAuto; |
if (node() && !node()->isTextNode() && (oldTouchAction == TouchActionAuto) != (newStyle.touchAction() == TouchActionAuto)) { |
- EventHandlerRegistry& registry = document().frameHost()->eventHandlerRegistry(); |
if (newStyle.touchAction() != TouchActionAuto) |
- registry.didAddEventHandler(*node(), EventHandlerRegistry::TouchEvent); |
+ document().didAddTouchEventHandler(node()); |
else |
- registry.didRemoveEventHandler(*node(), EventHandlerRegistry::TouchEvent); |
+ document().didRemoveTouchEventHandler(node()); |
} |
} |
@@ -2691,7 +2689,7 @@ |
// previously. Handlers are not added for text nodes so don't try removing |
// for one too. Need to check if m_style is null in cases of partial construction. |
if (!documentBeingDestroyed() && node() && !node()->isTextNode() && m_style && m_style->touchAction() != TouchActionAuto) |
- document().frameHost()->eventHandlerRegistry().didRemoveEventHandler(*node(), EventHandlerRegistry::TouchEvent); |
+ document().didRemoveTouchEventHandler(node()); |
setAncestorLineBoxDirty(false); |