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

WebKit/qt/Api/qwebframe.cpp

 /*
     Copyright (C) 2008,2009 Nokia Corporation and/or its subsidiary(-ies)
     Copyright (C) 2007 Staikos Computing Services Inc.
 
     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.
 
     This library is distributed in the hope that it will be useful,
@@ skipping 911 matching lines @@
 */
 void QWebFrame::setScrollBarValue(Qt::Orientation orientation, int value)
 {
     Scrollbar *sb;
     sb = (orientation == Qt::Horizontal) ? d->horizontalScrollBar() : d->verticalScrollBar();
     if (sb) {
         if (value < 0)
             value = 0;
         else if (value > scrollBarMaximum(orientation))
             value = scrollBarMaximum(orientation);
-        sb->setValue(value);
+        sb->setValue(value, Scrollbar::NotFromScrollAnimator);
     }
 }
 
 /*!
   Returns the current value for the scrollbar with orientation \a orientation, or 0
   if no scrollbar is found for \a orientation.
 
   \sa scrollBarMinimum(), scrollBarMaximum()
 */
 int QWebFrame::scrollBarValue(Qt::Orientation orientation) const
@@ skipping 844 matching lines @@
 
 /*!
     Returns the frame the hit test was executed in.
 */
 QWebFrame *QWebHitTestResult::frame() const
 {
     if (!d)
         return 0;
     return d->frame;
 }