[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
weinig at apple.com
weinig at apple.com
Sun Feb 20 23:29:13 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit c156846c5a440ba9450ecc9dd5e5b738e708af46
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 20 23:19:08 2011 +0000
Fix build.
* Api/qwebframe.cpp:
(QWebFrame::setScrollBarValue):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76293 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/qt/Api/qwebframe.cpp b/Source/WebKit/qt/Api/qwebframe.cpp
index 6305b86..e22501d 100644
--- a/Source/WebKit/qt/Api/qwebframe.cpp
+++ b/Source/WebKit/qt/Api/qwebframe.cpp
@@ -1071,7 +1071,7 @@ void QWebFrame::setScrollBarValue(Qt::Orientation orientation, int value)
value = 0;
else if (value > scrollBarMaximum(orientation))
value = scrollBarMaximum(orientation);
- ScrollbarClient::scrollToOffsetWithoutAnimation(orientation == Qt::Horizontal ? HorizontalScrollbar : VerticalScrollbar, position);
+ ScrollbarClient::scrollToOffsetWithoutAnimation(orientation == Qt::Horizontal ? HorizontalScrollbar : VerticalScrollbar, value);
}
}
diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index 5bb8400..ff96c07 100644
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,5 +1,12 @@
2011-01-20 Sam Weinig <sam at webkit.org>
+ Fix build.
+
+ * Api/qwebframe.cpp:
+ (QWebFrame::setScrollBarValue):
+
+2011-01-20 Sam Weinig <sam at webkit.org>
+
Reviewed by Dave Hyatt.
Cleanup Scrollbar/ScrollbarClient relationship
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list