74146 2011-12-08 17:21:31 -0800 Add scrollAnimator getter method to WebScrollbarPainterDelegate 2011-12-08 17:35:32 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 517961 0 andersca 2011-12-08 17:21:31 -0800 Add scrollAnimator getter method to WebScrollbarPainterDelegate 517962 1 118499 andersca 2011-12-08 17:21:49 -0800 Created attachment 118499 Patch 517974 2 andersca 2011-12-08 17:35:32 -0800 Committed r102406: <http://trac.webkit.org/changeset/102406> 118499 2011-12-08 17:21:49 -0800 2011-12-08 17:29:11 -0800 Patch bug-74146-20111208172301.patch text/plain 7515 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNDAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGQ3OGFiYzQ4MWQ2NTM4 ODk0NDNlOTdiODA3ZDhiMzgzZWM3MGNhNC4uOTA3NjBkOTc2MGExZmE4ZWQ5YzBjMzk0ZWFiN2Iy Mzg0NWNmY2UwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDExLTEyLTA4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRkIHNjcm9sbEFu aW1hdG9yIGdldHRlciBtZXRob2QgdG8gV2ViU2Nyb2xsYmFyUGFpbnRlckRlbGVnYXRlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDE0NgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4g KE9PUFMhKQorCisgICAgICAgICogcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tOgor ICAgICAgICAoLVtXZWJTY3JvbGxiYXJQYWludGVyRGVsZWdhdGUgc2Nyb2xsQW5pbWF0b3JdKToK KyAgICAgICAgKC1bV2ViU2Nyb2xsYmFyUGFpbnRlckRlbGVnYXRlIGxheWVyXSk6CisgICAgICAg ICgtW1dlYlNjcm9sbGJhclBhaW50ZXJEZWxlZ2F0ZSBtb3VzZUxvY2F0aW9uSW5TY3JvbGxlckZv clNjcm9sbGVySW1wOl0pOgorICAgICAgICAoLVtXZWJTY3JvbGxiYXJQYWludGVyRGVsZWdhdGUg c2V0VXBBbHBoYUFuaW1hdGlvbjpzY3JvbGxlclBhaW50ZXI6cGFydDpXZWJDb3JlOjphbmltYXRl QWxwaGFUbzpkdXJhdGlvbjpdKToKKyAgICAgICAgKC1bV2ViU2Nyb2xsYmFyUGFpbnRlckRlbGVn YXRlIHNjcm9sbGVySW1wOmFuaW1hdGVLbm9iQWxwaGFUbzpkdXJhdGlvbjpdKToKKyAgICAgICAg KC1bV2ViU2Nyb2xsYmFyUGFpbnRlckRlbGVnYXRlIHNjcm9sbGVySW1wOmFuaW1hdGVUcmFja0Fs cGhhVG86ZHVyYXRpb246XSk6CisgICAgICAgICgtW1dlYlNjcm9sbGJhclBhaW50ZXJEZWxlZ2F0 ZSBzY3JvbGxlckltcDphbmltYXRlVUlTdGF0ZVRyYW5zaXRpb25XaXRoRHVyYXRpb246XSk6CisK KzIwMTEtMTItMDggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAg ICAgICBGaXggYSBwYXN0ZS1vIGluIFNjcm9sbEFuaW1hdG9yTWFjOjp1cGRhdGVTY3JvbGxlclN0 eWxlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDE0 NQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0 b3JNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMu bW0KaW5kZXggNDM4MmIyYmFiM2U3OTMyMjczODAyOTRmZDVhNmU4ZjRmNzZlYTU3ZS4uMWIwNGFl Y2ZiNzc1YTFlN2NjMzIxYTE5YTk4MTBlODkyZjg1MmJmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQpAQCAtMzk4LDYgKzM5OCwxMSBA QCBlbnVtIEZlYXR1cmVUb0FuaW1hdGUgewogICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlM7 CiB9CiAKKy0gKFNjcm9sbEFuaW1hdG9yTWFjKilzY3JvbGxBbmltYXRvcgoreworICAgIHJldHVy biBfYW5pbWF0b3I7Cit9CisKIC0gKE5TUmVjdCljb252ZXJ0UmVjdFRvQmFja2luZzooTlNSZWN0 KWFSZWN0CiB7CiAgICAgcmV0dXJuIGFSZWN0OwpAQCAtNDEwLDkgKzQxNSwxMSBAQCBlbnVtIEZl YXR1cmVUb0FuaW1hdGUgewogCiAtIChDQUxheWVyICopbGF5ZXIKIHsKLSAgICBpZiAoIV9hbmlt YXRvcikKKyAgICBTY3JvbGxBbmltYXRvck1hYyogYW5pbWF0b3IgPSBbc2VsZiBzY3JvbGxBbmlt YXRvcl07CisgICAgaWYgKCFhbmltYXRvcikKICAgICAgICAgcmV0dXJuIG5pbDsKLSAgICBpZiAo IV9hbmltYXRvci0+aXNEcmF3aW5nSW50b0xheWVyKCkpCisKKyAgICBpZiAoIWFuaW1hdG9yLT5p c0RyYXdpbmdJbnRvTGF5ZXIoKSkKICAgICAgICAgcmV0dXJuIG5pbDsKIAogICAgIC8vIEZJWE1F OiBUaGlzIHNob3VsZCBhdHRlbXB0IHRvIHJldHVybiBhbiBhY3R1YWwgbGF5ZXIuCkBAIC00MjIs MzggKzQyOSwzOCBAQCBlbnVtIEZlYXR1cmVUb0FuaW1hdGUgewogCiAtIChOU1BvaW50KW1vdXNl TG9jYXRpb25JblNjcm9sbGVyRm9yU2Nyb2xsZXJJbXA6KGlkKXNjcm9sbGVySW1wCiB7Ci0gICAg aWYgKCFfYW5pbWF0b3IpCisgICAgaWYgKCFbc2VsZiBzY3JvbGxBbmltYXRvcl0pCiAgICAgICAg IHJldHVybiBOU1plcm9Qb2ludDsKIAogICAgIFNjcm9sbGJhclBhaW50ZXIgc2Nyb2xsZXJQYWlu dGVyID0gKFNjcm9sbGJhclBhaW50ZXIpc2Nyb2xsZXJJbXA7CiAgICAgU2Nyb2xsYmFyKiBzY3Jv bGxiYXI7CiAgICAgaWYgKFtzY3JvbGxlclBhaW50ZXIgaXNIb3Jpem9udGFsXSkKLSAgICAgICAg c2Nyb2xsYmFyID0gX2FuaW1hdG9yLT5zY3JvbGxhYmxlQXJlYSgpLT5ob3Jpem9udGFsU2Nyb2xs YmFyKCk7CisgICAgICAgIHNjcm9sbGJhciA9IFtzZWxmIHNjcm9sbEFuaW1hdG9yXS0+c2Nyb2xs YWJsZUFyZWEoKS0+aG9yaXpvbnRhbFNjcm9sbGJhcigpOwogICAgIGVsc2UgCi0gICAgICAgIHNj cm9sbGJhciA9IF9hbmltYXRvci0+c2Nyb2xsYWJsZUFyZWEoKS0+dmVydGljYWxTY3JvbGxiYXIo KTsKKyAgICAgICAgc2Nyb2xsYmFyID0gW3NlbGYgc2Nyb2xsQW5pbWF0b3JdLT5zY3JvbGxhYmxl QXJlYSgpLT52ZXJ0aWNhbFNjcm9sbGJhcigpOwogCiAgICAgaWYgKCFzY3JvbGxiYXIpCiAgICAg ICAgIHJldHVybiBOU1plcm9Qb2ludDsKIAotICAgIHJldHVybiBzY3JvbGxiYXItPmNvbnZlcnRG cm9tQ29udGFpbmluZ1ZpZXcoX2FuaW1hdG9yLT5zY3JvbGxhYmxlQXJlYSgpLT5jdXJyZW50TW91 c2VQb3NpdGlvbigpKTsKKyAgICByZXR1cm4gc2Nyb2xsYmFyLT5jb252ZXJ0RnJvbUNvbnRhaW5p bmdWaWV3KFtzZWxmIHNjcm9sbEFuaW1hdG9yXS0+c2Nyb2xsYWJsZUFyZWEoKS0+Y3VycmVudE1v dXNlUG9zaXRpb24oKSk7CiB9CiAKIC0gKHZvaWQpc2V0VXBBbHBoYUFuaW1hdGlvbjooUmV0YWlu UHRyPFdlYlNjcm9sbGJhclBhcnRBbmltYXRpb24+JilzY3JvbGxiYXJQYXJ0QW5pbWF0aW9uIHNj cm9sbGVyUGFpbnRlcjooU2Nyb2xsYmFyUGFpbnRlcilzY3JvbGxlclBhaW50ZXIgcGFydDooV2Vi Q29yZTo6U2Nyb2xsYmFyUGFydClwYXJ0IGFuaW1hdGVBbHBoYVRvOihDR0Zsb2F0KW5ld0FscGhh IGR1cmF0aW9uOihOU1RpbWVJbnRlcnZhbClkdXJhdGlvbgogewogICAgIC8vIElmIHRoZSB1c2Vy IGhhcyBzY3JvbGxlZCB0aGUgcGFnZSwgdGhlbiB0aGUgc2Nyb2xsYmFycyBtdXN0IGJlIGFuaW1h dGVkIGhlcmUuIAogICAgIC8vIFRoaXMgb3ZlcnJpZGVzIHRoZSBlYXJseSByZXR1cm5zLgotICAg IGJvb2wgbXVzdEFuaW1hdGUgPSBfYW5pbWF0b3ItPmhhdmVTY3JvbGxlZFNpbmNlUGFnZUxvYWQo KTsKKyAgICBib29sIG11c3RBbmltYXRlID0gW3NlbGYgc2Nyb2xsQW5pbWF0b3JdLT5oYXZlU2Ny b2xsZWRTaW5jZVBhZ2VMb2FkKCk7CiAKLSAgICBpZiAoX2FuaW1hdG9yLT5zY3JvbGxiYXJQYWlu dFRpbWVySXNBY3RpdmUoKSAmJiAhbXVzdEFuaW1hdGUpCisgICAgaWYgKFtzZWxmIHNjcm9sbEFu aW1hdG9yXS0+c2Nyb2xsYmFyUGFpbnRUaW1lcklzQWN0aXZlKCkgJiYgIW11c3RBbmltYXRlKQog ICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoX2FuaW1hdG9yLT5zY3JvbGxhYmxlQXJlYSgpLT5z aG91bGRTdXNwZW5kU2Nyb2xsQW5pbWF0aW9ucygpICYmICFtdXN0QW5pbWF0ZSkgewotICAgICAg ICBfYW5pbWF0b3ItPnN0YXJ0U2Nyb2xsYmFyUGFpbnRUaW1lcigpOworICAgIGlmIChbc2VsZiBz Y3JvbGxBbmltYXRvcl0tPnNjcm9sbGFibGVBcmVhKCktPnNob3VsZFN1c3BlbmRTY3JvbGxBbmlt YXRpb25zKCkgJiYgIW11c3RBbmltYXRlKSB7CisgICAgICAgIFtzZWxmIHNjcm9sbEFuaW1hdG9y XS0+c3RhcnRTY3JvbGxiYXJQYWludFRpbWVyKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAK ICAgICAvLyBBdCB0aGlzIHBvaW50LCB3ZSBhcmUgZGVmaW5pdGVseSBnb2luZyB0byBhbmltYXRl IG5vdywgc28gc3RvcCB0aGUgdGltZXIuCi0gICAgX2FuaW1hdG9yLT5zdG9wU2Nyb2xsYmFyUGFp bnRUaW1lcigpOworICAgIFtzZWxmIHNjcm9sbEFuaW1hdG9yXS0+c3RvcFNjcm9sbGJhclBhaW50 VGltZXIoKTsKIAogICAgIC8vIElmIHdlIGFyZSBjdXJyZW50bHkgYW5pbWF0aW5nLCBzdG9wCiAg ICAgaWYgKHNjcm9sbGJhclBhcnRBbmltYXRpb24pIHsKQEAgLTQ2NCwxNiArNDcxLDE2IEBAIGVu dW0gRmVhdHVyZVRvQW5pbWF0ZSB7CiAgICAgaWYgKHBhcnQgPT0gV2ViQ29yZTo6VGh1bWJQYXJ0 ICYmICFbc2Nyb2xsZXJQYWludGVyIGlzSG9yaXpvbnRhbF0pIHsKICAgICAgICAgaWYgKG5ld0Fs cGhhID09IDEpIHsKICAgICAgICAgICAgIEludFJlY3QgdGh1bWJSZWN0ID0gSW50UmVjdChbc2Ny b2xsZXJQYWludGVyIHJlY3RGb3JQYXJ0Ok5TU2Nyb2xsZXJLbm9iXSk7Ci0gICAgICAgICAgICBf YW5pbWF0b3ItPnNldFZpc2libGVTY3JvbGxlclRodW1iUmVjdCh0aHVtYlJlY3QpOworICAgICAg ICAgICAgW3NlbGYgc2Nyb2xsQW5pbWF0b3JdLT5zZXRWaXNpYmxlU2Nyb2xsZXJUaHVtYlJlY3Qo dGh1bWJSZWN0KTsKICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBfYW5pbWF0b3ItPnNldFZp c2libGVTY3JvbGxlclRodW1iUmVjdChJbnRSZWN0KCkpOworICAgICAgICAgICAgW3NlbGYgc2Ny b2xsQW5pbWF0b3JdLT5zZXRWaXNpYmxlU2Nyb2xsZXJUaHVtYlJlY3QoSW50UmVjdCgpKTsKICAg ICB9CiAKICAgICBbTlNBbmltYXRpb25Db250ZXh0IGJlZ2luR3JvdXBpbmddOwogICAgIFtbTlNB bmltYXRpb25Db250ZXh0IGN1cnJlbnRDb250ZXh0XSBzZXREdXJhdGlvbjpkdXJhdGlvbl07CiAg ICAgc2Nyb2xsYmFyUGFydEFuaW1hdGlvbi5hZG9wdE5TKFtbV2ViU2Nyb2xsYmFyUGFydEFuaW1h dGlvbiBhbGxvY10gaW5pdFdpdGhTY3JvbGxiYXJQYWludGVyOnNjcm9sbGVyUGFpbnRlciAKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgYW5pbWF0ZTpwYXJ0ID09IFRodW1iUGFydCA/IFRodW1iQWxwaGEgOiBUcmFja0Fs cGhhCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHNjcm9sbEFuaW1hdG9yOl9hbmltYXRvcgorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzY3Jv bGxBbmltYXRvcjpbc2VsZiBzY3JvbGxBbmltYXRvcl0KICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYW5pbWF0ZUZyb206 cGFydCA9PSBUaHVtYlBhcnQgPyBbc2Nyb2xsZXJQYWludGVyIGtub2JBbHBoYV0gOiBbc2Nyb2xs ZXJQYWludGVyIHRyYWNrQWxwaGFdCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFuaW1hdGVUbzpuZXdBbHBoYSAKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZHVyYXRpb246ZHVyYXRpb25dKTsKQEAgLTQ4NCw3ICs0OTEsNyBAQCBlbnVtIEZl YXR1cmVUb0FuaW1hdGUgewogCiAtICh2b2lkKXNjcm9sbGVySW1wOihpZClzY3JvbGxlckltcCBh bmltYXRlS25vYkFscGhhVG86KENHRmxvYXQpbmV3S25vYkFscGhhIGR1cmF0aW9uOihOU1RpbWVJ bnRlcnZhbClkdXJhdGlvbgogewotICAgIGlmICghX2FuaW1hdG9yKQorICAgIGlmICghW3NlbGYg c2Nyb2xsQW5pbWF0b3JdKQogICAgICAgICByZXR1cm47CiAKICAgICBTY3JvbGxiYXJQYWludGVy IHNjcm9sbGVyUGFpbnRlciA9IChTY3JvbGxiYXJQYWludGVyKXNjcm9sbGVySW1wOwpAQCAtNDk2 LDcgKzUwMyw3IEBAIGVudW0gRmVhdHVyZVRvQW5pbWF0ZSB7CiAKIC0gKHZvaWQpc2Nyb2xsZXJJ bXA6KGlkKXNjcm9sbGVySW1wIGFuaW1hdGVUcmFja0FscGhhVG86KENHRmxvYXQpbmV3VHJhY2tB bHBoYSBkdXJhdGlvbjooTlNUaW1lSW50ZXJ2YWwpZHVyYXRpb24KIHsKLSAgICBpZiAoIV9hbmlt YXRvcikKKyAgICBpZiAoIVtzZWxmIHNjcm9sbEFuaW1hdG9yXSkKICAgICAgICAgcmV0dXJuOwog CiAgICAgU2Nyb2xsYmFyUGFpbnRlciBzY3JvbGxlclBhaW50ZXIgPSAoU2Nyb2xsYmFyUGFpbnRl cilzY3JvbGxlckltcDsKQEAgLTUwOCw3ICs1MTUsNyBAQCBlbnVtIEZlYXR1cmVUb0FuaW1hdGUg ewogCiAtICh2b2lkKXNjcm9sbGVySW1wOihpZClzY3JvbGxlckltcCBhbmltYXRlVUlTdGF0ZVRy YW5zaXRpb25XaXRoRHVyYXRpb246KE5TVGltZUludGVydmFsKWR1cmF0aW9uCiB7Ci0gICAgaWYg KCFfYW5pbWF0b3IpCisgICAgaWYgKCFbc2VsZiBzY3JvbGxBbmltYXRvcl0pCiAgICAgICAgIHJl dHVybjsKIAogICAgIGlmICghc3VwcG9ydHNVSVN0YXRlVHJhbnNpdGlvblByb2dyZXNzKCkpCkBA IC01MjUsNyArNTMyLDcgQEAgZW51bSBGZWF0dXJlVG9BbmltYXRlIHsKICAgICBpZiAoIXNjcm9s bGJhclBhcnRBbmltYXRpb24pIHsKICAgICAgICAgc2Nyb2xsYmFyUGFydEFuaW1hdGlvbi5hZG9w dE5TKFtbV2ViU2Nyb2xsYmFyUGFydEFuaW1hdGlvbiBhbGxvY10gaW5pdFdpdGhTY3JvbGxiYXJQ YWludGVyOnNjcm9sbGVyUGFpbnRlciAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYW5pbWF0ZTpVSVN0YXRlVHJhbnNp dGlvbgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzY3JvbGxBbmltYXRvcjpfYW5pbWF0b3IKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2Ny b2xsQW5pbWF0b3I6W3NlbGYgc2Nyb2xsQW5pbWF0b3JdCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFuaW1hdGVGcm9t OltzY3JvbGxlclBhaW50ZXIgdWlTdGF0ZVRyYW5zaXRpb25Qcm9ncmVzc10KICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg YW5pbWF0ZVRvOjEuMCAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZHVyYXRpb246ZHVyYXRpb25dKTsK