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

WebCore/rendering/RenderListBox.cpp

 /*
  * This file is part of the select element renderer in WebCore.
  *
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  *               2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
@@ skipping 482 matching lines @@
         return false;
 
     int newOffset;
     if (index < m_indexOffset)
         newOffset = index;
     else
         newOffset = index - numVisibleItems() + 1;
 
     m_indexOffset = newOffset;
     if (m_vBar)
-        m_vBar->setValue(m_indexOffset);
+        m_vBar->setValue(m_indexOffset, Scrollbar::NotFromScrollAnimator);
 
     return true;
 }
 
 bool RenderListBox::listIndexIsVisible(int index)
 {    
     return index >= m_indexOffset && index < m_indexOffset + numVisibleItems();
 }
 
 bool RenderListBox::scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier, Node**)
 {
     return m_vBar && m_vBar->scroll(direction, granularity, multiplier);
 }
 
 void RenderListBox::valueChanged(unsigned listIndex)
 {
     Element* element = static_cast<Element*>(node());
     SelectElement* select = toSelectElement(element);
     select->setSelectedIndex(select->listToOptionIndex(listIndex));
     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();
     if (newOffset != m_indexOffset) {
         m_indexOffset = newOffset;
         repaint();
         node()->dispatchEvent(Event::create(eventNames().scrollEvent, false, false));
     }
 }
 
@@ skipping 35 matching lines @@
 }
 
 void RenderListBox::setScrollTop(int newTop)
 {
     // Determine an index and scroll to it.    
     int index = newTop / itemHeight();
     if (index < 0 || index >= numItems() || index == m_indexOffset)
         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)
 {
     if (!RenderBlock::nodeAtPoint(request, result, x, y, tx, ty, hitTestAction))
         return false;
     const Vector<Element*>& listItems = toSelectElement(static_cast<Element*>(node()))->listItems();
     int size = numItems();
     tx += this->x();
     ty += this->y();
@@ skipping 126 matching lines @@
         m_vBar->styleChanged();
 
 #if ENABLE(DASHBOARD_SUPPORT)
     // Force an update since we know the scrollbars have changed things.
     if (document()->hasDashboardRegions())
         document()->setDashboardRegionsDirty(true);
 #endif
 }
 
 } // namespace WebCore