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

WebCore/rendering/RenderDataGrid.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 152 matching lines @@
             paintColumnHeader(column, paintInfo, tx, ty);
     }
 }
 
 void RenderDataGrid::paintColumnHeader(DataGridColumn*, PaintInfo&, int, int)
 {
     // FIXME: Implement.
 }
 
 // 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.
 }
 
 void RenderDataGrid::invalidateScrollbarRect(Scrollbar*, const IntRect&)
 {
     // FIXME: Implement.
 }
 
@@ skipping 58 matching lines @@
 
     int scrollbarLeft = width() - borderRight() - scrollbar->width();
     int scrollbarTop = borderTop();
     point.move(-scrollbarLeft, -scrollbarTop);
     return point;
 }
 
 }
 
 #endif