Change LocalFrame to take a Page instead of a FrameHost

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 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 1512 matching lines @@
   webFrame->setParent(oldWebFrame->parent());
   webFrame->setOpener(oldWebFrame->opener());
   // Note: this *always* temporarily sets a frame owner, even for main frames!
   // When a core Frame is created with no owner, it attempts to set itself as
   // the main frame of the Page. However, this is a provisional frame, and may
   // disappear, so Page::m_mainFrame can't be updated just yet.
   FrameOwner* tempOwner = DummyFrameOwner::create();
   // TODO(dcheng): This block is very similar to initializeCoreFrame. Try to
   // reuse it here.
   LocalFrame* frame = LocalFrame::create(webFrame->m_localFrameClientImpl.get(),
-                                         oldFrame->host(), tempOwner,
+                                         oldFrame->page(), tempOwner,
                                          interfaceProvider, interfaceRegistry);
   // Set the name and unique name directly, bypassing any of the normal logic
   // to calculate unique name.
   frame->tree().setPrecalculatedName(
       toWebRemoteFrameImpl(oldWebFrame)->frame()->tree().name(),
       toWebRemoteFrameImpl(oldWebFrame)->frame()->tree().uniqueName());
   webFrame->setCoreFrame(frame);
 
   frame->setOwner(oldFrame->owner());
 
@@ skipping 59 matching lines @@
 }
 
 void WebLocalFrameImpl::setCoreFrame(LocalFrame* frame) {
   m_frame = frame;
 }
 
 void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host,
                                             FrameOwner* owner,
                                             const AtomicString& name,
                                             const AtomicString& uniqueName) {
-  setCoreFrame(LocalFrame::create(m_localFrameClientImpl.get(), host, owner,
+  setCoreFrame(LocalFrame::create(m_localFrameClientImpl.get(),
+                                  host ? &host->page() : nullptr, owner,
                                   m_interfaceProvider, m_interfaceRegistry));
   frame()->tree().setPrecalculatedName(name, uniqueName);
   // We must call init() after m_frame is assigned because it is referenced
   // during init(). Note that this may dispatch JS events; the frame may be
   // detached after init() returns.
   frame()->init();
   if (frame()) {
     if (frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() &&
         !parent() && !opener() &&
         frame()->settings()->getShouldReuseGlobalForUnownedMainFrame()) {
@@ skipping 884 matching lines @@
         createMarkup(startPosition, endPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   } else {
     clipHtml =
         createMarkup(endPosition, startPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   }
 }
 
 }  // namespace blink