Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1222)

Unified Diff: Source/core/rendering/RenderObject.cpp

Issue 206603002: Add EventHandlerRegistry (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Tests now seem to pass. Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/RenderObject.cpp
diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp
index 3c67d938d7e0ea3c3051fbeddc0cb52c6dd3cdfe..8d26a11d783474272eaf06e483690ffeab540847 100644
--- a/Source/core/rendering/RenderObject.cpp
+++ b/Source/core/rendering/RenderObject.cpp
@@ -32,6 +32,7 @@
#include "core/accessibility/AXObjectCache.h"
#include "core/animation/ActiveAnimations.h"
#include "core/css/resolver/StyleResolver.h"
+#include "core/dom/EventHandlerRegistry.h"
#include "core/editing/EditingBoundary.h"
#include "core/editing/FrameSelection.h"
#include "core/editing/htmlediting.h"
@@ -2073,9 +2074,9 @@ void RenderObject::styleWillChange(StyleDifference diff, const RenderStyle* newS
TouchAction oldTouchAction = m_style ? m_style->touchAction() : TouchActionAuto;
if (node() && !node()->isTextNode() && (oldTouchAction == TouchActionAuto) != (newStyle->touchAction() == TouchActionAuto)) {
if (newStyle->touchAction() != TouchActionAuto)
- document().didAddTouchEventHandler(node());
+ EventHandlerRegistry::from(document())->didAddEventHandler(*node(), EventTypeNames::touchstart);
else
- document().didRemoveTouchEventHandler(node());
+ EventHandlerRegistry::from(document())->didRemoveEventHandler(*node(), EventTypeNames::touchstart);
}
}
@@ -2610,7 +2611,7 @@ void RenderObject::willBeDestroyed()
// 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().didRemoveTouchEventHandler(node());
+ EventHandlerRegistry::from(document())->didRemoveEventHandler(*node(), EventTypeNames::touchstart);
setAncestorLineBoxDirty(false);

Powered by Google App Engine
This is Rietveld 408576698