Make EventHandlerRegistry store Page instead of FrameHost

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

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 a9b0fc809c6a4b989e9661dced56700c7d653db5..c70fe99546dca3fd0398a6e1c1bdee157d3b31a6 100644
--- a/third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp
+++ b/third_party/WebKit/Source/core/frame/EventHandlerRegistry.cpp
@@ -10,7 +10,6 @@
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/page/ChromeClient.h"
-#include "core/page/Page.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 
 namespace blink {
@@ -30,8 +29,7 @@ WebEventListenerProperties webEventListenerProperties(bool hasBlocking,
 
 }  // namespace
 
-EventHandlerRegistry::EventHandlerRegistry(FrameHost& frameHost)
-    : m_frameHost(&frameHost) {}
+EventHandlerRegistry::EventHandlerRegistry(Page& page) : m_page(&page) {}
 
 EventHandlerRegistry::~EventHandlerRegistry() {
   for (size_t i = 0; i < EventHandlerClassCount; ++i) {
@@ -175,7 +173,7 @@ void EventHandlerRegistry::didRemoveEventHandler(
   updateEventHandlerInternal(Remove, handlerClass, &target);
 }
 
-void EventHandlerRegistry::didMoveIntoFrameHost(EventTarget& target) {
+void EventHandlerRegistry::didMoveIntoPage(EventTarget& target) {
   if (!target.hasEventListeners())
     return;
 
@@ -196,7 +194,7 @@ void EventHandlerRegistry::didMoveIntoFrameHost(EventTarget& target) {
   }
 }
 
-void EventHandlerRegistry::didMoveOutOfFrameHost(EventTarget& target) {
+void EventHandlerRegistry::didMoveOutOfPage(EventTarget& target) {
   didRemoveAllEventHandlers(target);
 }
 
@@ -213,19 +211,19 @@ void EventHandlerRegistry::notifyHasHandlersChanged(
     bool hasActiveHandlers) {
   switch (handlerClass) {
     case ScrollEvent:
-      m_frameHost->page().chromeClient().setHasScrollEventHandlers(
-          frame, hasActiveHandlers);
+      m_page->chromeClient().setHasScrollEventHandlers(frame,
+                                                       hasActiveHandlers);
       break;
     case WheelEventBlocking:
     case WheelEventPassive:
-      m_frameHost->page().chromeClient().setEventListenerProperties(
+      m_page->chromeClient().setEventListenerProperties(
           frame, WebEventListenerClass::MouseWheel,
           webEventListenerProperties(hasEventHandlers(WheelEventBlocking),
                                      hasEventHandlers(WheelEventPassive)));
       break;
     case TouchStartOrMoveEventBlocking:
     case TouchStartOrMoveEventPassive:
-      m_frameHost->page().chromeClient().setEventListenerProperties(
+      m_page->chromeClient().setEventListenerProperties(
           frame, WebEventListenerClass::TouchStartOrMove,
           webEventListenerProperties(
               hasEventHandlers(TouchStartOrMoveEventBlocking),
@@ -233,7 +231,7 @@ void EventHandlerRegistry::notifyHasHandlersChanged(
       break;
     case TouchEndOrCancelEventBlocking:
     case TouchEndOrCancelEventPassive:
-      m_frameHost->page().chromeClient().setEventListenerProperties(
+      m_page->chromeClient().setEventListenerProperties(
           frame, WebEventListenerClass::TouchEndOrCancel,
           webEventListenerProperties(
               hasEventHandlers(TouchEndOrCancelEventBlocking),
@@ -251,14 +249,13 @@ void EventHandlerRegistry::notifyHasHandlersChanged(
 
 void EventHandlerRegistry::notifyDidAddOrRemoveEventHandlerTarget(
     EventHandlerClass handlerClass) {
-  ScrollingCoordinator* scrollingCoordinator =
-      m_frameHost->page().scrollingCoordinator();
+  ScrollingCoordinator* scrollingCoordinator = m_page->scrollingCoordinator();
   if (scrollingCoordinator && handlerClass == TouchStartOrMoveEventBlocking)
     scrollingCoordinator->touchEventTargetRectsDidChange();
 }
 
 DEFINE_TRACE(EventHandlerRegistry) {
-  visitor->trace(m_frameHost);
+  visitor->trace(m_page);
   visitor->template registerWeakMembers<
       EventHandlerRegistry, &EventHandlerRegistry::clearWeakMembers>(this);
 }
@@ -319,14 +316,14 @@ void EventHandlerRegistry::checkConsistency(
     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);
+      DCHECK(node->document().page());
+      DCHECK(node->document().page() == m_page);
     } 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);
+      DCHECK(window->frame()->page());
+      DCHECK(window->frame()->page() == m_page);
     }
   }
 #endif  // DCHECK_IS_ON()