Add page coordinates to the ViewportAPI

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 961 matching lines @@
         return 0;
 
     ChromeClient& chromeClient = host->chromeClient();
     if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
         return lroundf(chromeClient.windowRect().y() * chromeClient.screenInfo().deviceScaleFactor);
     return chromeClient.windowRect().y();
 }
 
 double LocalDOMWindow::scrollX() const
 {
-    if (!frame())
+    if (!frame() || !frame()->host())
         return 0;
 
+    if (!frame()->host()->settings().inertVisualViewport())
+        return m_visualViewport->pageX();
+
     FrameView* view = frame()->view();
     if (!view)
         return 0;
 
-    FrameHost* host = frame()->host();
-    if (!host)
-        return 0;
-
     frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
-    ScrollableArea* viewport = host->settings().inertVisualViewport() ? view->layoutViewportScrollableArea() : view->getScrollableArea();
-    double viewportX = viewport->scrollPositionDouble().x();
+    double viewportX = view->layoutViewportScrollableArea()->scrollPositionDouble().x();
     return adjustScrollForAbsoluteZoom(viewportX, frame()->pageZoomFactor());
 }
 
 double LocalDOMWindow::scrollY() const
 {
-    if (!frame())
+    if (!frame() || !frame()->host())
         return 0;
 
+    if (!frame()->host()->settings().inertVisualViewport())
+        return m_visualViewport->pageY();
+
     FrameView* view = frame()->view();
     if (!view)
         return 0;
 
-    FrameHost* host = frame()->host();
-    if (!host)
-        return 0;
-
     frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
-    ScrollableArea* viewport = host->settings().inertVisualViewport() ? view->layoutViewportScrollableArea() : view->getScrollableArea();
-    double viewportY = viewport->scrollPositionDouble().y();
+    double viewportY = view->layoutViewportScrollableArea()->scrollPositionDouble().y();
     return adjustScrollForAbsoluteZoom(viewportY, frame()->pageZoomFactor());
 }
 
 DOMVisualViewport* LocalDOMWindow::visualViewport()
 {
     if (!frame())
         return nullptr;
 
     return m_visualViewport;
 }
@@ skipping 516 matching lines @@
 {
     // If the LocalDOMWindow still has a frame reference, that frame must point
     // back to this LocalDOMWindow: otherwise, it's easy to get into a situation
     // where script execution leaks between different LocalDOMWindows.
     if (m_frameObserver->frame())
         ASSERT_WITH_SECURITY_IMPLICATION(m_frameObserver->frame()->domWindow() == this);
     return m_frameObserver->frame();
 }
 
 } // namespace blink