Moved FrameHost::m_visualViewport to Page

third_party/WebKit/Source/core/frame/LocalDOMWindow.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 940 matching lines @@
     return FloatSize();
 
   FrameView* view = frame()->view();
   if (!view)
     return FloatSize();
 
   Page* page = frame()->page();
   if (!page)
     return FloatSize();
 
-  // If we have a Page, we must have a FrameHost.
-  FrameHost* host = frame()->host();
-  DCHECK(host);
-
   // The main frame's viewport size depends on the page scale. Since the
   // initial page scale depends on the content width and is set after a
   // layout, perform one now so queries during page load will use the up to
   // date viewport.
   if (page->settings().getViewportEnabled() && frame()->isMainFrame())
     document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
   // FIXME: This is potentially too much work. We really only need to know the
   // dimensions of the parent frame's layoutObject.
   if (Frame* parent = frame()->tree().parent()) {
     if (parent && parent->isLocalFrame())
       toLocalFrame(parent)
           ->document()
           ->updateStyleAndLayoutIgnorePendingStylesheets();
   }
 
   return frame()->isMainFrame() && !page->settings().getInertVisualViewport()
-             ? FloatSize(host->visualViewport().visibleRect().size())
+             ? FloatSize(page->visualViewport().visibleRect().size())
              : FloatSize(view->visibleContentRect(scrollbarInclusion).size());
 }
 
 int LocalDOMWindow::innerHeight() const {
   if (!frame())
     return 0;
 
   FloatSize viewportSize = getViewportSize(IncludeScrollbars);
   return adjustForAbsoluteZoom(expandedIntSize(viewportSize).height(),
                                frame()->pageZoomFactor());
@@ skipping 663 matching lines @@
   DOMWindow::trace(visitor);
   Supplementable<LocalDOMWindow>::trace(visitor);
 }
 
 DEFINE_TRACE_WRAPPERS(LocalDOMWindow) {
   visitor->traceWrappers(m_customElements);
   DOMWindow::traceWrappers(visitor);
 }
 
 }  // namespace blink