Merge 67009 - WebCore: Not reviewed, fallout from http://trac.webkit.org/chan...

WebCore/platform/win/PopupMenuWin.cpp

Index: WebCore/platform/win/PopupMenuWin.cpp
===================================================================
--- WebCore/platform/win/PopupMenuWin.cpp	(revision 67009)
+++ WebCore/platform/win/PopupMenuWin.cpp	(working copy)
@@ -531,12 +531,12 @@
     int index = focusedIndex();
 
     if (index < m_scrollOffset) {
-        m_scrollbar->setValue(index);
+        m_scrollbar->setValue(index, Scrollbar::NotFromScrollAnimator);
         return true;
     }
 
     if (index >= m_scrollOffset + visibleItems()) {
-        m_scrollbar->setValue(index - visibleItems() + 1);
+        m_scrollbar->setValue(index - visibleItems() + 1, Scrollbar::NotFromScrollAnimator);
         return true;
     }
 
@@ -666,7 +666,7 @@
 
 int PopupMenuWin::scrollSize(ScrollbarOrientation orientation) const
 {
-    return ((orientation == VerticallScrollbar) && m_scrollbar) ? (m_scrollbar->totalSize() - m_scrollbar->visibleSize()) : 0;
+    return ((orientation == VerticalScrollbar) && m_scrollbar) ? (m_scrollbar->totalSize() - m_scrollbar->visibleSize()) : 0;
 }
 
 void PopupMenuWin::setScrollOffsetFromAnimation(const IntPoint& offset)