135971 2014-08-15 01:57:12 -0700 Fix gliding in AxisScrollSnapAnimator for Mac 2014-08-15 16:35:38 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Mac Unspecified RESOLVED FIXED P2 Enhancement --- 135774 1 wenson_hsieh webkit-unassigned commit-queue oldest_to_newest 1029314 0 wenson_hsieh 2014-08-15 01:57:12 -0700 After finishing animation to a snap point due to a a flick gesture, leftover momentum events that are handled by the AxisScrollSnapAnimator are incorrectly pushed to the momentum tracking window, occasionally causing a second extremely slow gliding animation to take place after reaching the intended snap point. This is fixed by distinguishing the Idle state due to user interaction from the Idle state caused by reaching the intended snap point. 1029479 1 236679 wenson_hsieh 2014-08-15 15:27:32 -0700 Created attachment 236679 Patch 1029517 2 236679 commit-queue 2014-08-15 16:35:35 -0700 Comment on attachment 236679 Patch Clearing flags on attachment: 236679 Committed r172659: <http://trac.webkit.org/changeset/172659> 1029518 3 commit-queue 2014-08-15 16:35:38 -0700 All reviewed patches have been landed. Closing bug. 236679 2014-08-15 15:27:32 -0700 2014-08-15 16:35:35 -0700 Patch bug-135971-20140815152722.patch text/plain 6415 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyNjUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzAyMjM5NWJiYjA0Nzll Yzk2NjVjYzIwODU4MzZkYzM2NTQ3ODIxMS4uMDYxMzZjYzJjZmFiMzFhOTUxMzlhMGE5ZGViYTUy N2M4YjE1YTAyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTA4LTE1ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBnbGlkaW5n IGluIEF4aXNTY3JvbGxTbmFwQW5pbWF0b3IgZm9yIE1hYworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1OTcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUHJldmlvdXNseSwgbW9tZW50dW0gZXZlbnRzIHRo YXQgYXJlIGhhbmRsZWQgaW1tZWRpYXRlbHkgYWZ0ZXIgZmluaXNoaW5nIGEgZ2xpZGUgYW5pbWF0 aW9uIGNhdXNlIGEgc2Vjb25kLCBleHRyZW1lbHkKKyAgICAgICAgc2xvdyBnbGlkZSBhbmltYXRp b24gdG8gdHJpZ2dlci4gVG8gZml4IHRoaXMsIEkgYWRkZWQgYSBuZXcgc3RhdGUgRGVzdGluYXRp b25SZWFjaGVkLiBEdXJpbmcgdGhpcyBzdGF0ZSwgYWRkaXRpb25hbAorICAgICAgICBtb21lbnR1 bSBldmVudHMgdGhhdCBhcmUgaGFuZGxlZCBhZnRlciB0aGUgZ2xpZGUgYW5pbWF0aW9uIGNvbXBs ZXRlcyB3aWxsIG5vdCBmaWxsIHVwIHRoZSBtb21lbnR1bSB3aW5kb3cgYW5kIHRyaWdnZXIKKyAg ICAgICAgYSBzZWNvbmQgZ2xpZGUgZXZlbnQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvQXhp c1Njcm9sbFNuYXBBbmltYXRvci5oOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9BeGlzU2Nyb2xs U25hcEFuaW1hdG9yLm1tOgorICAgICAgICAoV2ViQ29yZTo6QXhpc1Njcm9sbFNuYXBBbmltYXRv cjo6QXhpc1Njcm9sbFNuYXBBbmltYXRvcik6CisgICAgICAgIChXZWJDb3JlOjpBeGlzU2Nyb2xs U25hcEFuaW1hdG9yOjpoYW5kbGVXaGVlbEV2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkF4aXNT Y3JvbGxTbmFwQW5pbWF0b3I6OnNjcm9sbFNuYXBBbmltYXRpb25VcGRhdGUpOgorICAgICAgICAo V2ViQ29yZTo6QXhpc1Njcm9sbFNuYXBBbmltYXRvcjo6ZW5kU2Nyb2xsU25hcEFuaW1hdGlvbik6 CisgICAgICAgIChXZWJDb3JlOjpBeGlzU2Nyb2xsU25hcEFuaW1hdG9yOjpjb21wdXRlR2xpZGVE ZWx0YSk6CisKIDIwMTQtMDgtMTUgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAK ICAgICAgICAgW0VNRV1bTWFjXSBBZG9wdCBBVlN0cmVhbVNlc3Npb24uCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvQXhpc1Njcm9sbFNuYXBBbmltYXRvci5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0F4aXNTY3JvbGxTbmFwQW5pbWF0b3IuaAppbmRleCBm MzA4NDliNGE5NjViMjk5MWEyYzc5NDFmODQ5OGI0ZmNmMGVjYzdmLi4xMjJhNDZhMGJjYjIwZjc5 NTk5ODY0OTJlYjE2OGRlYmM3ODlmZjM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tYWMvQXhpc1Njcm9sbFNuYXBBbmltYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21hYy9BeGlzU2Nyb2xsU25hcEFuaW1hdG9yLmgKQEAgLTM4LDcgKzM4LDggQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogZW51bSBjbGFzcyBTY3JvbGxTbmFwU3RhdGUgewogICAgIFNuYXBw aW5nLAogICAgIEdsaWRpbmcsCi0gICAgSWRsZQorICAgIERlc3RpbmF0aW9uUmVhY2hlZCwKKyAg ICBVc2VySW50ZXJhY3Rpb24KIH07CiAKIGVudW0gY2xhc3MgV2hlZWxFdmVudFN0YXR1cyB7CkBA IC03MSw3ICs3Miw3IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICB2b2lkIGJlZ2luU2Nyb2xs U25hcEFuaW1hdGlvbihTY3JvbGxTbmFwU3RhdGUpOwotICAgIHZvaWQgZW5kU2Nyb2xsU25hcEFu aW1hdGlvbigpOworICAgIHZvaWQgZW5kU2Nyb2xsU25hcEFuaW1hdGlvbihTY3JvbGxTbmFwU3Rh dGUpOwogCiAgICAgZmxvYXQgY29tcHV0ZVNuYXBEZWx0YSgpIGNvbnN0OwogICAgIGZsb2F0IGNv bXB1dGVHbGlkZURlbHRhKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tYWMvQXhpc1Njcm9sbFNuYXBBbmltYXRvci5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9BeGlzU2Nyb2xsU25hcEFuaW1hdG9yLm1tCmluZGV4IGJkZDI0ODdjZTMyZDUwMTUx YTE5MzE2ZmM1MmNlOWMxOTc0ZmYxZjMuLmI4Mzg0OTA5NzBhMzkzMzFmZjE2MGE2NTA1NTY1YTFl MDQ3ZDIyNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9BeGlzU2Ny b2xsU25hcEFuaW1hdG9yLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9BeGlz U2Nyb2xsU25hcEFuaW1hdG9yLm1tCkBAIC04Niw3ICs4Niw3IEBAIEF4aXNTY3JvbGxTbmFwQW5p bWF0b3I6OkF4aXNTY3JvbGxTbmFwQW5pbWF0b3IoQXhpc1Njcm9sbFNuYXBBbmltYXRvckNsaWVu dCogY2xpCiAgICAgOiBtX2NsaWVudChjbGllbnQpCiAgICAgLCBtX3NuYXBPZmZzZXRzKHNuYXBP ZmZzZXRzKQogICAgICwgbV9heGlzKGF4aXMpCi0gICAgLCBtX2N1cnJlbnRTdGF0ZShTY3JvbGxT bmFwU3RhdGU6OklkbGUpCisgICAgLCBtX2N1cnJlbnRTdGF0ZShTY3JvbGxTbmFwU3RhdGU6OkRl c3RpbmF0aW9uUmVhY2hlZCkKICAgICAsIG1faW5pdGlhbE9mZnNldCgwKQogICAgICwgbV90YXJn ZXRPZmZzZXQoMCkKICAgICAsIG1fYmVnaW5UcmFja2luZ1doZWVsRGVsdGFPZmZzZXQoMCkKQEAg LTEwOCw3ICsxMDgsNyBAQCB2b2lkIEF4aXNTY3JvbGxTbmFwQW5pbWF0b3I6OmhhbmRsZVdoZWVs RXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiBldmVudCkKICAgICBzd2l0Y2ggKHdoZWVs U3RhdHVzKSB7CiAgICAgY2FzZSBXaGVlbEV2ZW50U3RhdHVzOjpVc2VyU2Nyb2xsQmVnaW46CiAg ICAgY2FzZSBXaGVlbEV2ZW50U3RhdHVzOjpVc2VyU2Nyb2xsaW5nOgotICAgICAgICBlbmRTY3Jv bGxTbmFwQW5pbWF0aW9uKCk7CisgICAgICAgIGVuZFNjcm9sbFNuYXBBbmltYXRpb24oU2Nyb2xs U25hcFN0YXRlOjpVc2VySW50ZXJhY3Rpb24pOwogICAgICAgICBicmVhazsKIAogICAgIGNhc2Ug V2hlZWxFdmVudFN0YXR1czo6VXNlclNjcm9sbEVuZDoKQEAgLTExNywxNSArMTE3LDE1IEBAIHZv aWQgQXhpc1Njcm9sbFNuYXBBbmltYXRvcjo6aGFuZGxlV2hlZWxFdmVudChjb25zdCBQbGF0Zm9y bVdoZWVsRXZlbnQmIGV2ZW50KQogCiAgICAgY2FzZSBXaGVlbEV2ZW50U3RhdHVzOjpJbmVydGlh bFNjcm9sbEJlZ2luOgogICAgICAgICAvLyBCZWdpbiB0cmFja2luZyB3aGVlbCBkZWx0YXMgZm9y IGdsaWRlIHByZWRpY3Rpb24uCi0gICAgICAgIGVuZFNjcm9sbFNuYXBBbmltYXRpb24oKTsKKyAg ICAgICAgZW5kU2Nyb2xsU25hcEFuaW1hdGlvbihTY3JvbGxTbmFwU3RhdGU6OlVzZXJJbnRlcmFj dGlvbik7CiAgICAgICAgIHB1c2hJbml0aWFsV2hlZWxEZWx0YSh3aGVlbERlbHRhKTsKICAgICAg ICAgbV9iZWdpblRyYWNraW5nV2hlZWxEZWx0YU9mZnNldCA9IG1fY2xpZW50LT5zY3JvbGxPZmZz ZXRJbkF4aXMobV9heGlzKTsKICAgICAgICAgYnJlYWs7CiAKICAgICBjYXNlIFdoZWVsRXZlbnRT dGF0dXM6OkluZXJ0aWFsU2Nyb2xsaW5nOgotICAgICAgICBpZiAobV9jdXJyZW50U3RhdGUgIT0g U2Nyb2xsU25hcFN0YXRlOjpHbGlkaW5nKSB7Ci0gICAgICAgICAgICAvLyBGSVhNRTogSW52ZXN0 aWdhdGUgd2h5IHNtYWxsIHdoZWVsIGRlbHRhcyBwdXNoZWQgaW50byB0aGUgd2luZG93IHdpdGhv dXQgdGhlIDwgLTEsID4gMSBjaGVjay4KLSAgICAgICAgICAgIGlmIChtX251bVdoZWVsRGVsdGFz VHJhY2tlZCA8IHdoZWVsRGVsdGFXaW5kb3dTaXplICYmICh3aGVlbERlbHRhIDwgLTEgfHwgd2hl ZWxEZWx0YSA+IDEpKQorICAgICAgICAvLyBUaGlzIGNoZWNrIGZvciBEZXN0aW5hdGlvblJlYWNo ZWQgZW5zdXJlcyB0aGF0IHdlIGRvbid0IHJlY2VpdmUgYW5vdGhlciBzZXQgb2YgbW9tZW50dW0g ZXZlbnRzIGFmdGVyIGVuZGluZyB0aGUgbGFzdCBnbGlkZS4KKyAgICAgICAgaWYgKG1fY3VycmVu dFN0YXRlICE9IFNjcm9sbFNuYXBTdGF0ZTo6R2xpZGluZyAmJiBtX2N1cnJlbnRTdGF0ZSAhPSBT Y3JvbGxTbmFwU3RhdGU6OkRlc3RpbmF0aW9uUmVhY2hlZCkgeworICAgICAgICAgICAgaWYgKG1f bnVtV2hlZWxEZWx0YXNUcmFja2VkIDwgd2hlZWxEZWx0YVdpbmRvd1NpemUpCiAgICAgICAgICAg ICAgICAgcHVzaEluaXRpYWxXaGVlbERlbHRhKHdoZWVsRGVsdGEpOwogCiAgICAgICAgICAgICBp ZiAobV9udW1XaGVlbERlbHRhc1RyYWNrZWQgPT0gd2hlZWxEZWx0YVdpbmRvd1NpemUpCkBAIC0x NTUsMTAgKzE1NSw4IEBAIHZvaWQgQXhpc1Njcm9sbFNuYXBBbmltYXRvcjo6c2Nyb2xsU25hcEFu aW1hdGlvblVwZGF0ZSgpCiAgICAgZmxvYXQgZGVsdGEgPSBtX2N1cnJlbnRTdGF0ZSA9PSBTY3Jv bGxTbmFwU3RhdGU6OlNuYXBwaW5nID8gY29tcHV0ZVNuYXBEZWx0YSgpIDogY29tcHV0ZUdsaWRl RGVsdGEoKTsKICAgICBpZiAoZGVsdGEpCiAgICAgICAgIG1fY2xpZW50LT5pbW1lZGlhdGVTY3Jv bGxJbkF4aXMobV9heGlzLCBkZWx0YSk7Ci0gICAgZWxzZSB7Ci0gICAgICAgIGVuZFNjcm9sbFNu YXBBbmltYXRpb24oKTsKLSAgICAgICAgbV9jdXJyZW50U3RhdGUgPSBTY3JvbGxTbmFwU3RhdGU6 OklkbGU7Ci0gICAgfQorICAgIGVsc2UKKyAgICAgICAgZW5kU2Nyb2xsU25hcEFuaW1hdGlvbihT Y3JvbGxTbmFwU3RhdGU6OkRlc3RpbmF0aW9uUmVhY2hlZCk7CiB9CiAKIHZvaWQgQXhpc1Njcm9s bFNuYXBBbmltYXRvcjo6YmVnaW5TY3JvbGxTbmFwQW5pbWF0aW9uKFNjcm9sbFNuYXBTdGF0ZSBu ZXdTdGF0ZSkKQEAgLTE4OSwxMiArMTg3LDEzIEBAIHZvaWQgQXhpc1Njcm9sbFNuYXBBbmltYXRv cjo6YmVnaW5TY3JvbGxTbmFwQW5pbWF0aW9uKFNjcm9sbFNuYXBTdGF0ZSBuZXdTdGF0ZSkKICAg ICBtX2NsaWVudC0+c3RhcnRTY3JvbGxTbmFwVGltZXIoKTsKIH0KIAotdm9pZCBBeGlzU2Nyb2xs U25hcEFuaW1hdG9yOjplbmRTY3JvbGxTbmFwQW5pbWF0aW9uKCkKK3ZvaWQgQXhpc1Njcm9sbFNu YXBBbmltYXRvcjo6ZW5kU2Nyb2xsU25hcEFuaW1hdGlvbihTY3JvbGxTbmFwU3RhdGUgbmV3U3Rh dGUpCiB7CisgICAgQVNTRVJUKG5ld1N0YXRlID09IFNjcm9sbFNuYXBTdGF0ZTo6RGVzdGluYXRp b25SZWFjaGVkIHx8IG5ld1N0YXRlID09IFNjcm9sbFNuYXBTdGF0ZTo6VXNlckludGVyYWN0aW9u KTsKICAgICBpZiAobV9jdXJyZW50U3RhdGUgPT0gU2Nyb2xsU25hcFN0YXRlOjpHbGlkaW5nKQog ICAgICAgICBjbGVhckluaXRpYWxXaGVlbERlbHRhV2luZG93KCk7CiAKLSAgICBtX2N1cnJlbnRT dGF0ZSA9IFNjcm9sbFNuYXBTdGF0ZTo6SWRsZTsKKyAgICBtX2N1cnJlbnRTdGF0ZSA9IG5ld1N0 YXRlOwogICAgIG1fY2xpZW50LT5zdG9wU2Nyb2xsU25hcFRpbWVyKCk7CiB9CiAKQEAgLTI0NSw3 ICsyNDQsOCBAQCBmbG9hdCBBeGlzU2Nyb2xsU25hcEFuaW1hdG9yOjpjb21wdXRlR2xpZGVEZWx0 YSgpIGNvbnN0CiAgICAgICAgIHJldHVybiAwOwogCiAgICAgZmxvYXQgcHJvZ3Jlc3MgPSAoKGZs b2F0KShvZmZzZXQgLSBtX2luaXRpYWxPZmZzZXQpKSAvIChtX3RhcmdldE9mZnNldCAtIG1faW5p dGlhbE9mZnNldCk7Ci0gICAgZmxvYXQgc2hpZnQgPSBjZWlsKG1fZ2xpZGVNYWduaXR1ZGUgKiAo MSArIGNvcyhwaUZsb2F0ICogcHJvZ3Jlc3MgKyBtX2dsaWRlUGhhc2VTaGlmdCkpKTsKKyAgICAv LyBGSVhNRTogV2UgbWlnaHQgd2FudCB0byBpbnZlc3RpZ2F0ZSB3aHkgLW1fZ2xpZGVQaGFzZVNo aWZ0IHJlc3VsdHMgaW4gdGhlIGJlaGF2aW9yIHdlIHdhbnQuCisgICAgZmxvYXQgc2hpZnQgPSBj ZWlsKG1fZ2xpZGVNYWduaXR1ZGUgKiAoMSArIGNvcyhwaUZsb2F0ICogcHJvZ3Jlc3MgLSBtX2ds aWRlUGhhc2VTaGlmdCkpKTsKICAgICBzaGlmdCA9IG1faW5pdGlhbE9mZnNldCA8IG1fdGFyZ2V0 T2Zmc2V0ID8gc3RkOjptYXg8ZmxvYXQ+KHNoaWZ0LCAxKSA6IHN0ZDo6bWluPGZsb2F0PihzaGlm dCwgLTEpOwogICAgIGlmICgobV9pbml0aWFsT2Zmc2V0IDwgbV90YXJnZXRPZmZzZXQgJiYgb2Zm c2V0ICsgc2hpZnQgPiBtX3RhcmdldE9mZnNldCkgfHwgKG1faW5pdGlhbE9mZnNldCA+IG1fdGFy Z2V0T2Zmc2V0ICYmIG9mZnNldCArIHNoaWZ0IDwgbV90YXJnZXRPZmZzZXQpKQogICAgICAgICBy ZXR1cm4gbV90YXJnZXRPZmZzZXQgLSBvZmZzZXQ7Cg==