Simplify by using the same code for didMoveIntoFrameHost and MoveBetween.

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 173 matching lines @@
 }
 
 void EventHandlerRegistry::didMoveOutOfFrameHost(EventTarget& target) {
   didRemoveAllEventHandlers(target);
 }
 
 void EventHandlerRegistry::didMoveBetweenFrameHosts(EventTarget& target,
                                                     FrameHost* oldFrameHost,
                                                     FrameHost* newFrameHost) {
   ASSERT(newFrameHost != oldFrameHost);
-  for (size_t i = 0; i < EventHandlerClassCount; ++i) {
-    EventHandlerClass handlerClass = static_cast<EventHandlerClass>(i);
-    const EventTargetSet* targets =
-        &oldFrameHost->eventHandlerRegistry().m_targets[handlerClass];
-    for (unsigned count = targets->count(&target); count > 0; --count)
-      newFrameHost->eventHandlerRegistry().didAddEventHandler(target,
-                                                              handlerClass);
-  }
-  oldFrameHost->eventHandlerRegistry().didRemoveAllEventHandlers(target);
+  oldFrameHost->eventHandlerRegistry().didMoveOutOfFrameHost(target);
+  newFrameHost->eventHandlerRegistry().didMoveIntoFrameHost(target);
 }
 
 void EventHandlerRegistry::didRemoveAllEventHandlers(EventTarget& target) {
   for (size_t i = 0; i < EventHandlerClassCount; ++i) {
     EventHandlerClass handlerClass = static_cast<EventHandlerClass>(i);
     updateEventHandlerInternal(RemoveAll, handlerClass, &target);
   }
 }
 
 void EventHandlerRegistry::notifyHasHandlersChanged(
@@ skipping 115 matching lines @@
         ASSERT(window->frame());
         ASSERT(window->frame()->host());
         ASSERT(window->frame()->host() == m_frameHost);
       }
     }
   }
 #endif  // ENABLE(ASSERT)
 }
 
 }  // namespace blink