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

WebCore/rendering/RenderDataGrid.cpp

Index: WebCore/rendering/RenderDataGrid.cpp
===================================================================
--- WebCore/rendering/RenderDataGrid.cpp	(revision 67003)
+++ WebCore/rendering/RenderDataGrid.cpp	(working copy)
@@ -170,6 +170,17 @@
 }
 
 // Scrolling implementation functions
+int RenderDataGrid::scrollSize(ScrollbarOrientation orientation) const
+{
+    return ((orientation == VerticallScrollbar) && m_vBar) ? (m_vBar->totalSize() - m_vBar->visibleSize()) : 0;
+}
+
+void RenderDataGrid::setScrollOffsetFromAnimation(const IntPoint& offset)
+{
+    if (m_vBar)
+        m_vBar->setValue(offset.y(), Scrollbar::FromScrollAnimator);
+}
+
 void RenderDataGrid::valueChanged(Scrollbar*)
 {
     // FIXME: Implement.