Change WebFrameImplBase::initializeCoreFrame to take a Page&

third_party/WebKit/Source/web/WebRemoteFrameImpl.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 "web/WebRemoteFrameImpl.h"
 
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/WindowProxy.h"
 #include "core/dom/Fullscreen.h"
 #include "core/dom/RemoteSecurityContext.h"
 #include "core/dom/SecurityContext.h"
-#include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/Settings.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/layout/LayoutObject.h"
 #include "core/page/Page.h"
 #include "platform/feature_policy/FeaturePolicy.h"
 #include "platform/heap/Handle.h"
 #include "public/platform/WebFeaturePolicy.h"
 #include "public/platform/WebFloatRect.h"
@@ skipping 307 matching lines @@
   WebLocalFrameImpl* child = WebLocalFrameImpl::create(
       scope, client, interfaceProvider, interfaceRegistry, opener);
   insertAfter(child, previousSibling);
   RemoteFrameOwner* owner = RemoteFrameOwner::create(
       static_cast<SandboxFlags>(sandboxFlags), frameOwnerProperties);
   // FIXME: currently this calls LocalFrame::init() on the created LocalFrame,
   // which may result in the browser observing two navigations to about:blank
   // (one from the initial frame creation, and one from swapping it into the
   // remote process).  FrameLoader might need a special initialization function
   // for this case to avoid that duplicate navigation.
-  child->initializeCoreFrame(frame()->host(), owner, name);
+  child->initializeCoreFrame(*frame()->page(), owner, name);
   // Partially related with the above FIXME--the init() call may trigger JS
   // dispatch. However,
   // if the parent is remote, it should never be detached synchronously...
   DCHECK(child->frame());
   return child;
 }
 
-void WebRemoteFrameImpl::initializeCoreFrame(FrameHost* host,
+void WebRemoteFrameImpl::initializeCoreFrame(Page& page,
                                              FrameOwner* owner,
                                              const AtomicString& name) {
-  setCoreFrame(RemoteFrame::create(m_frameClient.get(),
-                                   host ? &host->page() : nullptr, owner));
+  setCoreFrame(RemoteFrame::create(m_frameClient.get(), &page, owner));
   frame()->createView();
   m_frame->tree().setName(name);
 }
 
 WebRemoteFrame* WebRemoteFrameImpl::createRemoteChild(
     WebTreeScopeType scope,
     const WebString& name,
     WebSandboxFlags sandboxFlags,
     WebRemoteFrameClient* client,
     WebFrame* opener) {
   WebRemoteFrameImpl* child = WebRemoteFrameImpl::create(scope, client, opener);
   appendChild(child);
   RemoteFrameOwner* owner = RemoteFrameOwner::create(
       static_cast<SandboxFlags>(sandboxFlags), WebFrameOwnerProperties());
-  child->initializeCoreFrame(frame()->host(), owner, name);
+  child->initializeCoreFrame(*frame()->page(), owner, name);
   return child;
 }
 
 void WebRemoteFrameImpl::setWebLayer(WebLayer* layer) {
   if (!frame())
     return;
 
   frame()->setWebLayer(layer);
 }
 
@@ skipping 151 matching lines @@
 }
 
 WebRemoteFrameImpl::WebRemoteFrameImpl(WebTreeScopeType scope,
                                        WebRemoteFrameClient* client)
     : WebRemoteFrame(scope),
       m_frameClient(RemoteFrameClientImpl::create(this)),
       m_client(client),
       m_selfKeepAlive(this) {}
 
 }  // namespace blink