74211 2011-12-09 13:46:34 -0800 Minor cleanup in ScrollAnimatorMac.mm 2011-12-09 17:36:41 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca eric oldest_to_newest 518466 0 andersca 2011-12-09 13:46:34 -0800 Minor cleanup in ScrollAnimatorMac.mm 518468 1 118626 andersca 2011-12-09 13:48:18 -0800 Created attachment 118626 Patch 518488 2 andersca 2011-12-09 14:07:16 -0800 Committed r102474: <http://trac.webkit.org/changeset/102474> 518682 3 eric 2011-12-09 17:36:33 -0800 This broke compile on Mac Lion. :( 518683 4 eric 2011-12-09 17:36:41 -0800 http://build.webkit.org/builders/Lion%20Intel%20Release%20%28Build%29/builds/4228 118626 2011-12-09 13:48:18 -0800 2011-12-09 14:04:45 -0800 Patch bug-74211-20111209134936.patch text/plain 5134 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNDY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTY1Nzk0OTBjY2FkYTI1 YzliYzQ2ZDAxNjZiYzhmNzMwYWE3OGQ3Yy4uYmRlZDJmNmE3ZTY2YzViNGQ5MmMyOWJmYWI0Zjg0 MTU0YjQ5NmRiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDExLTEyLTA5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgTWlub3IgY2xlYW51 cCBpbiBTY3JvbGxBbmltYXRvck1hYy5tbQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NzQyMTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbToKKyAg ICAgICAgKC1bV2ViU2Nyb2xsYmFyUGFpbnRlckRlbGVnYXRlIG1vdXNlTG9jYXRpb25JblNjcm9s bGVyRm9yU2Nyb2xsZXJJbXA6XSk6CisgICAgICAgIE5vIG5lZWQgdG8gZ2V0IHRoZSBzY3JvbGxi YXIgZnJvbSB0aGUgc2Nyb2xsIGFuaW1hdG9yIGFueW1vcmUuCisKKyAgICAgICAgKC1bV2ViU2Ny b2xsYmFyUGFpbnRlckRlbGVnYXRlIHNldFVwQWxwaGFBbmltYXRpb246c2Nyb2xsZXJQYWludGVy OnBhcnQ6V2ViQ29yZTo6YW5pbWF0ZUFscGhhVG86ZHVyYXRpb246XSk6CisgICAgICAgICgtW1dl YlNjcm9sbGJhclBhaW50ZXJEZWxlZ2F0ZSBzY3JvbGxlckltcDphbmltYXRlVUlTdGF0ZVRyYW5z aXRpb25XaXRoRHVyYXRpb246XSk6CisgICAgICAgIFRyeSB0byBnZXQgZGF0YSBmcm9tIHRoZSBz Y3JvbGxiYXIgYW5kL29yIHRoZSBzY3JvbGxhYmxlIGFyZWEgaW5zdGVhZCBvZiB0aGUgc2Nyb2xs YmFyIHBhaW50ZXIuCisKKzIwMTEtMTItMDkgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKwogICAgICAgICBSZW1vdmUgTlNBbmltYXRpb25Db250ZXh0IGNhbGxzCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDIwNwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0g Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0KaW5kZXgg YWNkMzdmY2Q4ODA0YmE3N2M1MzZhMTQzN2UzMDRjZDczNTQ0NzY2Yy4uNTg5NDU1YTIwYjZmYzQw OWUwZjc4ZGZiMjZjMzJmYTdlMGY1YTZiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQpAQCAtNDI2LDE3ICs0MjYsOSBAQCBlbnVtIEZl YXR1cmVUb0FuaW1hdGUgewogICAgIGlmICghX3Njcm9sbGJhcikKICAgICAgICAgcmV0dXJuIE5T WmVyb1BvaW50OwogCi0gICAgU2Nyb2xsYmFyUGFpbnRlciBzY3JvbGxlclBhaW50ZXIgPSAoU2Ny b2xsYmFyUGFpbnRlcilzY3JvbGxlckltcDsKLSAgICBTY3JvbGxiYXIqIHNjcm9sbGJhcjsKLSAg ICBpZiAoW3Njcm9sbGVyUGFpbnRlciBpc0hvcml6b250YWxdKQotICAgICAgICBzY3JvbGxiYXIg PSBbc2VsZiBzY3JvbGxBbmltYXRvcl0tPnNjcm9sbGFibGVBcmVhKCktPmhvcml6b250YWxTY3Jv bGxiYXIoKTsKLSAgICBlbHNlIAotICAgICAgICBzY3JvbGxiYXIgPSBbc2VsZiBzY3JvbGxBbmlt YXRvcl0tPnNjcm9sbGFibGVBcmVhKCktPnZlcnRpY2FsU2Nyb2xsYmFyKCk7Ci0KLSAgICBpZiAo IXNjcm9sbGJhcikKLSAgICAgICAgcmV0dXJuIE5TWmVyb1BvaW50OworICAgIEFTU0VSVChzY3Jv bGxlckltcCA9PSBzY3JvbGxiYXJQYWludGVyRm9yU2Nyb2xsYmFyKF9zY3JvbGxiYXIpKTsKIAot ICAgIHJldHVybiBzY3JvbGxiYXItPmNvbnZlcnRGcm9tQ29udGFpbmluZ1ZpZXcoW3NlbGYgc2Ny b2xsQW5pbWF0b3JdLT5zY3JvbGxhYmxlQXJlYSgpLT5jdXJyZW50TW91c2VQb3NpdGlvbigpKTsK KyAgICByZXR1cm4gX3Njcm9sbGJhci0+Y29udmVydEZyb21Db250YWluaW5nVmlldyhfc2Nyb2xs YmFyLT5zY3JvbGxhYmxlQXJlYSgpLT5jdXJyZW50TW91c2VQb3NpdGlvbigpKTsKIH0KIAogLSAo dm9pZClzZXRVcEFscGhhQW5pbWF0aW9uOihSZXRhaW5QdHI8V2ViU2Nyb2xsYmFyUGFydEFuaW1h dGlvbj4mKXNjcm9sbGJhclBhcnRBbmltYXRpb24gc2Nyb2xsZXJQYWludGVyOihTY3JvbGxiYXJQ YWludGVyKXNjcm9sbGVyUGFpbnRlciBwYXJ0OihXZWJDb3JlOjpTY3JvbGxiYXJQYXJ0KXBhcnQg YW5pbWF0ZUFscGhhVG86KENHRmxvYXQpbmV3QWxwaGEgZHVyYXRpb246KE5TVGltZUludGVydmFs KWR1cmF0aW9uCkBAIC00NDgsNyArNDQwLDcgQEAgZW51bSBGZWF0dXJlVG9BbmltYXRlIHsKICAg ICBpZiAoW3NlbGYgc2Nyb2xsQW5pbWF0b3JdLT5zY3JvbGxiYXJQYWludFRpbWVySXNBY3RpdmUo KSAmJiAhbXVzdEFuaW1hdGUpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChbc2VsZiBzY3Jv bGxBbmltYXRvcl0tPnNjcm9sbGFibGVBcmVhKCktPnNob3VsZFN1c3BlbmRTY3JvbGxBbmltYXRp b25zKCkgJiYgIW11c3RBbmltYXRlKSB7CisgICAgaWYgKF9zY3JvbGxiYXItPnNjcm9sbGFibGVB cmVhKCktPnNob3VsZFN1c3BlbmRTY3JvbGxBbmltYXRpb25zKCkgJiYgIW11c3RBbmltYXRlKSB7 CiAgICAgICAgIFtzZWxmIHNjcm9sbEFuaW1hdG9yXS0+c3RhcnRTY3JvbGxiYXJQYWludFRpbWVy KCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC00NjIsNyArNDU0LDcgQEAgZW51bSBGZWF0 dXJlVG9BbmltYXRlIHsKICAgICAgICAgc2Nyb2xsYmFyUGFydEFuaW1hdGlvbiA9IG5pbDsKICAg ICB9CiAKLSAgICBpZiAocGFydCA9PSBXZWJDb3JlOjpUaHVtYlBhcnQgJiYgIVtzY3JvbGxlclBh aW50ZXIgaXNIb3Jpem9udGFsXSkgeworICAgIGlmIChwYXJ0ID09IFdlYkNvcmU6OlRodW1iUGFy dCAmJiBfc2Nyb2xsYmFyLT5vcmllbnRhdGlvbigpID09IFZlcnRpY2FsU2Nyb2xsYmFyKSB7CiAg ICAgICAgIGlmIChuZXdBbHBoYSA9PSAxKSB7CiAgICAgICAgICAgICBJbnRSZWN0IHRodW1iUmVj dCA9IEludFJlY3QoW3Njcm9sbGVyUGFpbnRlciByZWN0Rm9yUGFydDpOU1Njcm9sbGVyS25vYl0p OwogICAgICAgICAgICAgW3NlbGYgc2Nyb2xsQW5pbWF0b3JdLT5zZXRWaXNpYmxlU2Nyb2xsZXJU aHVtYlJlY3QodGh1bWJSZWN0KTsKQEAgLTUxMCwyMCArNTAyLDIwIEBAIGVudW0gRmVhdHVyZVRv QW5pbWF0ZSB7CiAKICAgICBBU1NFUlQoc2Nyb2xsZXJJbXAgPT0gc2Nyb2xsYmFyUGFpbnRlckZv clNjcm9sbGJhcihfc2Nyb2xsYmFyKSk7CiAKLSAgICBTY3JvbGxiYXJQYWludGVyIHNjcm9sbGVy UGFpbnRlciA9IChTY3JvbGxiYXJQYWludGVyKXNjcm9sbGVySW1wOworICAgIFNjcm9sbGJhclBh aW50ZXIgc2Nyb2xsYmFyUGFpbnRlciA9IChTY3JvbGxiYXJQYWludGVyKXNjcm9sbGVySW1wOwog CiAgICAgLy8gVUlTdGF0ZVRyYW5zaXRpb24gYWx3YXlzIGFuaW1hdGVzIHRvIDEuIEluIGNhc2Ug YW4gYW5pbWF0aW9uIGlzIGluIHByb2dyZXNzIHRoaXMgYXZvaWRzIGEgaGFyZCB0cmFuc2l0aW9u LgotICAgIFtzY3JvbGxlclBhaW50ZXIgc2V0VWlTdGF0ZVRyYW5zaXRpb25Qcm9ncmVzczoxIC0g W3Njcm9sbGVyUGFpbnRlciB1aVN0YXRlVHJhbnNpdGlvblByb2dyZXNzXV07CisgICAgW3Njcm9s bGJhclBhaW50ZXIgc2V0VWlTdGF0ZVRyYW5zaXRpb25Qcm9ncmVzczoxIC0gW3Njcm9sbGVySW1w IHVpU3RhdGVUcmFuc2l0aW9uUHJvZ3Jlc3NdXTsKIAogICAgIGlmICghX3VpU3RhdGVUcmFuc2l0 aW9uQW5pbWF0aW9uKQogICAgICAgICBfdWlTdGF0ZVRyYW5zaXRpb25BbmltYXRpb24uYWRvcHRO UyhbW1dlYlNjcm9sbGJhclBhcnRBbmltYXRpb24gYWxsb2NdIGluaXRXaXRoU2Nyb2xsYmFyOl9z Y3JvbGxiYXIgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZlYXR1cmVUb0FuaW1hdGU6VUlTdGF0 ZVRyYW5zaXRpb24KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbmltYXRlRnJvbTpbc2Ny b2xsZXJQYWludGVyIHVpU3RhdGVUcmFuc2l0aW9uUHJvZ3Jlc3NdCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgYW5pbWF0ZUZyb206W3Njcm9sbGJhclBhaW50ZXIgdWlTdGF0ZVRyYW5zaXRp b25Qcm9ncmVzc10KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFuaW1hdGVUbzoxLjAK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkdXJhdGlvbjpkdXJhdGlvbl0pOwogICAg IGVsc2UgewogICAgICAgICAvLyBJZiB3ZSBkb24ndCBuZWVkIHRvIGluaXRpYWxpemUgdGhlIGFu aW1hdGlvbiwganVzdCByZXNldCB0aGUgdmFsdWVzIGluIGNhc2UgdGhleSBoYXZlIGNoYW5nZWQu Ci0gICAgICAgIFtfdWlTdGF0ZVRyYW5zaXRpb25BbmltYXRpb24uZ2V0KCkgc2V0U3RhcnRWYWx1 ZTpbc2Nyb2xsZXJQYWludGVyIHVpU3RhdGVUcmFuc2l0aW9uUHJvZ3Jlc3NdXTsKKyAgICAgICAg W191aVN0YXRlVHJhbnNpdGlvbkFuaW1hdGlvbi5nZXQoKSBzZXRTdGFydFZhbHVlOltzY3JvbGxi YXJQYWludGVyIHVpU3RhdGVUcmFuc2l0aW9uUHJvZ3Jlc3NdXTsKICAgICAgICAgW191aVN0YXRl VHJhbnNpdGlvbkFuaW1hdGlvbi5nZXQoKSBzZXRFbmRWYWx1ZToxLjBdOwogICAgICAgICBbX3Vp U3RhdGVUcmFuc2l0aW9uQW5pbWF0aW9uLmdldCgpIHNldER1cmF0aW9uOmR1cmF0aW9uXTsKICAg ICB9Cg==