Fix assertion hit on debug build for EventHandlerRegistry

third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/frame/EventHandlerRegistry.h"
 
 #include "core/events/EventListenerOptions.h"
 #include "core/events/EventUtil.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 16 matching lines @@
     return WebEventListenerProperties::Passive;
   return WebEventListenerProperties::Nothing;
 }
 
 }  // namespace
 
 EventHandlerRegistry::EventHandlerRegistry(FrameHost& frameHost)
     : m_frameHost(&frameHost) {}
 
 EventHandlerRegistry::~EventHandlerRegistry() {
-  checkConsistency();
+  for (size_t i = 0; i < EventHandlerClassCount; ++i) {
+    EventHandlerClass handlerClass = static_cast<EventHandlerClass>(i);
+    checkConsistency(handlerClass);
+  }
 }
 
 bool EventHandlerRegistry::eventTypeToClass(
     const AtomicString& eventType,
     const AddEventListenerOptions& options,
     EventHandlerClass* result) {
   if (eventType == EventTypeNames::scroll) {
     *result = ScrollEvent;
   } else if (eventType == EventTypeNames::wheel ||
              eventType == EventTypeNames::mousewheel) {
@@ skipping 18 matching lines @@
     *result = EventsForTesting;
 #endif
   } else {
     return false;
   }
   return true;
 }
 
 const EventTargetSet* EventHandlerRegistry::eventHandlerTargets(
     EventHandlerClass handlerClass) const {
-  checkConsistency();
+  checkConsistency(handlerClass);
   return &m_targets[handlerClass];
 }
 
 bool EventHandlerRegistry::hasEventHandlers(
     EventHandlerClass handlerClass) const {
-  checkConsistency();
+  checkConsistency(handlerClass);
   return m_targets[handlerClass].size();
 }
 
 bool EventHandlerRegistry::updateEventHandlerTargets(
     ChangeOperation op,
     EventHandlerClass handlerClass,
     EventTarget* target) {
   EventTargetSet* targets = &m_targets[handlerClass];
   if (op == Add) {
     if (!targets->add(target).isNewEntry) {
@@ skipping 208 matching lines @@
         // handlers here.
       } else {
         ASSERT_NOT_REACHED();
       }
     }
     for (size_t i = 0; i < targetsToRemove.size(); ++i)
       updateEventHandlerInternal(RemoveAll, handlerClass, targetsToRemove[i]);
   }
 }
 
-void EventHandlerRegistry::checkConsistency() const {
+void EventHandlerRegistry::checkConsistency(
+    EventHandlerClass handlerClass) const {
 #if DCHECK_IS_ON()
-  for (size_t i = 0; i < EventHandlerClassCount; ++i) {
-    EventHandlerClass handlerClass = static_cast<EventHandlerClass>(i);
-    const EventTargetSet* targets = &m_targets[handlerClass];
-    for (const auto& eventTarget : *targets) {
-      if (Node* node = eventTarget.key->toNode()) {
-        // See the comment for |documentDetached| if either of these assertions
-        // fails.
-        ASSERT(node->document().frameHost());
-        ASSERT(node->document().frameHost() == m_frameHost);
-      } else if (LocalDOMWindow* window = eventTarget.key->toLocalDOMWindow()) {
-        // If any of these assertions fail, LocalDOMWindow failed to unregister
-        // its handlers properly.
-        ASSERT(window->frame());
-        ASSERT(window->frame()->host());
-        ASSERT(window->frame()->host() == m_frameHost);
-      }
+  const EventTargetSet* targets = &m_targets[handlerClass];
+  for (const auto& eventTarget : *targets) {
+    if (Node* node = eventTarget.key->toNode()) {
+      // See the comment for |documentDetached| if either of these assertions
+      // fails.
+      DCHECK(node->document().frameHost());
+      DCHECK(node->document().frameHost() == m_frameHost);
+    } else if (LocalDOMWindow* window = eventTarget.key->toLocalDOMWindow()) {
+      // If any of these assertions fail, LocalDOMWindow failed to unregister
+      // its handlers properly.
+      DCHECK(window->frame());
+      DCHECK(window->frame()->host());
+      DCHECK(window->frame()->host() == m_frameHost);
     }
   }
 #endif  // DCHECK_IS_ON()
 }
 
 }  // namespace blink