Removed FrameHost::chromeClient()

third_party/WebKit/Source/core/page/CreateWindow.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 10 matching lines @@
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/page/CreateWindow.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/FrameClient.h"
-#include "core/frame/FrameHost.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "core/page/WindowFeatures.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "platform/weborigin/SecurityPolicy.h"
 #include "public/platform/WebURLRequest.h"
 
 namespace blink {
 
 static Frame* reuseExistingWindow(LocalFrame& activeFrame,
                                   LocalFrame& lookupFrame,
                                   const AtomicString& frameName,
                                   NavigationPolicy policy) {
   if (!frameName.isEmpty() && frameName != "_blank" &&
       policy == NavigationPolicyIgnore) {
     if (Frame* frame =
             lookupFrame.findFrameForNavigation(frameName, activeFrame)) {
       if (frameName != "_self") {
-        if (FrameHost* host = frame->host()) {
-          if (host == activeFrame.host())
-            frame->page()->focusController().setFocusedFrame(frame);
+        if (Page* page = frame->page()) {
+          if (page == activeFrame.page())
+            page->focusController().setFocusedFrame(frame);
           else
-            host->chromeClient().focus();
+            page->chromeClient().focus();
         }
       }
       return frame;
     }
   }
   return nullptr;
 }
 
 static Frame* createNewWindow(LocalFrame& openerFrame,
                               const FrameLoadRequest& request,
                               const WindowFeatures& features,
                               NavigationPolicy policy,
                               bool& created) {
-  FrameHost* oldHost = openerFrame.host();
-  if (!oldHost)
+  Page* oldPage = openerFrame.page();
+  if (!oldPage)
     return nullptr;
 
-  Page* page = oldHost->chromeClient().createWindow(&openerFrame, request,
+  Page* page = oldPage->chromeClient().createWindow(&openerFrame, request,
                                                     features, policy);
   if (!page)
     return nullptr;
-  FrameHost* host = &page->frameHost();
 
   ASSERT(page->mainFrame());
   LocalFrame& frame = *toLocalFrame(page->mainFrame());
 
   if (request.frameName() != "_blank")
     frame.tree().setName(request.frameName());
 
-  host->chromeClient().setWindowFeatures(features);
+  page->chromeClient().setWindowFeatures(features);
 
   // 'x' and 'y' specify the location of the window, while 'width' and 'height'
   // specify the size of the viewport. We can only resize the window, so adjust
   // for the difference between the window size and the viewport size.
 
-  IntRect windowRect = host->chromeClient().rootWindowRect();
-  IntSize viewportSize = host->chromeClient().pageRect().size();
+  IntRect windowRect = page->chromeClient().rootWindowRect();
+  IntSize viewportSize = page->chromeClient().pageRect().size();
 
   if (features.xSet)
     windowRect.setX(features.x);
   if (features.ySet)
     windowRect.setY(features.y);
   if (features.widthSet)
     windowRect.setWidth(features.width +
                         (windowRect.width() - viewportSize.width()));
   if (features.heightSet)
     windowRect.setHeight(features.height +
                          (windowRect.height() - viewportSize.height()));
 
-  host->chromeClient().setWindowRectWithAdjustment(windowRect, frame);
-  host->chromeClient().show(policy);
+  page->chromeClient().setWindowRectWithAdjustment(windowRect, frame);
+  page->chromeClient().show(policy);
 
   if (openerFrame.document()->isSandboxed(
           SandboxPropagatesToAuxiliaryBrowsingContexts))
     frame.loader().forceSandboxFlags(
         openerFrame.securityContext()->getSandboxFlags());
 
   // This call may suspend the execution by running nested message loop.
   InspectorInstrumentation::windowCreated(&openerFrame, &frame);
   created = true;
   return &frame;
@@ skipping 164 matching lines @@
   }
 
   // TODO(japhet): Form submissions on RemoteFrames don't work yet.
   FrameLoadRequest newRequest(0, request.resourceRequest());
   newRequest.setForm(request.form());
   if (newFrame->isLocalFrame())
     toLocalFrame(newFrame)->loader().load(newRequest);
 }
 
 }  // namespace blink