Bug 1180295 - Disconnect scrolling notifications going to LayerMarginsAnimator. r=rbarker

This commit is contained in:
Kartikaya Gupta
2015-08-18 14:27:18 -04:00
parent fe907f6db7
commit 5e02f68e18
3 changed files with 2 additions and 22 deletions

View File

@@ -823,11 +823,7 @@ class JavaPanZoomController
if (FloatUtils.fuzzyEquals(displacement.x, 0.0f) && FloatUtils.fuzzyEquals(displacement.y, 0.0f)) {
return;
}
if (mDefaultPrevented || mSubscroller.scrollBy(displacement)) {
synchronized (mTarget.getLock()) {
mTarget.scrollMarginsBy(displacement.x, displacement.y);
}
} else {
if (!mDefaultPrevented && !mSubscroller.scrollBy(displacement)) {
synchronized (mTarget.getLock()) {
scrollBy(displacement.x, displacement.y);
}