Revert of Refactor ScrollableArea::setScrollPosition.

third_party/WebKit/Source/core/layout/LayoutBox.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc.
  *               All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 245 matching lines @@
       if (isOrthogonalWritingModeRoot())
         markOrthogonalWritingModeRoot();
       else
         unmarkOrthogonalWritingModeRoot();
     }
 
     clearPercentHeightDescendants();
   }
 
   // If our zoom factor changes and we have a defined scrollLeft/Top, we need to
-  // adjust that value into the new zoomed coordinate space.  Note that the new
-  // scroll position may be outside the normal min/max range of the scrollable
-  // area, which is weird but OK, because the scrollable area will update its
-  // min/max in updateAfterLayout().
+  // adjust that value into the new zoomed coordinate space.
   if (hasOverflowClip() && oldStyle &&
       oldStyle->effectiveZoom() != newStyle.effectiveZoom()) {
     PaintLayerScrollableArea* scrollableArea = this->getScrollableArea();
     ASSERT(scrollableArea);
-    // We use scrollPosition() rather than adjustedScrollPosition(), because
-    // scrollPosition is the distance from the beginning of flow for the box,
-    // which is the dimension we want to preserve.
-    DoublePoint oldPosition = scrollableArea->scrollPositionDouble();
-    if (oldPosition.x() || oldPosition.y()) {
-      DoublePoint newPosition = oldPosition.scaledBy(newStyle.effectiveZoom() /
-                                                     oldStyle->effectiveZoom());
-      scrollableArea->setScrollPositionUnconditionally(newPosition);
+    if (int left = scrollableArea->scrollXOffset()) {
+      left = (left / oldStyle->effectiveZoom()) * newStyle.effectiveZoom();
+      scrollableArea->scrollToXOffset(left);
+    }
+    if (int top = scrollableArea->scrollYOffset()) {
+      top = (top / oldStyle->effectiveZoom()) * newStyle.effectiveZoom();
+      scrollableArea->scrollToYOffset(top);
     }
   }
 
   // Our opaqueness might have changed without triggering layout.
   if (diff.needsPaintInvalidation()) {
     LayoutObject* parentToInvalidate = parent();
     for (unsigned i = 0;
          i < backgroundObscurationTestMaxDepth && parentToInvalidate; ++i) {
       parentToInvalidate->invalidateBackgroundObscurationStatus();
       parentToInvalidate = parentToInvalidate->parent();
@@ skipping 227 matching lines @@
 
 LayoutUnit LayoutBox::scrollHeight() const {
   if (hasOverflowClip())
     return getScrollableArea()->scrollHeight();
   // For objects with visible overflow, this matches IE.
   // FIXME: Need to work right with writing modes.
   return std::max(clientHeight(), layoutOverflowRect().maxY() - borderTop());
 }
 
 LayoutUnit LayoutBox::scrollLeft() const {
-  return hasOverflowClip()
-             ? LayoutUnit(getScrollableArea()->adjustedScrollOffset().width())
-             : LayoutUnit();
+  return hasOverflowClip() ? LayoutUnit(getScrollableArea()->scrollXOffset())
+                           : LayoutUnit();
 }
 
 LayoutUnit LayoutBox::scrollTop() const {
-  return hasOverflowClip()
-             ? LayoutUnit(getScrollableArea()->adjustedScrollOffset().height())
-             : LayoutUnit();
+  return hasOverflowClip() ? LayoutUnit(getScrollableArea()->scrollYOffset())
+                           : LayoutUnit();
 }
 
 int LayoutBox::pixelSnappedScrollWidth() const {
   return snapSizeToPixel(scrollWidth(), location().x() + clientLeft());
 }
 
 int LayoutBox::pixelSnappedScrollHeight() const {
   if (hasOverflowClip())
     return snapSizeToPixel(getScrollableArea()->scrollHeight(),
                            location().y() + clientTop());
   // For objects with visible overflow, this matches IE.
   // FIXME: Need to work right with writing modes.
   return snapSizeToPixel(scrollHeight(), location().y() + clientTop());
 }
 
 void LayoutBox::setScrollLeft(LayoutUnit newLeft) {
   // This doesn't hit in any tests, but since the equivalent code in
   // setScrollTop does, presumably this code does as well.
   DisableCompositingQueryAsserts disabler;
 
-  if (hasOverflowClip()) {
-    PaintLayerScrollableArea* scrollableArea = getScrollableArea();
-    scrollableArea->scrollToOffset(
-        DoubleSize(newLeft, scrollableArea->adjustedScrollOffset().height()),
-        ScrollBehaviorAuto);
-  }
+  if (hasOverflowClip())
+    getScrollableArea()->scrollToXOffset(newLeft, ScrollOffsetClamped,
+                                         ScrollBehaviorAuto);
 }
 
 void LayoutBox::setScrollTop(LayoutUnit newTop) {
   // Hits in
   // compositing/overflow/do-not-assert-on-invisible-composited-layers.html
   DisableCompositingQueryAsserts disabler;
 
-  if (hasOverflowClip()) {
-    PaintLayerScrollableArea* scrollableArea = getScrollableArea();
-    scrollableArea->scrollToOffset(
-        DoubleSize(scrollableArea->adjustedScrollOffset().width(), newTop),
-        ScrollBehaviorAuto);
-  }
+  if (hasOverflowClip())
+    getScrollableArea()->scrollToYOffset(newTop, ScrollOffsetClamped,
+                                         ScrollBehaviorAuto);
 }
 
 void LayoutBox::scrollToOffset(const DoubleSize& offset,
                                ScrollBehavior scrollBehavior) {
   // This doesn't hit in any tests, but since the equivalent code in
   // setScrollTop does, presumably this code does as well.
   DisableCompositingQueryAsserts disabler;
 
   if (hasOverflowClip())
-    getScrollableArea()->scrollToOffset(offset, scrollBehavior);
+    getScrollableArea()->scrollToOffset(offset, ScrollOffsetClamped,
+                                        scrollBehavior);
 }
 
 // Returns true iff we are attempting an autoscroll inside an iframe with
 // scrolling="no".
 static bool isDisallowedAutoscroll(HTMLFrameOwnerElement* ownerElement,
                                    FrameView* frameView) {
   if (ownerElement && isHTMLFrameElementBase(*ownerElement)) {
     HTMLFrameElementBase* frameElementBase =
         toHTMLFrameElementBase(ownerElement);
     if (Page* page = frameView->frame().page()) {
@@ skipping 500 matching lines @@
 
   // at the center we let the space for the icon.
   if (abs(delta.width()) <= AutoscrollController::noMiddleClickAutoscrollRadius)
     delta.setWidth(0);
   if (abs(delta.height()) <=
       AutoscrollController::noMiddleClickAutoscrollRadius)
     delta.setHeight(0);
   scroll(ScrollByPixel, FloatSize(adjustedScrollDelta(delta)));
 }
 
-void LayoutBox::scrollByRecursively(const DoubleSize& delta) {
+void LayoutBox::scrollByRecursively(const DoubleSize& delta,
+                                    ScrollOffsetClamping clamp) {
   if (delta.isZero())
     return;
 
   bool restrictedByLineClamp = false;
   if (parent())
     restrictedByLineClamp = !parent()->style()->lineClamp().isNone();
 
   if (hasOverflowClip() && !restrictedByLineClamp) {
     PaintLayerScrollableArea* scrollableArea = this->getScrollableArea();
     ASSERT(scrollableArea);
 
     DoubleSize newScrollOffset = scrollableArea->adjustedScrollOffset() + delta;
-    scrollableArea->scrollToOffset(newScrollOffset);
+    scrollableArea->scrollToOffset(newScrollOffset, clamp);
 
     // If this layer can't do the scroll we ask the next layer up that can
     // scroll to try.
     DoubleSize remainingScrollOffset =
         newScrollOffset - scrollableArea->adjustedScrollOffset();
     if (!remainingScrollOffset.isZero() && parent()) {
       if (LayoutBox* scrollableBox = enclosingScrollableBox())
-        scrollableBox->scrollByRecursively(remainingScrollOffset);
+        scrollableBox->scrollByRecursively(remainingScrollOffset, clamp);
 
       LocalFrame* frame = this->frame();
       if (frame && frame->page())
         frame->page()->autoscrollController().updateAutoscrollLayoutObject();
     }
   } else if (view()->frameView()) {
     // If we are here, we were called on a layoutObject that can be
     // programmatically scrolled, but doesn't have an overflow clip. Which means
     // that it is a document node that can be scrolled.
     // FIXME: Pass in DoubleSize. crbug.com/414283.
@@ skipping 4493 matching lines @@
   LayoutRect rect = frameRect();
 
   LayoutBlock* block = containingBlock();
   if (block)
     block->adjustChildDebugRect(rect);
 
   return rect;
 }
 
 }  // namespace blink