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

WebCore/platform/win/PopupMenuWin.cpp

Index: WebCore/platform/win/PopupMenuWin.cpp
===================================================================
--- WebCore/platform/win/PopupMenuWin.cpp	(revision 67003)
+++ WebCore/platform/win/PopupMenuWin.cpp	(working copy)
@@ -664,6 +664,17 @@
         ::ReleaseDC(m_popup, localDC);
 }
 
+int PopupMenuWin::scrollSize(ScrollbarOrientation orientation) const
+{
+    return ((orientation == VerticallScrollbar) && m_scrollbar) ? (m_scrollbar->totalSize() - m_scrollbar->visibleSize()) : 0;
+}
+
+void PopupMenuWin::setScrollOffsetFromAnimation(const IntPoint& offset)
+{
+    if (m_scrollbar)
+        m_scrollbar->setValue(offset.y(), Scrollbar::FromScrollAnimator);
+}
+
 void PopupMenuWin::valueChanged(Scrollbar* scrollBar)
 {
     ASSERT(m_scrollbar);