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

WebKit/chromium/src/WebScrollbarImpl.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 76 matching lines @@
     m_scrollbar->setProportion(length, m_scrollbar->totalSize());
 }
 
 int WebScrollbarImpl::value() const
 {
     return m_scrollbar->value();
 }
 
 void WebScrollbarImpl::setValue(int position)
 {
-    m_scrollbar->setValue(position);
+    m_scrollbar->setValue(position, Scrollbar::NotFromScrollAnimator);
 }
 
 void WebScrollbarImpl::setDocumentSize(int size)
 {
     int length = m_scrollbar->orientation() == HorizontalScrollbar ? m_scrollbar->width() : m_scrollbar->height();
     m_scrollbar->setEnabled(size > length);
     m_scrollbar->setProportion(length, size);
 }
 
 void WebScrollbarImpl::scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier)
@@ skipping 103 matching lines @@
         int maxScrollDelta = m_scrollbar->maximum() - m_scrollbar->value();
         float delta = m_scrollbar->orientation() == HorizontalScrollbar ? mousewheel.deltaX : mousewheel.deltaY;
         if ((delta < 0 && maxScrollDelta > 0) || (delta > 0 && m_scrollbar->value() > 0)) {
             if (mousewheel.scrollByPage) {
                 ASSERT(m_scrollbar->orientation() == VerticalScrollbar);
                 bool negative = delta < 0;
                 delta = max(max(static_cast<float>(m_scrollbar->visibleSize()) * Scrollbar::minFractionToStepWhenPaging(), static_cast<float>(m_scrollbar->visibleSize() - Scrollbar::maxOverlapBetweenPages())), 1.0f);
                 if (negative)
                     delta *= -1;
             }
-            m_scrollbar->setValue(m_scrollbar->value() - delta);
+            m_scrollbar->scroll((m_scrollbar->orientation() == HorizontalScrollbar) ? WebCore::ScrollLeft : WebCore::ScrollUp, WebCore::ScrollByPixel, delta);
             return true;
         }
 
     return false;
     }
 
 bool WebScrollbarImpl::onKeyDown(const WebInputEvent& event)
 {
         WebKeyboardEvent keyboard = *static_cast<const WebKeyboardEvent*>(&event);
         int keyCode;
@@ skipping 23 matching lines @@
         }
         WebCore::ScrollDirection scrollDirection;
         WebCore::ScrollGranularity scrollGranularity;
         if (WebViewImpl::mapKeyCodeForScroll(keyCode, &scrollDirection, &scrollGranularity)) {
             // Will return false if scroll direction wasn't compatible with this scrollbar.
             return m_scrollbar->scroll(scrollDirection, scrollGranularity);
         }
     return false;
 }
 
+int WebScrollbarImpl::scrollSize(WebCore::ScrollbarOrientation orientation) const
+{
+    return (orientation == m_scrollbar->orientation()) ? (m_scrollbar->totalSize() - m_scrollbar->visibleSize()) : 0;
+}
+
+void WebScrollbarImpl::setScrollOffsetFromAnimation(const WebCore::IntPoint& offset)
+{
+    m_scrollbar->setValue((m_scrollbar->orientation() == HorizontalScrollbar) ? offset.x() : offset.y(), Scrollbar::FromScrollAnimator);
+}
+
 void WebScrollbarImpl::valueChanged(WebCore::Scrollbar*)
 {
     m_client->valueChanged(this);
 }
 
 void WebScrollbarImpl::invalidateScrollbarRect(WebCore::Scrollbar*, const WebCore::IntRect& rect)
 {
     WebRect webrect(rect);
     webrect.x += m_scrollbar->x();
     webrect.y += m_scrollbar->y();
@@ skipping 13 matching lines @@
 void WebScrollbarImpl::getTickmarks(Vector<WebCore::IntRect>& tickmarks) const
 {
     WebVector<WebRect> ticks;
     m_client->getTickmarks(const_cast<WebScrollbarImpl*>(this), &ticks);
     tickmarks.resize(ticks.size());
     for (size_t i = 0; i < ticks.size(); ++i)
         tickmarks[i] = ticks[i];
 }
 
 } // namespace WebKit