Merge 67001 - 2010-09-08 Peter Kasting <pkasting@google.com>...

WebCore/rendering/RenderLayer.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 1345 matching lines @@
             quadForFakeMouseMoveEvent = repaintContainer->localToAbsoluteQuad(quadForFakeMouseMoveEvent);
         frame->eventHandler()->dispatchFakeMouseMoveEventSoonInQuad(quadForFakeMouseMoveEvent);
     }
 
     // Just schedule a full repaint of our object.
     if (view && repaint)
         renderer()->repaintUsingContainer(repaintContainer, rectForRepaint);
 
     if (updateScrollbars) {
         if (m_hBar)
-            m_hBar->setValue(scrollXOffset());
+            m_hBar->setValue(scrollXOffset(), Scrollbar::NotFromScrollAnimator);
         if (m_vBar)
-            m_vBar->setValue(m_scrollY);
+            m_vBar->setValue(m_scrollY, Scrollbar::NotFromScrollAnimator);
     }
 
     // Schedule the scroll DOM event.
     if (view) {
         if (FrameView* frameView = view->frameView())
             frameView->scheduleEvent(Event::create(eventNames().scrollEvent, false, false), renderer()->node());
     }
 }
 
 void RenderLayer::scrollRectToVisible(const IntRect& rect, bool scrollToAnchor, const ScrollAlignment& alignX, const ScrollAlignment& alignY)
@@ skipping 232 matching lines @@
         int baseHeight = renderer->height() - (isBoxSizingBorder ? 0 : renderer->borderAndPaddingHeight());
         baseHeight = baseHeight / zoomFactor;
         style->setProperty(CSSPropertyHeight, String::number(baseHeight + difference.height()) + "px", false, ec);
     }
 
     document->updateLayout();
 
     // FIXME (Radar 4118564): We should also autoscroll the window as necessary to keep the point under the cursor in view.
 }
 
+int RenderLayer::scrollSize(ScrollbarOrientation orientation) const
+{
+    Scrollbar* scrollbar = ((orientation == HorizontalScrollbar) ? m_hBar : m_vBar).get();
+    return scrollbar ? (scrollbar->totalSize() - scrollbar->visibleSize()) : 0;
+}
+
+void RenderLayer::setScrollOffsetFromAnimation(const IntPoint& offset)
+{
+    if (m_hBar)
+        m_hBar->setValue(offset.x(), Scrollbar::FromScrollAnimator);
+    if (m_vBar)
+        m_vBar->setValue(offset.y(), Scrollbar::FromScrollAnimator);
+}
+
 void RenderLayer::valueChanged(Scrollbar*)
 {
     // Update scroll position from scrollbars.
 
     bool needUpdate = false;
     int newX = scrollXOffset();
     int newY = m_scrollY;
     
     if (m_hBar) {
         newX = m_hBar->value();
@@ skipping 430 matching lines @@
         m_hBar->setSteps(Scrollbar::pixelsPerLineStep(), pageStep);
         m_hBar->setProportion(clientWidth, m_scrollWidth);
         // Explicitly set the horizontal scroll value.  This ensures that when a
         // right-to-left scrollable area's width (or content width) changes, the
         // top right corner of the content doesn't shift with respect to the top
         // right corner of the area. Conceptually, right-to-left areas have
         // their origin at the top-right, but RenderLayer is top-left oriented,
         // so this is needed to keep everything working (see how scrollXOffset()
         // differs from scrollYOffset() to get an idea of why the horizontal and
         // vertical scrollbars need to be treated differently).
-        m_hBar->setValue(scrollXOffset());
+        m_hBar->setValue(scrollXOffset(), Scrollbar::NotFromScrollAnimator);
     }
     if (m_vBar) {
         int clientHeight = box->clientHeight();
         int pageStep = max(max<int>(clientHeight * Scrollbar::minFractionToStepWhenPaging(), clientHeight - Scrollbar::maxOverlapBetweenPages()), 1);
         m_vBar->setSteps(Scrollbar::pixelsPerLineStep(), pageStep);
         m_vBar->setProportion(clientHeight, m_scrollHeight);
     }
  
     if (renderer()->node() && renderer()->document()->hasListenerType(Document::OVERFLOWCHANGED_LISTENER))
         updateOverflowStatus(horizontalOverflow, verticalOverflow);
@@ skipping 1785 matching lines @@
 {
     if (!layer)
         return;
 
     if (WebCore::Frame* frame = layer->renderer()->frame()) {
         WTF::String output = externalRepresentation(frame, WebCore::RenderAsTextShowAllLayers | WebCore::RenderAsTextShowLayerNesting | WebCore::RenderAsTextShowCompositedLayers | WebCore::RenderAsTextShowAddresses | WebCore::RenderAsTextShowIDAndClass);
         fprintf(stderr, "%s\n", output.utf8().data());
     }
 }
 #endif