Remove FrameHost::eventHandlerRegistry()

third_party/WebKit/Source/web/tests/WebViewTest.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 3293 matching lines @@
 
   // The page is initialized with at least one no-handlers call.
   // In practice we get two such calls because WebViewHelper::initializeAndLoad
   // first initializes an empty frame, and then loads a document into it, so
   // there are two FrameLoader::commitProvisionalLoad calls.
   EXPECT_LT(0, client.getAndResetHasTouchEventHandlerCallCount(false));
   EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
 
   // Adding the first document handler results in a has-handlers call.
   Document* document = webViewImpl->mainFrameImpl()->frame()->document();
-  EventHandlerRegistry* registry =
-      &document->frameHost()->eventHandlerRegistry();
+  EventHandlerRegistry* registry = &document->page()->eventHandlerRegistry();
   registry->didAddEventHandler(*document, touchEvent);
   EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(false));
   EXPECT_EQ(1, client.getAndResetHasTouchEventHandlerCallCount(true));
 
   // Adding another handler has no effect.
   registry->didAddEventHandler(*document, touchEvent);
   EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(false));
   EXPECT_EQ(0, client.getAndResetHasTouchEventHandlerCallCount(true));
 
   // Removing the duplicate handler has no effect.
@@ skipping 94 matching lines @@
 // handlers also removes them from the event handler registry. Note that this
 // is different from detaching and re-attaching the same node, which is covered
 // by layout tests under fast/events/.
 TEST_P(WebViewTest, DeleteElementWithRegisteredHandler) {
   std::string url = registerMockedHttpURLLoad("simple_div.html");
   WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(url, true);
 
   Persistent<Document> document =
       webViewImpl->mainFrameImpl()->frame()->document();
   Element* div = document->getElementById("div");
-  EventHandlerRegistry& registry =
-      document->frameHost()->eventHandlerRegistry();
+  EventHandlerRegistry& registry = document->page()->eventHandlerRegistry();
 
   registry.didAddEventHandler(*div, EventHandlerRegistry::ScrollEvent);
   EXPECT_TRUE(registry.hasEventHandlers(EventHandlerRegistry::ScrollEvent));
 
   DummyExceptionStateForTesting exceptionState;
   div->remove(exceptionState);
 
   // For oilpan we have to force a GC to ensure the event handlers have been
   // removed when checking below. We do a precise GC (collectAllGarbage does not
   // scan the stack) to ensure the div element dies. This is also why the
@@ skipping 891 matching lines @@
   EXPECT_FALSE(frameView->visualViewportSuppliesScrollbars());
   if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
     EXPECT_NE(nullptr,
               frameView->layoutViewportScrollableArea()->verticalScrollbar());
   } else {
     EXPECT_NE(nullptr, frameView->verticalScrollbar());
   }
 }
 
 }  // namespace blink