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

WebCore/platform/win/PopupMenuWin.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2007-2009 Torch Mobile Inc.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 513 matching lines @@
 }
 
 bool PopupMenuWin::scrollToRevealSelection()
 {
     if (!m_scrollbar)
         return false;
 
     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;
     }
 
     return false;
 }
 
 void PopupMenuWin::updateFromElement()
 {
     if (!m_popup)
         return;
@@ skipping 109 matching lines @@
     HDC localDC = hdc ? hdc : ::GetDC(m_popup);
 
     ::BitBlt(localDC, damageRect.x(), damageRect.y(), damageRect.width(), damageRect.height(), m_DC, damageRect.x(), damageRect.y(), SRCCOPY);
 
     if (!hdc)
         ::ReleaseDC(m_popup, localDC);
 }
 
 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)
 {
     if (m_scrollbar)
         m_scrollbar->setValue(offset.y(), Scrollbar::FromScrollAnimator);
 }
 
 void PopupMenuWin::valueChanged(Scrollbar* scrollBar)
 {
@@ skipping 328 matching lines @@
             break;
 #endif
         default:
             lResult = DefWindowProc(hWnd, message, wParam, lParam);
     }
 
     return lResult;
 }
 
 }