75120 2011-12-22 13:36:23 -0800 Simplify ScrollAnimatorMac scrollByDelta functions 2011-12-22 13:39:31 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 526480 0 andersca 2011-12-22 13:36:23 -0800 Simplify ScrollAnimatorMac scrollByDelta functions 526482 1 120374 andersca 2011-12-22 13:37:25 -0800 Created attachment 120374 Patch 526484 2 andersca 2011-12-22 13:39:31 -0800 Committed r103576: <http://trac.webkit.org/changeset/103576> 120374 2011-12-22 13:37:25 -0800 2011-12-22 13:38:40 -0800 Patch bug-75120-20111222133739.patch text/plain 7695 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzNTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDE0NDA0NGFiZTI4YmE4 NTEwN2M2ZTYwODJlMjVmMjI1YzgxYjRkYy4uNjg3MjA3M2RiNzEwMTI4ZTljZDg4YzAxNTBlZTNm MWRiMDZmN2Q0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDExLTEyLTIyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgU2ltcGxpZnkgU2Ny b2xsQW5pbWF0b3JNYWMgc2Nyb2xsQnlEZWx0YSBmdW5jdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1MTIwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWVyZ2UgaW1tZWRpYXRlU2Nyb2xsQnlEZWx0 YVggYW5kIGltbWVkaWF0ZVNjcm9sbEJ5RGVsdGFZIHRvIGEgc2luZ2xlIGZ1bmN0aW9uIGFuZCBy ZW5hbWUgaXQKKyAgICAgICAgdG8gaW1tZWRpYXRlU2Nyb2xsQnkuIEFsc28sIHJlbmFtZSBpbW1l ZGlhdGVTY3JvbGxUb1BvaW50IHRvIGltbWVkaWF0ZVNjcm9sbFRvLgorICAgICAgICAKKyAgICAg ICAgKiBwbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMuaDoKKyAgICAgICAgKiBwbGF0Zm9y bS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmlt YXRvck1hYzo6c2Nyb2xsVG9PZmZzZXRXaXRob3V0QW5pbWF0aW9uKToKKyAgICAgICAgKFdlYkNv cmU6OlNjcm9sbEFuaW1hdG9yTWFjOjppbW1lZGlhdGVTY3JvbGxUbyk6CisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxBbmltYXRvck1hYzo6aW1tZWRpYXRlU2Nyb2xsQnkpOgorICAgICAgICAoV2Vi Q29yZTo6U2Nyb2xsQW5pbWF0b3JNYWM6OmltbWVkaWF0ZVNjcm9sbFRvUG9pbnRGb3JTY3JvbGxB bmltYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3JNYWM6OnNtb290aFNj cm9sbFdpdGhFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvck1hYzo6c25h cFJ1YmJlckJhbmRUaW1lckZpcmVkKToKKworMjAxMS0xMi0yMiAgQW5kZXJzIENhcmxzc29uICA8 YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIE1ha2Ugc29tZSBTY3JvbGxBbmltYXRvck1h YyBtZW1iZXIgZnVuY3Rpb25zIHByaXZhdGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTc1MTE3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWFjL1Njcm9sbEFuaW1hdG9yTWFjLmgKaW5kZXggZGUxMWVlNWNmNjZiYTk0YWQ2NTFmYWQ1Yzc1 MDg2MzIzNTU3ZmRkMi4uOWE3NDUzNDg4OGFmMWRkYzNmMWRhZmE1YjcwMDUwZTQxMjIyYmY1ZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFj LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLmgK QEAgLTEyNSw5ICsxMjUsOCBAQCBwcml2YXRlOgogICAgIGZsb2F0IGFkanVzdFNjcm9sbFlQb3Np dGlvbklmTmVjZXNzYXJ5KGZsb2F0KSBjb25zdDsKICAgICBGbG9hdFBvaW50IGFkanVzdFNjcm9s bFBvc2l0aW9uSWZOZWNlc3NhcnkoY29uc3QgRmxvYXRQb2ludCYpIGNvbnN0OwogCi0gICAgdm9p ZCBpbW1lZGlhdGVTY3JvbGxUb1BvaW50KGNvbnN0IEZsb2F0UG9pbnQmIG5ld1Bvc2l0aW9uKTsK LSAgICB2b2lkIGltbWVkaWF0ZVNjcm9sbEJ5RGVsdGFYKGZsb2F0IGRlbHRhWCk7Ci0gICAgdm9p ZCBpbW1lZGlhdGVTY3JvbGxCeURlbHRhWShmbG9hdCBkZWx0YVkpOworICAgIHZvaWQgaW1tZWRp YXRlU2Nyb2xsVG8oY29uc3QgRmxvYXRQb2ludCYpOworICAgIHZvaWQgaW1tZWRpYXRlU2Nyb2xs QnkoY29uc3QgRmxvYXRTaXplJik7CiAKICNpZiBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCiAgICAg Ly8vIFNjcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyQ2xpZW50IG1lbWJlciBmdW5jdGlvbnMuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMu bW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0KaW5k ZXggZTg0M2E4YmFjNjE2ZWFiZTA1OTBhNDBhMTc4MjMzZGJhYzFhNjkxZi4uZmIxZTZkZjY1ZmEw NTJjOWQzN2RjYTRmODhhNWJjOTEzZTUwNTMwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQpAQCAtNjQ3LDcgKzY0Nyw3IEBAIGJvb2wg U2Nyb2xsQW5pbWF0b3JNYWM6OnNjcm9sbChTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmllbnRhdGlv biwgU2Nyb2xsR3JhbnVsYXJpCiB2b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjpzY3JvbGxUb09mZnNl dFdpdGhvdXRBbmltYXRpb24oY29uc3QgRmxvYXRQb2ludCYgb2Zmc2V0KQogewogICAgIFttX3Nj cm9sbEFuaW1hdGlvbkhlbHBlci5nZXQoKSBfc3RvcFJ1bl07Ci0gICAgaW1tZWRpYXRlU2Nyb2xs VG9Qb2ludChvZmZzZXQpOworICAgIGltbWVkaWF0ZVNjcm9sbFRvKG9mZnNldCk7CiB9CiAKIGZs b2F0IFNjcm9sbEFuaW1hdG9yTWFjOjphZGp1c3RTY3JvbGxYUG9zaXRpb25JZk5lY2Vzc2FyeShm bG9hdCBwb3NpdGlvbikgY29uc3QKQEAgLTY3Nyw3ICs2NzcsNyBAQCBGbG9hdFBvaW50IFNjcm9s bEFuaW1hdG9yTWFjOjphZGp1c3RTY3JvbGxQb3NpdGlvbklmTmVjZXNzYXJ5KGNvbnN0IEZsb2F0 UG9pbnQmCiAgICAgcmV0dXJuIEZsb2F0UG9pbnQobmV3WCwgbmV3WSk7CiB9CiAKLXZvaWQgU2Ny b2xsQW5pbWF0b3JNYWM6OmltbWVkaWF0ZVNjcm9sbFRvUG9pbnQoY29uc3QgRmxvYXRQb2ludCYg bmV3UG9zaXRpb24pCit2b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjppbW1lZGlhdGVTY3JvbGxUbyhj b25zdCBGbG9hdFBvaW50JiBuZXdQb3NpdGlvbikKIHsKICAgICBGbG9hdFBvaW50IGFkanVzdGVk UG9zaXRpb24gPSBhZGp1c3RTY3JvbGxQb3NpdGlvbklmTmVjZXNzYXJ5KG5ld1Bvc2l0aW9uKTsK ICAKQEAgLTY5MCwyNCArNjkwLDE1IEBAIHZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6OmltbWVkaWF0 ZVNjcm9sbFRvUG9pbnQoY29uc3QgRmxvYXRQb2ludCYgbmV3UG9zaXRpb24pCiAgICAgbm90aWZ5 UG9zaXRpb25DaGFuZ2VkKCk7CiB9CiAKLXZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6OmltbWVkaWF0 ZVNjcm9sbEJ5RGVsdGFYKGZsb2F0IGRlbHRhWCkKK3ZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6Omlt bWVkaWF0ZVNjcm9sbEJ5KGNvbnN0IEZsb2F0U2l6ZSYgZGVsdGEpCiB7Ci0gICAgZmxvYXQgbmV3 UG9zWCA9IGFkanVzdFNjcm9sbFhQb3NpdGlvbklmTmVjZXNzYXJ5KG1fY3VycmVudFBvc1ggKyBk ZWx0YVgpOwotICAgIAotICAgIGlmIChuZXdQb3NYID09IG1fY3VycmVudFBvc1gpCi0gICAgICAg IHJldHVybjsKLSAgICAKLSAgICBtX2N1cnJlbnRQb3NYID0gbmV3UG9zWDsKLSAgICBub3RpZnlQ b3NpdGlvbkNoYW5nZWQoKTsKLX0KKyAgICBmbG9hdCBuZXdQb3NYID0gYWRqdXN0U2Nyb2xsWFBv c2l0aW9uSWZOZWNlc3NhcnkobV9jdXJyZW50UG9zWCArIGRlbHRhLndpZHRoKCkpOworICAgIGZs b2F0IG5ld1Bvc1kgPSBhZGp1c3RTY3JvbGxZUG9zaXRpb25JZk5lY2Vzc2FyeShtX2N1cnJlbnRQ b3NZICsgZGVsdGEuaGVpZ2h0KCkpOwogCi12b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjppbW1lZGlh dGVTY3JvbGxCeURlbHRhWShmbG9hdCBkZWx0YVkpCi17Ci0gICAgZmxvYXQgbmV3UG9zWSA9IGFk anVzdFNjcm9sbFlQb3NpdGlvbklmTmVjZXNzYXJ5KG1fY3VycmVudFBvc1kgKyBkZWx0YVkpOwot ICAgIAotICAgIGlmIChuZXdQb3NZID09IG1fY3VycmVudFBvc1kpCisgICAgaWYgKG5ld1Bvc1gg PT0gbV9jdXJyZW50UG9zWCAmJiBuZXdQb3NZID09IG1fY3VycmVudFBvc1kpCiAgICAgICAgIHJl dHVybjsKLSAgICAKKworICAgIG1fY3VycmVudFBvc1ggPSBuZXdQb3NYOwogICAgIG1fY3VycmVu dFBvc1kgPSBuZXdQb3NZOwogICAgIG5vdGlmeVBvc2l0aW9uQ2hhbmdlZCgpOwogfQpAQCAtNzE1 LDcgKzcwNiw3IEBAIHZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6OmltbWVkaWF0ZVNjcm9sbEJ5RGVs dGFZKGZsb2F0IGRlbHRhWSkKIHZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6OmltbWVkaWF0ZVNjcm9s bFRvUG9pbnRGb3JTY3JvbGxBbmltYXRpb24oY29uc3QgRmxvYXRQb2ludCYgbmV3UG9zaXRpb24p CiB7CiAgICAgQVNTRVJUKG1fc2Nyb2xsQW5pbWF0aW9uSGVscGVyKTsKLSAgICBpbW1lZGlhdGVT Y3JvbGxUb1BvaW50KG5ld1Bvc2l0aW9uKTsKKyAgICBpbW1lZGlhdGVTY3JvbGxUbyhuZXdQb3Np dGlvbik7CiB9CiAKIHZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6Om5vdGlmeVBvc2l0aW9uQ2hhbmdl ZCgpCkBAIC0xMjA0LDExICsxMTk1LDExIEBAIHZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6OnNtb290 aFNjcm9sbFdpdGhFdmVudChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVsRXZlCiAgICAg ICAgIGlmICghKHNob3VsZFN0cmV0Y2ggfHwgaXNWZXJ0aWNhbGx5U3RyZXRjaGVkIHx8IGlzSG9y aXpvbnRhbGx5U3RyZXRjaGVkKSkgewogICAgICAgICAgICAgaWYgKGRlbHRhWSAhPSAwKSB7CiAg ICAgICAgICAgICAgICAgZGVsdGFZICo9IHNjcm9sbFdoZWVsTXVsdGlwbGllcigpOwotICAgICAg ICAgICAgICAgIGltbWVkaWF0ZVNjcm9sbEJ5RGVsdGFZKGRlbHRhWSk7CisgICAgICAgICAgICAg ICAgaW1tZWRpYXRlU2Nyb2xsQnkoRmxvYXRTaXplKDAsIGRlbHRhWSkpOwogICAgICAgICAgICAg fQogICAgICAgICAgICAgaWYgKGRlbHRhWCAhPSAwKSB7CiAgICAgICAgICAgICAgICAgZGVsdGFY ICo9IHNjcm9sbFdoZWVsTXVsdGlwbGllcigpOwotICAgICAgICAgICAgICAgIGltbWVkaWF0ZVNj cm9sbEJ5RGVsdGFYKGRlbHRhWCk7CisgICAgICAgICAgICAgICAgaW1tZWRpYXRlU2Nyb2xsQnko RmxvYXRTaXplKGRlbHRhWCwgMCkpOwogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2Ugewog ICAgICAgICAgICAgaWYgKCFhbGxvd3NIb3Jpem9udGFsU3RyZXRjaGluZygpKSB7CkBAIC0xMjE4 LDcgKzEyMDksNyBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjpzbW9vdGhTY3JvbGxXaXRoRXZl bnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZQogICAgICAgICAgICAgICAgIGRl bHRhWCAqPSBzY3JvbGxXaGVlbE11bHRpcGxpZXIoKTsKIAogICAgICAgICAgICAgICAgIG1fc2Ny b2xsYWJsZUFyZWEtPnNldENvbnN0cmFpbnNTY3JvbGxpbmdUb0NvbnRlbnRFZGdlKGZhbHNlKTsK LSAgICAgICAgICAgICAgICBpbW1lZGlhdGVTY3JvbGxCeURlbHRhWChkZWx0YVgpOworICAgICAg ICAgICAgICAgIGltbWVkaWF0ZVNjcm9sbEJ5KEZsb2F0U2l6ZShkZWx0YVgsIDApKTsKICAgICAg ICAgICAgICAgICBtX3Njcm9sbGFibGVBcmVhLT5zZXRDb25zdHJhaW5zU2Nyb2xsaW5nVG9Db250 ZW50RWRnZSh0cnVlKTsKIAogICAgICAgICAgICAgICAgIGRlbHRhWCA9IDA7CkBAIC0xMjMxLDcg KzEyMjIsNyBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjpzbW9vdGhTY3JvbGxXaXRoRXZlbnQo Y29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZQogICAgICAgICAgICAgICAgIGRlbHRh WSAqPSBzY3JvbGxXaGVlbE11bHRpcGxpZXIoKTsKIAogICAgICAgICAgICAgICAgIG1fc2Nyb2xs YWJsZUFyZWEtPnNldENvbnN0cmFpbnNTY3JvbGxpbmdUb0NvbnRlbnRFZGdlKGZhbHNlKTsKLSAg ICAgICAgICAgICAgICBpbW1lZGlhdGVTY3JvbGxCeURlbHRhWShkZWx0YVkpOworICAgICAgICAg ICAgICAgIGltbWVkaWF0ZVNjcm9sbEJ5KEZsb2F0U2l6ZSgwLCBkZWx0YVkpKTsKICAgICAgICAg ICAgICAgICBtX3Njcm9sbGFibGVBcmVhLT5zZXRDb25zdHJhaW5zU2Nyb2xsaW5nVG9Db250ZW50 RWRnZSh0cnVlKTsKIAogICAgICAgICAgICAgICAgIGRlbHRhWSA9IDA7CkBAIC0xMjU2LDcgKzEy NDcsNyBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjpzbW9vdGhTY3JvbGxXaXRoRXZlbnQoY29u c3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZQogCiAgICAgICAgICAgICBpZiAob3JpZ09y aWdpbiAhPSBuZXdPcmlnaW4pIHsKICAgICAgICAgICAgICAgICBtX3Njcm9sbGFibGVBcmVhLT5z ZXRDb25zdHJhaW5zU2Nyb2xsaW5nVG9Db250ZW50RWRnZShmYWxzZSk7Ci0gICAgICAgICAgICAg ICAgaW1tZWRpYXRlU2Nyb2xsVG9Qb2ludChuZXdPcmlnaW4pOworICAgICAgICAgICAgICAgIGlt bWVkaWF0ZVNjcm9sbFRvKG5ld09yaWdpbik7CiAgICAgICAgICAgICAgICAgbV9zY3JvbGxhYmxl QXJlYS0+c2V0Q29uc3RyYWluc1Njcm9sbGluZ1RvQ29udGVudEVkZ2UodHJ1ZSk7CiAgICAgICAg ICAgICB9CiAgICAgICAgIH0KQEAgLTEzNjgsNyArMTM1OSw3IEBAIHZvaWQgU2Nyb2xsQW5pbWF0 b3JNYWM6OnNuYXBSdWJiZXJCYW5kVGltZXJGaXJlZChUaW1lcjxTY3JvbGxBbmltYXRvck1hYz4q KQogICAgICAgICAgICAgRmxvYXRQb2ludCBuZXdPcmlnaW4gPSBtX3Njcm9sbEVsYXN0aWNpdHlD b250cm9sbGVyLm1fb3JpZ09yaWdpbiArIGRlbHRhOwogCiAgICAgICAgICAgICBtX3Njcm9sbGFi bGVBcmVhLT5zZXRDb25zdHJhaW5zU2Nyb2xsaW5nVG9Db250ZW50RWRnZShmYWxzZSk7Ci0gICAg ICAgICAgICBpbW1lZGlhdGVTY3JvbGxUb1BvaW50KG5ld09yaWdpbik7CisgICAgICAgICAgICBp bW1lZGlhdGVTY3JvbGxUbyhuZXdPcmlnaW4pOwogICAgICAgICAgICAgbV9zY3JvbGxhYmxlQXJl YS0+c2V0Q29uc3RyYWluc1Njcm9sbGluZ1RvQ29udGVudEVkZ2UodHJ1ZSk7CiAKICAgICAgICAg ICAgIEZsb2F0U2l6ZSBuZXdTdHJldGNoID0gbV9zY3JvbGxhYmxlQXJlYS0+b3ZlcmhhbmdBbW91 bnQoKTsKQEAgLTEzNzYsNyArMTM2Nyw3IEBAIHZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6OnNuYXBS dWJiZXJCYW5kVGltZXJGaXJlZChUaW1lcjxTY3JvbGxBbmltYXRvck1hYz4qKQogICAgICAgICAg ICAgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5tX3N0cmV0Y2hTY3JvbGxGb3JjZS5zZXRX aWR0aChyZWJvdW5kRGVsdGFGb3JFbGFzdGljRGVsdGEobmV3U3RyZXRjaC53aWR0aCgpKSk7CiAg ICAgICAgICAgICBtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fc3RyZXRjaFNjcm9sbEZv cmNlLnNldEhlaWdodChyZWJvdW5kRGVsdGFGb3JFbGFzdGljRGVsdGEobmV3U3RyZXRjaC5oZWln aHQoKSkpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgaW1tZWRpYXRlU2Nyb2xsVG9Q b2ludChtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fb3JpZ09yaWdpbik7CisgICAgICAg ICAgICBpbW1lZGlhdGVTY3JvbGxUbyhtX3Njcm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLm1fb3Jp Z09yaWdpbik7CiAKICAgICAgICAgICAgIG1fc25hcFJ1YmJlckJhbmRUaW1lci5zdG9wKCk7CiAK