Title: [198272] releases/WebKitGTK/webkit-2.12/Source/WebCore
- Revision
- 198272
- Author
- [email protected]
- Date
- 2016-03-16 08:13:30 -0700 (Wed, 16 Mar 2016)
Log Message
Merge r198269 - REGRESSION(r195661): [GTK] very slow scrolling
https://bugs.webkit.org/show_bug.cgi?id=155334
Reviewed by Sergio Villar Senin.
Fix smooth scrolling behaviour change after r195661.
* platform/ScrollAnimationSmooth.cpp:
(WebCore::getAnimationParametersForGranularity): Fix a typo,
animationTime for pixel granularity should be 11 * tickTime.
(WebCore::ScrollAnimationSmooth::animateScroll): Previous code
reset all the data except the visibleLenght, so keep it in the
PerAxisData after the reset.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (198271 => 198272)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-03-16 15:13:20 UTC (rev 198271)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-03-16 15:13:30 UTC (rev 198272)
@@ -1,3 +1,19 @@
+2016-03-16 Carlos Garcia Campos <[email protected]>
+
+ REGRESSION(r195661): [GTK] very slow scrolling
+ https://bugs.webkit.org/show_bug.cgi?id=155334
+
+ Reviewed by Sergio Villar Senin.
+
+ Fix smooth scrolling behaviour change after r195661.
+
+ * platform/ScrollAnimationSmooth.cpp:
+ (WebCore::getAnimationParametersForGranularity): Fix a typo,
+ animationTime for pixel granularity should be 11 * tickTime.
+ (WebCore::ScrollAnimationSmooth::animateScroll): Previous code
+ reset all the data except the visibleLenght, so keep it in the
+ PerAxisData after the reset.
+
2016-03-16 Commit Queue <[email protected]>
Unreviewed, rolling out r196803.
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/ScrollAnimationSmooth.cpp (198271 => 198272)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/ScrollAnimationSmooth.cpp 2016-03-16 15:13:20 UTC (rev 198271)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/ScrollAnimationSmooth.cpp 2016-03-16 15:13:30 UTC (rev 198272)
@@ -257,7 +257,7 @@
maximumCoastTime = 1;
break;
case ScrollByPixel:
- animationTime = 1 * tickTime;
+ animationTime = 11 * tickTime;
repeatMinimumSustainTime = 2 * tickTime;
attackTime = 3 * tickTime;
releaseTime = 3 * tickTime;
@@ -380,8 +380,10 @@
if (deltaTime > data.animationTime) {
double desiredPosition = data.desiredPosition;
+ int visibleLength = data.visibleLength;
data = ""
data.currentPosition = desiredPosition;
+ data.visibleLength = visibleLength;
return false;
}
if (deltaTime < data.attackTime)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
