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

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 646 matching lines @@
         m_scrollbar->paint(&context, damageRect);
 
     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;
+}
+
+void PopupMenuWin::setScrollOffsetFromAnimation(const IntPoint& offset)
+{
+    if (m_scrollbar)
+        m_scrollbar->setValue(offset.y(), Scrollbar::FromScrollAnimator);
+}
+
 void PopupMenuWin::valueChanged(Scrollbar* scrollBar)
 {
     ASSERT(m_scrollbar);
 
     if (!m_popup)
         return;
 
     int offset = scrollBar->value();
 
     if (m_scrollOffset == offset)
@@ skipping 320 matching lines @@
             break;
 #endif
         default:
             lResult = DefWindowProc(hWnd, message, wParam, lParam);
     }
 
     return lResult;
 }
 
 }