Change WebFrameImplBase::initializeCoreFrame to take a Page&

third_party/WebKit/Source/web/WebFrame.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 "public/web/WebFrame.h"
 
 #include "bindings/core/v8/WindowProxyManager.h"
 #include "core/HTMLNames.h"
-#include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/RemoteFrame.h"
 #include "core/html/HTMLFrameElementBase.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/page/Page.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/heap/Handle.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
 #include "public/web/WebElement.h"
@@ skipping 41 matching lines @@
     m_nextSibling->m_previousSibling = frame;
     swap(m_nextSibling, frame->m_nextSibling);
   }
 
   if (m_opener) {
     frame->setOpener(m_opener);
     setOpener(nullptr);
   }
   m_openedFrameTracker->transferTo(frame);
 
-  FrameHost* host = oldFrame->host();
+  Page* page = oldFrame->page();
   AtomicString name = oldFrame->tree().name();
   FrameOwner* owner = oldFrame->owner();
 
   v8::HandleScope handleScope(v8::Isolate::GetCurrent());
   WindowProxyManager::GlobalsVector globals;
   oldFrame->getWindowProxyManager()->clearForNavigation();
   oldFrame->getWindowProxyManager()->releaseGlobals(globals);
 
   // Although the Document in this frame is now unloaded, many resources
   // associated with the frame itself have not yet been freed yet.
@@ skipping 16 matching lines @@
       if (owner->isLocal())
         toHTMLFrameOwnerElement(owner)->setWidget(localFrame.view());
     } else {
       localFrame.page()->setMainFrame(&localFrame);
       // This trace event is needed to detect the main frame of the
       // renderer in telemetry metrics. See crbug.com/692112#c11.
       TRACE_EVENT_INSTANT1("loading", "markAsMainFrame",
                            TRACE_EVENT_SCOPE_THREAD, "frame", &localFrame);
     }
   } else {
-    toWebRemoteFrameImpl(frame)->initializeCoreFrame(host, owner, name);
+    toWebRemoteFrameImpl(frame)->initializeCoreFrame(*page, owner, name);
   }
 
   if (m_parent && oldFrame->hasReceivedUserGesture())
     frame->toImplBase()->frame()->setDocumentHasReceivedUserGesture();
 
   frame->toImplBase()->frame()->getWindowProxyManager()->setGlobals(globals);
 
   m_parent = nullptr;
 
   return true;
@@ skipping 191 matching lines @@
   for (WebFrame* child = frame->firstChild(); child;
        child = child->nextSibling())
     traceFrame(visitor, child);
 }
 
 void WebFrame::close() {
   m_openedFrameTracker->dispose();
 }
 
 }  // namespace blink