Remove more scrolling code from Sky

sky/engine/core/rendering/RenderObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 24 matching lines @@
 #include "sky/engine/core/dom/shadow/ShadowRoot.h"
 #include "sky/engine/core/editing/EditingBoundary.h"
 #include "sky/engine/core/editing/FrameSelection.h"
 #include "sky/engine/core/editing/htmlediting.h"
 #include "sky/engine/core/fetch/ResourceLoader.h"
 #include "sky/engine/core/frame/FrameView.h"
 #include "sky/engine/core/frame/LocalFrame.h"
 #include "sky/engine/core/frame/Settings.h"
 #include "sky/engine/core/html/HTMLAnchorElement.h"
 #include "sky/engine/core/html/HTMLElement.h"
-#include "sky/engine/core/page/AutoscrollController.h"
 #include "sky/engine/core/page/EventHandler.h"
 #include "sky/engine/core/page/Page.h"
 #include "sky/engine/core/rendering/HitTestResult.h"
 #include "sky/engine/core/rendering/RenderFlexibleBox.h"
 #include "sky/engine/core/rendering/RenderGeometryMap.h"
 #include "sky/engine/core/rendering/RenderImage.h"
 #include "sky/engine/core/rendering/RenderImageResourceStyleImage.h"
 #include "sky/engine/core/rendering/RenderInline.h"
 #include "sky/engine/core/rendering/RenderLayer.h"
 #include "sky/engine/core/rendering/RenderObjectInlines.h"
@@ skipping 349 matching lines @@
     for (const RenderObject* current = this; current; current = current->parent()) {
         if (current->hasLayer())
             return toRenderLayerModelObject(current)->layer();
     }
     // FIXME: We should remove the one caller that triggers this case and make
     // this function return a reference.
     ASSERT(!m_parent && !isRenderView());
     return 0;
 }
 
-bool RenderObject::scrollRectToVisible(const LayoutRect& rect, const ScrollAlignment& alignX, const ScrollAlignment& alignY)
-{
-    RenderBox* enclosingBox = this->enclosingBox();
-    if (!enclosingBox)
-        return false;
-
-    enclosingBox->scrollRectToVisible(rect, alignX, alignY);
-    return true;
-}
-
 RenderBox* RenderObject::enclosingBox() const
 {
     RenderObject* curr = const_cast<RenderObject*>(this);
     while (curr) {
         if (curr->isBox())
             return toRenderBox(curr);
         curr = curr->parent();
     }
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 RenderBoxModelObject* RenderObject::enclosingBoxModelObject() const
 {
     RenderObject* curr = const_cast<RenderObject*>(this);
     while (curr) {
         if (curr->isBoxModelObject())
             return toRenderBoxModelObject(curr);
         curr = curr->parent();
     }
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 
-RenderBox* RenderObject::enclosingScrollableBox() const
-{
-    // FIXME(sky): Remove.
-    return 0;
-}
-
 bool RenderObject::skipInvalidationWhenLaidOutChildren() const
 {
     if (!neededLayoutBecauseOfChildren())
         return false;
 
     // SVG renderers need to be invalidated when their children are laid out.
     // RenderBlocks with line boxes are responsible to invalidate them so we can't ignore them.
     if (isRenderBlockFlow() && toRenderBlockFlow(this)->firstLineBox())
         return false;
 
@@ skipping 945 matching lines @@
 void RenderObject::mapLocalToContainer(const RenderLayerModelObject* paintInvalidationContainer, TransformState& transformState, MapCoordinatesFlags mode) const
 {
     if (paintInvalidationContainer == this)
         return;
 
     RenderObject* o = parent();
     if (!o)
         return;
 
     // FIXME: this should call offsetFromContainer to share code, but I'm not sure it's ever called.
-    if (mode & ApplyContainerFlip && o->isBox()) {
+    if (mode & ApplyContainerFlip && o->isBox())
         mode &= ~ApplyContainerFlip;
-    }
-
-    if (o->hasOverflowClip())
-        transformState.move(-toRenderBox(o)->scrolledContentOffset());
 
     o->mapLocalToContainer(paintInvalidationContainer, transformState, mode);
 }
 
 const RenderObject* RenderObject::pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap& geometryMap) const
 {
     ASSERT_UNUSED(ancestorToStopAt, ancestorToStopAt != this);
 
     RenderObject* container = parent();
     if (!container)
         return 0;
-
-    // FIXME: this should call offsetFromContainer to share code, but I'm not sure it's ever called.
-    LayoutSize offset;
-    if (container->hasOverflowClip())
-        offset = -toRenderBox(container)->scrolledContentOffset();
-
-    geometryMap.push(this, offset, false);
-
+    // FIXME(sky): Do we need to make this call?
+    geometryMap.push(this, LayoutSize(), false);
     return container;
 }
 
 void RenderObject::mapAbsoluteToLocalPoint(MapCoordinatesFlags mode, TransformState& transformState) const
 {
     RenderObject* o = parent();
-    if (o) {
+    if (o)
         o->mapAbsoluteToLocalPoint(mode, transformState);
-        if (o->hasOverflowClip())
-            transformState.move(toRenderBox(o)->scrolledContentOffset());
-    }
 }
 
 bool RenderObject::shouldUseTransformFromContainer(const RenderObject* containerObject) const
 {
     // hasTransform() indicates whether the object has transform, transform-style or perspective. We just care about transform,
     // so check the layer's transform directly.
     return (hasLayer() && toRenderLayerModelObject(this)->layer()->transform()) || (containerObject && containerObject->style()->hasPerspective());
 }
 
 void RenderObject::getTransformFromContainer(const RenderObject* containerObject, const LayoutSize& offsetInContainer, TransformationMatrix& transform) const
@@ skipping 34 matching lines @@
     TransformState transformState(TransformState::ApplyTransformDirection, localPoint);
     mapLocalToContainer(paintInvalidationContainer, transformState, mode | ApplyContainerFlip | UseTransforms);
     transformState.flatten();
 
     return transformState.lastPlanarPoint();
 }
 
 LayoutSize RenderObject::offsetFromContainer(const RenderObject* o, const LayoutPoint& point, bool* offsetDependsOnPoint) const
 {
     ASSERT(o == container());
-
     LayoutSize offset;
-
-    if (o->hasOverflowClip())
-        offset -= toRenderBox(o)->scrolledContentOffset();
-
     if (offsetDependsOnPoint)
         *offsetDependsOnPoint = false;
-
     return offset;
 }
 
 LayoutSize RenderObject::offsetFromAncestorContainer(const RenderObject* container) const
 {
     LayoutSize offset;
     LayoutPoint referencePoint;
     const RenderObject* currContainer = this;
     do {
         const RenderObject* nextContainer = currContainer->container();
@@ skipping 103 matching lines @@
     }
 }
 
 void RenderObject::willBeDestroyed()
 {
     // Destroy any leftover anonymous children.
     RenderObjectChildList* children = virtualChildren();
     if (children)
         children->destroyLeftoverChildren();
 
-    // If this renderer is being autoscrolled, stop the autoscrolling.
-    if (LocalFrame* frame = this->frame()) {
-        if (frame->page())
-            frame->page()->autoscrollController().stopAutoscrollIfNeeded(this);
-    }
-
     remove();
-
     setAncestorLineBoxDirty(false);
-
     clearLayoutRootIfNeeded();
 }
 
 void RenderObject::insertedIntoTree()
 {
     // FIXME: We should ASSERT(isRooted()) here but generated content makes some out-of-order insertion.
 
     // Keep our layer hierarchy updated. Optimize for the common case where we don't have any children
     // and don't have a layer attached to ourselves.
     RenderLayer* layer = 0;
@@ skipping 388 matching lines @@
 {
     if (object1) {
         const blink::RenderObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
     }
 }
 
 #endif