Remove RenderLayerScrollableArea

sky/engine/core/rendering/RenderBox.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
  * modify it under the terms of the GNU Library General Public
@@ skipping 170 matching lines @@
     return snapSizeToPixel(offsetWidth(), x() + clientLeft());
 }
 
 int RenderBox::pixelSnappedOffsetHeight() const
 {
     return snapSizeToPixel(offsetHeight(), y() + clientTop());
 }
 
 LayoutUnit RenderBox::scrollWidth() const
 {
-    if (hasOverflowClip())
-        return layer()->scrollableArea()->scrollWidth();
+    // FIXME(sky): Remove.
     // For objects with visible overflow, this matches IE.
     // FIXME: Need to work right with writing modes.
     if (style()->isLeftToRightDirection())
         return std::max(clientWidth(), layoutOverflowRect().maxX() - borderLeft());
     return clientWidth() - std::min<LayoutUnit>(0, layoutOverflowRect().x() - borderLeft());
 }
 
 LayoutUnit RenderBox::scrollHeight() const
 {
-    if (hasOverflowClip())
-        return layer()->scrollableArea()->scrollHeight();
+    // FIXME(sky): Remove.
     // For objects with visible overflow, this matches IE.
     // FIXME: Need to work right with writing modes.
     return std::max(clientHeight(), layoutOverflowRect().maxY() - borderTop());
 }
 
 LayoutUnit RenderBox::scrollLeft() const
 {
-    return hasOverflowClip() ? layer()->scrollableArea()->scrollXOffset() : 0;
+    // FIXME(sky): Remove.
+    return 0;
 }
 
 LayoutUnit RenderBox::scrollTop() const
 {
-    return hasOverflowClip() ? layer()->scrollableArea()->scrollYOffset() : 0;
+    // FIXME(sky): Remove.
+    return 0;
 }
 
 int RenderBox::pixelSnappedScrollWidth() const
 {
+    // FIXME(sky): Remove.
     return snapSizeToPixel(scrollWidth(), x() + clientLeft());
 }
 
 int RenderBox::pixelSnappedScrollHeight() const
 {
-    if (hasOverflowClip())
-        return layer()->scrollableArea()->scrollHeight();
+    // FIXME(sky): Remove.
     // For objects with visible overflow, this matches IE.
     // FIXME: Need to work right with writing modes.
     return snapSizeToPixel(scrollHeight(), y() + clientTop());
 }
 
 void RenderBox::setScrollLeft(LayoutUnit newLeft)
 {
-    if (hasOverflowClip())
-        layer()->scrollableArea()->scrollToXOffset(newLeft, ScrollOffsetClamped);
+    // FIXME(sky): Remove.
 }
 
 void RenderBox::setScrollTop(LayoutUnit newTop)
 {
-    if (hasOverflowClip())
-        layer()->scrollableArea()->scrollToYOffset(newTop, ScrollOffsetClamped);
+    // FIXME(sky): Remove.
 }
 
 void RenderBox::scrollToOffset(const IntSize& offset)
 {
-    ASSERT(hasOverflowClip());
-    layer()->scrollableArea()->scrollToOffset(offset, ScrollOffsetClamped);
+    // FIXME(sky): Remove.
 }
 
 void RenderBox::scrollRectToVisible(const LayoutRect& rect, const ScrollAlignment& alignX, const ScrollAlignment& alignY)
 {
-    RenderBox* parentBox = 0;
-    LayoutRect newRect = rect;
-
-    if (parent()) {
-        parentBox = parent()->enclosingBox();
-    }
-
-    if (hasOverflowClip()) {
-        // Don't scroll to reveal an overflow layer that is restricted by the -webkit-line-clamp property.
-        // This will prevent us from revealing text hidden by the slider in Safari RSS.
-        newRect = layer()->scrollableArea()->exposeRect(rect, alignX, alignY);
-    }
-
-    if (frame()->page()->autoscrollController().autoscrollInProgress())
-        parentBox = enclosingScrollableBox();
-
-    if (parentBox)
-        parentBox->scrollRectToVisible(newRect, alignX, alignY);
+    // FIXME(sky): Remove.
 }
 
 void RenderBox::absoluteQuads(Vector<FloatQuad>& quads) const
 {
     quads.append(localToAbsoluteQuad(FloatRect(0, 0, width().toFloat(), height().toFloat()), 0 /* mode */));
 }
 
 void RenderBox::updateLayerTransformAfterLayout()
 {
     // Transform-origin depends on box size, so we need to update the layer transform after layout.
@@ skipping 47 matching lines @@
 }
 
 void RenderBox::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject*) const
 {
     if (!size().isEmpty())
         rects.append(pixelSnappedIntRect(additionalOffset, size()));
 }
 
 bool RenderBox::scroll(ScrollDirection direction, ScrollGranularity granularity, float delta)
 {
-    if (!layer() || !layer()->scrollableArea())
-        return false;
-    return layer()->scrollableArea()->scroll(direction, granularity, delta);
-}
-
-bool RenderBox::canBeScrolledAndHasScrollableArea() const
-{
-    return canBeProgramaticallyScrolled() && (pixelSnappedScrollHeight() != pixelSnappedClientHeight() || pixelSnappedScrollWidth() != pixelSnappedClientWidth());
+    // FIXME(sky): Remove.
+    return false;
 }
 
 bool RenderBox::canBeProgramaticallyScrolled() const
 {
     Node* node = this->node();
     if (node && node->isDocumentNode())
         return true;
 
     if (!hasOverflowClip())
         return false;
@@ skipping 20 matching lines @@
 }
 
 bool RenderBox::autoscrollInProgress() const
 {
     return frame() && frame()->page() && frame()->page()->autoscrollController().autoscrollInProgress(this);
 }
 
 // FIXME(sky): Replace with canBeScrolledAndHasScrollableArea.
 bool RenderBox::canAutoscroll() const
 {
-    return canBeScrolledAndHasScrollableArea();
+    // FIXME(sky): Remove.
+    return false;
 }
 
 // If specified point is in border belt, returned offset denotes direction of
 // scrolling.
 IntSize RenderBox::calculateAutoscrollDirection(const IntPoint& windowPoint) const
 {
     if (!frame())
         return IntSize();
 
     FrameView* frameView = frame()->view();
@@ skipping 22 matching lines @@
 {
     while (renderer && !(renderer->isBox() && toRenderBox(renderer)->canAutoscroll())) {
         renderer = renderer->parent();
     }
 
     return renderer && renderer->isBox() ? toRenderBox(renderer) : 0;
 }
 
 void RenderBox::scrollByRecursively(const IntSize& delta, ScrollOffsetClamping clamp)
 {
-    if (delta.isZero())
-        return;
-
-    if (hasOverflowClip()) {
-        IntSize newScrollOffset = layer()->scrollableArea()->adjustedScrollOffset() + delta;
-        layer()->scrollableArea()->scrollToOffset(newScrollOffset, clamp);
-
-        // If this layer can't do the scroll we ask the next layer up that can scroll to try
-        IntSize remainingScrollOffset = newScrollOffset - layer()->scrollableArea()->adjustedScrollOffset();
-        if (!remainingScrollOffset.isZero() && parent()) {
-            if (RenderBox* scrollableBox = enclosingScrollableBox())
-                scrollableBox->scrollByRecursively(remainingScrollOffset, clamp);
-
-            LocalFrame* frame = this->frame();
-            if (frame && frame->page())
-                frame->page()->autoscrollController().updateAutoscrollRenderer();
-        }
-    }
+    // FIXME(sky): Remove.
 }
 
 bool RenderBox::needsPreferredWidthsRecalculation() const
 {
     return style()->paddingStart().isPercent() || style()->paddingEnd().isPercent();
 }
 
 IntSize RenderBox::scrolledContentOffset() const
 {
-    ASSERT(hasOverflowClip());
-    ASSERT(hasLayer());
-    return layer()->scrollableArea()->scrollOffset();
+    // FIXME(sky): Remove.
+    return IntSize();
 }
 
 void RenderBox::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const
 {
     minLogicalWidth = minPreferredLogicalWidth() - borderAndPaddingLogicalWidth();
     maxLogicalWidth = maxPreferredLogicalWidth() - borderAndPaddingLogicalWidth();
 }
 
 LayoutUnit RenderBox::minPreferredLogicalWidth() const
 {
@@ skipping 2469 matching lines @@
 
 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style)
 {
     backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor);
     hasBackground = backgroundColor.alpha() || style.hasBackgroundImage();
     ASSERT(hasBackground == style.hasBackground());
     hasBorder = style.hasBorder();
 }
 
 } // namespace blink