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

WebCore/rendering/RenderListBox.cpp

Index: WebCore/rendering/RenderListBox.cpp
===================================================================
--- WebCore/rendering/RenderListBox.cpp	(revision 67003)
+++ WebCore/rendering/RenderListBox.cpp	(working copy)
@@ -500,7 +500,7 @@
 
     m_indexOffset = newOffset;
     if (m_vBar)
-        m_vBar->setValue(m_indexOffset);
+        m_vBar->setValue(m_indexOffset, Scrollbar::NotFromScrollAnimator);
 
     return true;
 }
@@ -523,6 +523,17 @@
     element->dispatchFormControlChangeEvent();
 }
 
+int RenderListBox::scrollSize(ScrollbarOrientation orientation) const
+{
+    return ((orientation == VerticalScrollbar) && m_vBar) ? (m_vBar->totalSize() - m_vBar->visibleSize()) : 0;
+}
+
+void RenderListBox::setScrollOffsetFromAnimation(const IntPoint& offset)
+{
+    if (m_vBar)
+        m_vBar->setValue(offset.y(), Scrollbar::FromScrollAnimator);
+}
+
 void RenderListBox::valueChanged(Scrollbar*)
 {
     int newOffset = m_vBar->value();
@@ -578,7 +589,7 @@
         return;
     m_indexOffset = index;
     if (m_vBar)
-        m_vBar->setValue(index);
+        m_vBar->setValue(index, Scrollbar::NotFromScrollAnimator);
 }
 
 bool RenderListBox::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, int x, int y, int tx, int ty, HitTestAction hitTestAction)