Update Element methods for root layer scrolling.

Source/core/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 635 matching lines @@
 
 int Element::clientWidth()
 {
     document().updateLayoutIgnorePendingStylesheets();
 
     // When in strict mode, clientWidth for the document element should return the width of the containing frame.
     // When in quirks mode, clientWidth for the body element should return the width of the containing frame.
     bool inQuirksMode = document().inQuirksMode();
     if ((!inQuirksMode && document().documentElement() == this)
         || (inQuirksMode && isHTMLElement() && document().body() == this)) {
-        if (FrameView* view = document().view()) {
-            if (LayoutView* layoutView = document().layoutView()) {
-                if (document().page()->settings().forceZeroLayoutHeight())
-                    return adjustLayoutUnitForAbsoluteZoom(view->visibleContentSize().width(), *layoutView);
-                return adjustLayoutUnitForAbsoluteZoom(view->layoutSize().width(), *layoutView);
-            }
+        if (LayoutView* layoutView = document().layoutView()) {
+            if (document().page()->settings().forceZeroLayoutHeight())
+                return adjustLayoutUnitForAbsoluteZoom(layoutView->overflowClipRect(LayoutPoint()).width(), *layoutView);
+            return adjustLayoutUnitForAbsoluteZoom(layoutView->layoutSize().width(), *layoutView);
         }
     }
 
     if (LayoutBox* layoutObject = layoutBox())
         return adjustLayoutUnitForAbsoluteZoom(layoutObject->pixelSnappedClientWidth(), *layoutObject).round();
     return 0;
 }
 
 int Element::clientHeight()
 {
     document().updateLayoutIgnorePendingStylesheets();
 
     // When in strict mode, clientHeight for the document element should return the height of the containing frame.
     // When in quirks mode, clientHeight for the body element should return the height of the containing frame.
     bool inQuirksMode = document().inQuirksMode();
 
     if ((!inQuirksMode && document().documentElement() == this)
         || (inQuirksMode && isHTMLElement() && document().body() == this)) {
-        if (FrameView* view = document().view()) {
-            if (LayoutView* layoutView = document().layoutView()) {
-                if (document().page()->settings().forceZeroLayoutHeight())
-                    return adjustLayoutUnitForAbsoluteZoom(view->visibleContentSize().height(), *layoutView);
-                return adjustLayoutUnitForAbsoluteZoom(view->layoutSize().height(), *layoutView);
-            }
+        if (LayoutView* layoutView = document().layoutView()) {
+            if (document().page()->settings().forceZeroLayoutHeight())
+                return adjustLayoutUnitForAbsoluteZoom(layoutView->overflowClipRect(LayoutPoint()).height(), *layoutView);
+            return adjustLayoutUnitForAbsoluteZoom(layoutView->layoutSize().height(), *layoutView);
         }
     }
 
     if (LayoutBox* layoutObject = layoutBox())
         return adjustLayoutUnitForAbsoluteZoom(layoutObject->pixelSnappedClientHeight(), *layoutObject).round();
     return 0;
 }
 
 double Element::scrollLeft()
 {
@@ skipping 168 matching lines @@
 void Element::scrollFrameBy(const ScrollToOptions& scrollToOptions)
 {
     double left = scrollToOptions.hasLeft() ? ScrollableArea::normalizeNonFiniteScroll(scrollToOptions.left()) : 0.0;
     double top = scrollToOptions.hasTop() ? ScrollableArea::normalizeNonFiniteScroll(scrollToOptions.top()) : 0.0;
 
     ScrollBehavior scrollBehavior = ScrollBehaviorAuto;
     ScrollableArea::scrollBehaviorFromString(scrollToOptions.behavior(), scrollBehavior);
     LocalFrame* frame = document().frame();
     if (!frame)
         return;
-    FrameView* view = frame->view();
-    if (!view)
+    ScrollableArea* layoutViewport = frame->view() ? frame->view()->layoutViewportScrollableArea() : 0;
+    if (!layoutViewport)
         return;
 
-    double newScaledLeft = left * frame->pageZoomFactor() + view->scrollPositionDouble().x();
-    double newScaledTop = top * frame->pageZoomFactor() + view->scrollPositionDouble().y();
-    view->setScrollPosition(DoublePoint(newScaledLeft, newScaledTop), ProgrammaticScroll, scrollBehavior);
+    double newScaledLeft = left * frame->pageZoomFactor() + layoutViewport->scrollPositionDouble().x();
+    double newScaledTop = top * frame->pageZoomFactor() + layoutViewport->scrollPositionDouble().y();
+    layoutViewport->setScrollPosition(DoublePoint(newScaledLeft, newScaledTop), ProgrammaticScroll, scrollBehavior);
 }
 
 void Element::scrollFrameTo(const ScrollToOptions& scrollToOptions)
 {
     ScrollBehavior scrollBehavior = ScrollBehaviorAuto;
     ScrollableArea::scrollBehaviorFromString(scrollToOptions.behavior(), scrollBehavior);
     LocalFrame* frame = document().frame();
     if (!frame)
         return;
-    FrameView* view = frame->view();
-    if (!view)
+    ScrollableArea* layoutViewport = frame->view() ? frame->view()->layoutViewportScrollableArea() : 0;
+    if (!layoutViewport)
         return;
 
-    double scaledLeft = view->scrollPositionDouble().x();
-    double scaledTop = view->scrollPositionDouble().y();
+    double scaledLeft = layoutViewport->scrollPositionDouble().x();
+    double scaledTop = layoutViewport->scrollPositionDouble().y();
     if (scrollToOptions.hasLeft())
         scaledLeft = ScrollableArea::normalizeNonFiniteScroll(scrollToOptions.left()) * frame->pageZoomFactor();
     if (scrollToOptions.hasTop())
         scaledTop = ScrollableArea::normalizeNonFiniteScroll(scrollToOptions.top()) * frame->pageZoomFactor();
-    view->setScrollPosition(DoublePoint(scaledLeft, scaledTop), ProgrammaticScroll, scrollBehavior);
+    layoutViewport->setScrollPosition(DoublePoint(scaledLeft, scaledTop), ProgrammaticScroll, scrollBehavior);
 }
 
 void Element::incrementProxyCount()
 {
     if (ensureElementRareData().incrementProxyCount() == 1)
         setNeedsStyleRecalc(LocalStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::CompositorProxy));
 }
 
 void Element::decrementProxyCount()
 {
@@ skipping 2590 matching lines @@
 {
 #if ENABLE(OILPAN)
     if (hasRareData())
         visitor->trace(elementRareData());
     visitor->trace(m_elementData);
 #endif
     ContainerNode::trace(visitor);
 }
 
 } // namespace blink