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

Unified Diff: third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp

Issue 2640163004: Replace ENABLE(ASSERT) with DCHECK_IS_ON(). (Closed)
Patch Set: m_domTreeVersion initialization Created 3 years, 11 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: third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp
diff --git a/third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp b/third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp
index c02a63b4a28359edc2a26b5800de8834a265dc08..ce6dc461e0efd79036f6d654cfe7c9635aa48c41 100644
--- a/third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp
+++ b/third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp
@@ -59,7 +59,7 @@ bool EventHandlerRegistry::eventTypeToClass(
// the pointer events never block scrolling and the compositor
// only needs to know about the touch listeners.
*result = TouchStartOrMoveEventPassive;
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
} else if (eventType == EventTypeNames::load ||
eventType == EventTypeNames::mousemove ||
eventType == EventTypeNames::touchstart) {
@@ -224,7 +224,7 @@ void EventHandlerRegistry::notifyHasHandlersChanged(
hasEventHandlers(TouchEndOrCancelEventBlocking),
hasEventHandlers(TouchEndOrCancelEventPassive)));
break;
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
case EventsForTesting:
break;
#endif
@@ -297,7 +297,7 @@ void EventHandlerRegistry::documentDetached(Document& document) {
}
void EventHandlerRegistry::checkConsistency() const {
-#if ENABLE(ASSERT)
+#if DCHECK_IS_ON()
for (size_t i = 0; i < EventHandlerClassCount; ++i) {
EventHandlerClass handlerClass = static_cast<EventHandlerClass>(i);
const EventTargetSet* targets = &m_targets[handlerClass];
@@ -316,7 +316,7 @@ void EventHandlerRegistry::checkConsistency() const {
}
}
}
-#endif // ENABLE(ASSERT)
+#endif // DCHECK_IS_ON()
}
} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/core/frame/EventHandlerRegistry.h ('k') | third_party/WebKit/Source/core/frame/FrameHost.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698