Moved FrameHost::m_visualViewport to Page

third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

 /*
  * Copyright (C) 2009, 2010, 2011 Apple 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:
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 1572 matching lines @@
 
   updateBottomLayer(m_childTransformLayer.get());
   updateBottomLayer(m_childContainmentLayer.get());
   updateBottomLayer(m_scrollingLayer.get());
 
   // Now constructing the subtree for the overflow controls.
   bottomLayer = m_graphicsLayer.get();
   // TODO(pdr): Ensure painting uses the correct GraphicsLayer when root layer
   // scrolls is enabled.  crbug.com/638719
   if (m_isMainFrameLayoutViewLayer &&
-      !RuntimeEnabledFeatures::slimmingPaintV2Enabled())
-    bottomLayer = layoutObject()
-                      .frame()
-                      ->page()
-                      ->frameHost()
-                      .visualViewport()
-                      .containerLayer();
+      !RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+    bottomLayer =
+        layoutObject().frame()->page()->visualViewport().containerLayer();
+  }
   updateBottomLayer(m_overflowControlsAncestorClippingLayer.get());
   updateBottomLayer(m_overflowControlsHostLayer.get());
   if (m_layerForHorizontalScrollbar)
     m_overflowControlsHostLayer->addChild(m_layerForHorizontalScrollbar.get());
   if (m_layerForVerticalScrollbar)
     m_overflowControlsHostLayer->addChild(m_layerForVerticalScrollbar.get());
   if (m_layerForScrollCorner)
     m_overflowControlsHostLayer->addChild(m_layerForScrollCorner.get());
 
   // Now add the DecorationOutlineLayer as a subtree to GraphicsLayer
@@ skipping 1902 matching lines @@
   } else if (graphicsLayer == m_decorationOutlineLayer.get()) {
     name = "Decoration Layer";
   } else {
     ASSERT_NOT_REACHED();
   }
 
   return name;
 }
 
 }  // namespace blink