Reland of Make EventHandlerRegistry store Page instead of FrameHost

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

 // 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.
 
 #ifndef EventHandlerRegistry_h
 #define EventHandlerRegistry_h
 
 #include "core/CoreExport.h"
-#include "core/frame/FrameHost.h"
+#include "core/frame/FrameHost.h"  // TODO(sashab): Remove this.
+#include "core/page/Page.h"
 #include "wtf/HashCountedSet.h"
 
 namespace blink {
 
 class AddEventListenerOptions;
 class Document;
 class EventTarget;
 class LocalFrame;
 
 typedef HashCountedSet<UntracedMember<EventTarget>> EventTargetSet;
 
 // Registry for keeping track of event handlers. Note that only handlers on
 // documents that can be rendered or can receive input (i.e., are attached to a
-// FrameHost) are registered here.
+// Page) are registered here.
 class CORE_EXPORT EventHandlerRegistry final
     : public GarbageCollectedFinalized<EventHandlerRegistry> {
  public:
-  explicit EventHandlerRegistry(FrameHost&);
+  explicit EventHandlerRegistry(Page&);
   virtual ~EventHandlerRegistry();
 
   // Supported event handler classes. Note that each one may correspond to
   // multiple event types.
   enum EventHandlerClass {
     ScrollEvent,
     WheelEventBlocking,
     WheelEventPassive,
     TouchStartOrMoveEventBlocking,
     TouchStartOrMoveEventPassive,
     TouchEndOrCancelEventBlocking,
     TouchEndOrCancelEventPassive,
 #if DCHECK_IS_ON()
     // Additional event categories for verifying handler tracking logic.
     EventsForTesting,
 #endif
     EventHandlerClassCount,  // Must be the last entry.
   };
 
-  // Returns true if the FrameHost has event handlers of the specified class.
+  // Returns true if the Page has event handlers of the specified class.
   bool hasEventHandlers(EventHandlerClass) const;
 
   // Returns a set of EventTargets which have registered handlers of the given
   // class.
   const EventTargetSet* eventHandlerTargets(EventHandlerClass) const;
 
   // Registration and management of event handlers attached to EventTargets.
   void didAddEventHandler(EventTarget&,
                           const AtomicString& eventType,
                           const AddEventListenerOptions&);
   void didAddEventHandler(EventTarget&, EventHandlerClass);
   void didRemoveEventHandler(EventTarget&,
                              const AtomicString& eventType,
                              const AddEventListenerOptions&);
   void didRemoveEventHandler(EventTarget&, EventHandlerClass);
   void didRemoveAllEventHandlers(EventTarget&);
 
-  void didMoveIntoFrameHost(EventTarget&);
-  void didMoveOutOfFrameHost(EventTarget&);
+  void didMoveIntoPage(EventTarget&);
+  void didMoveOutOfPage(EventTarget&);
 
-  // Either |documentDetached| or |didMove{Into,OutOf,Between}FrameHosts| must
-  // be called whenever the FrameHost that is associated with a registered event
+  // Either |documentDetached| or |didMove{Into,OutOf,Between}Pages| must
+  // be called whenever the Page that is associated with a registered event
   // target changes. This ensures the registry does not end up with stale
   // references to handlers that are no longer related to it.
   void documentDetached(Document&);
 
   DECLARE_TRACE();
   void clearWeakMembers(Visitor*);
 
  private:
   enum ChangeOperation {
     Add,       // Add a new event handler.
@@ skipping 33 matching lines @@
                                 EventTarget*);
 
   void updateEventHandlerInternal(ChangeOperation,
                                   EventHandlerClass,
                                   EventTarget*);
 
   void updateAllEventHandlers(ChangeOperation, EventTarget&);
 
   void checkConsistency(EventHandlerClass) const;
 
-  Member<FrameHost> m_frameHost;
+  Member<Page> m_page;
   EventTargetSet m_targets[EventHandlerClassCount];
 };
 
 }  // namespace blink
 
 #endif  // EventHandlerRegistry_h