Remove more scrolling code from Sky

sky/engine/core/rendering/RenderBlock.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. 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
  * License as published by the Free Software Foundation; either
@@ skipping 542 matching lines @@
     DragCaretController& dragCaretController = frame()->page()->dragCaretController();
     if (hasDragCaret(dragCaretController, this)) {
         dragCaretController.paintDragCaret(frame(), paintInfo.context, paintOffset, paintInfo.rect);
     }
 }
 
 void RenderBlock::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     PaintPhase paintPhase = paintInfo.phase;
 
-    LayoutPoint scrolledOffset = paintOffset;
-    if (hasOverflowClip())
-        scrolledOffset.move(-scrolledContentOffset());
-
     if (paintPhase == PaintPhaseForeground) {
         if (hasBoxDecorationBackground())
             paintBoxDecorationBackground(paintInfo, paintOffset);
     }
 
     if (paintPhase == PaintPhaseMask) {
         paintMask(paintInfo, paintOffset);
         return;
     }
 
     if (paintPhase != PaintPhaseSelfOutline)
-        paintContents(paintInfo, scrolledOffset);
+        paintContents(paintInfo, paintOffset);
 
-    paintSelection(paintInfo, scrolledOffset); // Fill in gaps in selection on lines and between blocks.
+    paintSelection(paintInfo, paintOffset); // Fill in gaps in selection on lines and between blocks.
 
     if ((paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseSelfOutline)
         && style()->hasOutline() && !style()->outlineStyleIsAuto()) {
         paintOutline(paintInfo, LayoutRect(paintOffset, size()));
     }
 
     // If the caret's node's render object's containing block is this block, and the paint action is PaintPhaseForeground,
     // then paint the caret.
     if (paintPhase == PaintPhaseForeground)
         paintCarets(paintInfo, paintOffset);
@@ skipping 533 matching lines @@
     bool useOverflowClip = hasOverflowClip() && !hasSelfPaintingLayer();
     bool checkChildren = !useOverflowClip;
     if (!checkChildren) {
         LayoutRect clipRect = overflowClipRect(adjustedLocation);
         if (style()->hasBorderRadius())
             checkChildren = locationInContainer.intersects(style()->getRoundedBorderFor(clipRect));
         else
             checkChildren = locationInContainer.intersects(clipRect);
     }
     if (checkChildren) {
-        // Hit test descendants first.
-        LayoutSize scrolledOffset(localOffset);
-        if (hasOverflowClip())
-            scrolledOffset -= scrolledContentOffset();
-
-        if (hitTestContents(request, result, locationInContainer, toLayoutPoint(scrolledOffset), hitTestAction)) {
+        if (hitTestContents(request, result, locationInContainer, toLayoutPoint(localOffset), hitTestAction)) {
             updateHitTestResult(result, locationInContainer.point() - localOffset);
             return true;
         }
     }
 
     // Check if the point is outside radii.
     if (style()->hasBorderRadius()) {
         LayoutRect borderRect = borderBoxRect();
         borderRect.moveBy(adjustedLocation);
         RoundedRect border = style()->getRoundedBorderFor(borderRect);
@@ skipping 174 matching lines @@
             return createPositionWithAffinity(caretMinOffset(), DOWNSTREAM);
         if (pointLogicalLeft >= logicalWidth())
             return createPositionWithAffinity(caretMaxOffset(), DOWNSTREAM);
         if (pointLogicalTop < 0)
             return createPositionWithAffinity(caretMinOffset(), DOWNSTREAM);
         if (pointLogicalTop >= logicalHeight())
             return createPositionWithAffinity(caretMaxOffset(), DOWNSTREAM);
     }
 
     LayoutPoint pointInContents = point;
-    offsetForContents(pointInContents);
     LayoutPoint pointInLogicalContents(pointInContents);
 
     if (isRenderParagraph())
         return positionForPointWithInlineChildren(pointInLogicalContents);
 
     RenderBox* lastCandidateBox = lastChildBox();
     while (lastCandidateBox && !isChildHitTestCandidate(lastCandidateBox))
         lastCandidateBox = lastCandidateBox->previousSiblingBox();
 
     if (lastCandidateBox) {
         if (pointInLogicalContents.y() > logicalTopForChild(lastCandidateBox)
             || (pointInLogicalContents.y() == logicalTopForChild(lastCandidateBox)))
             return positionForPointRespectingEditingBoundaries(this, lastCandidateBox, pointInContents);
 
         for (RenderBox* childBox = firstChildBox(); childBox; childBox = childBox->nextSiblingBox()) {
             if (!isChildHitTestCandidate(childBox))
                 continue;
             LayoutUnit childLogicalBottom = logicalTopForChild(childBox) + logicalHeightForChild(childBox);
             // We hit child if our click is above the bottom of its padding box (like IE6/7 and FF3).
             if (isChildHitTestCandidate(childBox) && (pointInLogicalContents.y() < childLogicalBottom))
                 return positionForPointRespectingEditingBoundaries(this, childBox, pointInContents);
         }
     }
 
     // We only get here if there are no hit test candidate children below the click.
     return RenderBox::positionForPoint(point);
 }
 
-void RenderBlock::offsetForContents(LayoutPoint& offset) const
-{
-    if (hasOverflowClip())
-        offset += scrolledContentOffset();
-}
-
 LayoutUnit RenderBlock::availableLogicalWidth() const
 {
     return RenderBox::availableLogicalWidth();
 }
 
 void RenderBlock::computePreferredLogicalWidths()
 {
     ASSERT(preferredLogicalWidthsDirty());
 
     m_minPreferredLogicalWidth = 0;
@@ skipping 468 matching lines @@
 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* markedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const RenderObject* obj) const
 {
     showRenderObject();
     for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRootBox())
         root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLabel2, obj, 1);
 }
 
 #endif
 
 } // namespace blink