74204 2011-12-09 12:57:50 -0800 WebScrollbarPainterControllerDelegate should know about the ScrollableArea, not the ScrollAnimatorMac 2011-12-09 13:08:19 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 518431 0 andersca 2011-12-09 12:57:50 -0800 WebScrollbarPainterControllerDelegate should know about the ScrollableArea, not the ScrollAnimatorMac 518432 1 118619 andersca 2011-12-09 13:00:53 -0800 Created attachment 118619 Patch 518434 2 andersca 2011-12-09 13:08:19 -0800 Committed r102467: <http://trac.webkit.org/changeset/102467> 118619 2011-12-09 13:00:53 -0800 2011-12-09 13:02:38 -0800 Patch bug-74204-20111209130211.patch text/plain 6666 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNDYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTQ4NTg5NGUwZTJhYTE3 ZWU1MThlZTkxNzU3NzQ3MGJkMWY2YmY5Mi4uZWY3NmM3ZWZkNDk2MjBiMzU2NWQ5OWVkYmQ4Yzhh MDcxMmFhMTFmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDExLTEyLTA5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViU2Nyb2xsYmFy UGFpbnRlckNvbnRyb2xsZXJEZWxlZ2F0ZSBzaG91bGQga25vdyBhYm91dCB0aGUgU2Nyb2xsYWJs ZUFyZWEsIG5vdCB0aGUgU2Nyb2xsQW5pbWF0b3JNYWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0MjA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgSXQgbWFrZXMgbW9yZSBsb2dpY2FsIHNlbnNlIHRvIGFz c29jaWF0ZSB0aGUgV2ViU2Nyb2xsYmFyUGFpbnRlckNvbnRyb2xsZXJEZWxlZ2F0ZSBvYmplY3Qg d2l0aCBpdHMgU2Nyb2xsYWJsZUFyZWEsIHNpbmNlCisgICAgICAgIHBhaW50aW5nIGhhcyBub3Ro aW5nIHRvIGRvIHdpdGggYW5pbWF0aW9uLgorCisgICAgICAgICogcGxhdGZvcm0vbWFjL1Njcm9s bEFuaW1hdG9yTWFjLm1tOgorICAgICAgICAoLVtXZWJTY3JvbGxiYXJQYWludGVyQ29udHJvbGxl ckRlbGVnYXRlIGluaXRXaXRoU2Nyb2xsYWJsZUFyZWE6XSk6CisgICAgICAgICgtW1dlYlNjcm9s bGJhclBhaW50ZXJDb250cm9sbGVyRGVsZWdhdGUgaW52YWxpZGF0ZV0pOgorICAgICAgICAoLVtX ZWJTY3JvbGxiYXJQYWludGVyQ29udHJvbGxlckRlbGVnYXRlIGNvbnRlbnRBcmVhUmVjdEZvclNj cm9sbGVySW1wUGFpcjpdKToKKyAgICAgICAgKC1bV2ViU2Nyb2xsYmFyUGFpbnRlckNvbnRyb2xs ZXJEZWxlZ2F0ZSBpbkxpdmVSZXNpemVGb3JTY3JvbGxlckltcFBhaXI6XSk6CisgICAgICAgICgt W1dlYlNjcm9sbGJhclBhaW50ZXJDb250cm9sbGVyRGVsZWdhdGUgbW91c2VMb2NhdGlvbkluQ29u dGVudEFyZWFGb3JTY3JvbGxlckltcFBhaXI6XSk6CisgICAgICAgICgtW1dlYlNjcm9sbGJhclBh aW50ZXJDb250cm9sbGVyRGVsZWdhdGUgc2Nyb2xsZXJJbXBQYWlyOmNvbnZlcnRDb250ZW50UG9p bnQ6dG9TY3JvbGxlckltcDpdKToKKyAgICAgICAgKC1bV2ViU2Nyb2xsYmFyUGFpbnRlckNvbnRy b2xsZXJEZWxlZ2F0ZSBzY3JvbGxlckltcFBhaXI6dXBkYXRlU2Nyb2xsZXJTdHlsZUZvck5ld1Jl Y29tbWVuZGVkU2Nyb2xsZXJTdHlsZTpdKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1h dG9yTWFjOjpTY3JvbGxBbmltYXRvck1hYyk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmlt YXRvck1hYzo6flNjcm9sbEFuaW1hdG9yTWFjKToKKworMjAxMS0xMi0wOSAgQW5kZXJzIENhcmxz c29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIFJlbW92ZSBkdXBsaWNhdGUgYW5p bWF0aW9uIGl2YXJzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD03NDE5NAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Ny b2xsQW5pbWF0b3JNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5p bWF0b3JNYWMubW0KaW5kZXggODBiNzQ0MDUwMTY2YTUxOTg5MTJmODczMmQzZTJlMjVmMjBhNDRm Mi4uNWNiNDZiYjk2MzQxNDQ2ZDYxYWY4ZDg5ZWY2OTc3MDhjNTFkNjNmZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQpAQCAtMTc2LDY3 ICsxNzYsNjcgQEAgc3RhdGljIE5TU2l6ZSBhYnMoTlNTaXplIHNpemUpCiAKIEBpbnRlcmZhY2Ug V2ViU2Nyb2xsYmFyUGFpbnRlckNvbnRyb2xsZXJEZWxlZ2F0ZSA6IE5TT2JqZWN0CiB7Ci0gICAg V2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3JNYWMqIF9hbmltYXRvcjsKKyAgICBTY3JvbGxhYmxlQXJl YSogX3Njcm9sbGFibGVBcmVhOwogfQotLSAoaWQpaW5pdFdpdGhTY3JvbGxBbmltYXRvcjooV2Vi Q29yZTo6U2Nyb2xsQW5pbWF0b3JNYWMqKXNjcm9sbEFuaW1hdG9yOworLSAoaWQpaW5pdFdpdGhT Y3JvbGxhYmxlQXJlYTooU2Nyb2xsYWJsZUFyZWEqKXNjcm9sbGFibGVBcmVhOwogQGVuZAogCiBA aW1wbGVtZW50YXRpb24gV2ViU2Nyb2xsYmFyUGFpbnRlckNvbnRyb2xsZXJEZWxlZ2F0ZQogCi0t IChpZClpbml0V2l0aFNjcm9sbEFuaW1hdG9yOihXZWJDb3JlOjpTY3JvbGxBbmltYXRvck1hYyop c2Nyb2xsQW5pbWF0b3IKKy0gKGlkKWluaXRXaXRoU2Nyb2xsYWJsZUFyZWE6KFNjcm9sbGFibGVB cmVhKilzY3JvbGxhYmxlQXJlYQogewogICAgIHNlbGYgPSBbc3VwZXIgaW5pdF07CiAgICAgaWYg KCFzZWxmKQogICAgICAgICByZXR1cm4gbmlsOwogICAgIAotICAgIF9hbmltYXRvciA9IHNjcm9s bEFuaW1hdG9yOworICAgIF9zY3JvbGxhYmxlQXJlYSA9IHNjcm9sbGFibGVBcmVhOwogICAgIHJl dHVybiBzZWxmOwogfQogCi0tICh2b2lkKXNjcm9sbEFuaW1hdG9yRGVzdHJveWVkCistICh2b2lk KWludmFsaWRhdGUKIHsKLSAgICBfYW5pbWF0b3IgPSAwOworICAgIF9zY3JvbGxhYmxlQXJlYSA9 IDA7CiB9CiAKIC0gKE5TUmVjdCljb250ZW50QXJlYVJlY3RGb3JTY3JvbGxlckltcFBhaXI6KGlk KXNjcm9sbGVySW1wUGFpcgogewogICAgIFVOVVNFRF9QQVJBTShzY3JvbGxlckltcFBhaXIpOwot ICAgIGlmICghX2FuaW1hdG9yKQorICAgIGlmICghX3Njcm9sbGFibGVBcmVhKQogICAgICAgICBy ZXR1cm4gTlNaZXJvUmVjdDsKIAotICAgIFdlYkNvcmU6OkludFNpemUgY29udGVudHNTaXplID0g X2FuaW1hdG9yLT5zY3JvbGxhYmxlQXJlYSgpLT5jb250ZW50c1NpemUoKTsKKyAgICBXZWJDb3Jl OjpJbnRTaXplIGNvbnRlbnRzU2l6ZSA9IF9zY3JvbGxhYmxlQXJlYS0+Y29udGVudHNTaXplKCk7 CiAgICAgcmV0dXJuIE5TTWFrZVJlY3QoMCwgMCwgY29udGVudHNTaXplLndpZHRoKCksIGNvbnRl bnRzU2l6ZS5oZWlnaHQoKSk7CiB9CiAKIC0gKEJPT0wpaW5MaXZlUmVzaXplRm9yU2Nyb2xsZXJJ bXBQYWlyOihpZClzY3JvbGxlckltcFBhaXIKIHsKICAgICBVTlVTRURfUEFSQU0oc2Nyb2xsZXJJ bXBQYWlyKTsKLSAgICBpZiAoIV9hbmltYXRvcikKKyAgICBpZiAoIV9zY3JvbGxhYmxlQXJlYSkK ICAgICAgICAgcmV0dXJuIE5POwogCi0gICAgcmV0dXJuIF9hbmltYXRvci0+c2Nyb2xsYWJsZUFy ZWEoKS0+aW5MaXZlUmVzaXplKCk7CisgICAgcmV0dXJuIF9zY3JvbGxhYmxlQXJlYS0+aW5MaXZl UmVzaXplKCk7CiB9CiAKIC0gKE5TUG9pbnQpbW91c2VMb2NhdGlvbkluQ29udGVudEFyZWFGb3JT Y3JvbGxlckltcFBhaXI6KGlkKXNjcm9sbGVySW1wUGFpcgogewogICAgIFVOVVNFRF9QQVJBTShz Y3JvbGxlckltcFBhaXIpOwotICAgIGlmICghX2FuaW1hdG9yKQorICAgIGlmICghX3Njcm9sbGFi bGVBcmVhKQogICAgICAgICByZXR1cm4gTlNaZXJvUG9pbnQ7CiAKLSAgICByZXR1cm4gX2FuaW1h dG9yLT5zY3JvbGxhYmxlQXJlYSgpLT5jdXJyZW50TW91c2VQb3NpdGlvbigpOworICAgIHJldHVy biBfc2Nyb2xsYWJsZUFyZWEtPmN1cnJlbnRNb3VzZVBvc2l0aW9uKCk7CiB9CiAKIC0gKE5TUG9p bnQpc2Nyb2xsZXJJbXBQYWlyOihpZClzY3JvbGxlckltcFBhaXIgY29udmVydENvbnRlbnRQb2lu dDooTlNQb2ludClwb2ludEluQ29udGVudEFyZWEgdG9TY3JvbGxlckltcDooaWQpc2Nyb2xsZXJJ bXAKIHsKICAgICBVTlVTRURfUEFSQU0oc2Nyb2xsZXJJbXBQYWlyKTsKLSAgICBpZiAoIV9hbmlt YXRvcikKKyAgICBpZiAoIV9zY3JvbGxhYmxlQXJlYSkKICAgICAgICAgcmV0dXJuIE5TWmVyb1Bv aW50OwogCiAgICAgV2ViQ29yZTo6U2Nyb2xsYmFyKiBzY3JvbGxiYXIgPSAwOwogICAgIGlmIChb c2Nyb2xsZXJJbXAgaXNIb3Jpem9udGFsXSkKLSAgICAgICAgc2Nyb2xsYmFyID0gX2FuaW1hdG9y LT5zY3JvbGxhYmxlQXJlYSgpLT5ob3Jpem9udGFsU2Nyb2xsYmFyKCk7CisgICAgICAgIHNjcm9s bGJhciA9IF9zY3JvbGxhYmxlQXJlYS0+aG9yaXpvbnRhbFNjcm9sbGJhcigpOwogICAgIGVsc2Ug Ci0gICAgICAgIHNjcm9sbGJhciA9IF9hbmltYXRvci0+c2Nyb2xsYWJsZUFyZWEoKS0+dmVydGlj YWxTY3JvbGxiYXIoKTsKKyAgICAgICAgc2Nyb2xsYmFyID0gX3Njcm9sbGFibGVBcmVhLT52ZXJ0 aWNhbFNjcm9sbGJhcigpOwogCiAgICAgLy8gSXQgaXMgcG9zc2libGUgdG8gaGF2ZSBhIG51bGwg c2Nyb2xsYmFyIGhlcmUgc2luY2UgaXQgaXMgcG9zc2libGUgZm9yIHRoaXMgZGVsZWdhdGUKICAg ICAvLyBtZXRob2QgdG8gYmUgY2FsbGVkIGJldHdlZW4gdGhlIG1vbWVudCB3aGVuIGEgc2Nyb2xs YmFyIGhhcyBiZWVuIHNldCB0byAwIGFuZCB0aGUKQEAgLTI0NSw3ICsyNDUsOSBAQCBzdGF0aWMg TlNTaXplIGFicyhOU1NpemUgc2l6ZSkKICAgICAvLyBpc3N1ZS4KICAgICBpZiAoIXNjcm9sbGJh cikKICAgICAgICAgcmV0dXJuIFdlYkNvcmU6OkludFBvaW50KCk7Ci0gICAgCisKKyAgICBBU1NF UlQoc2Nyb2xsZXJJbXAgPT0gc2Nyb2xsYmFyUGFpbnRlckZvclNjcm9sbGJhcihzY3JvbGxiYXIp KTsKKwogICAgIHJldHVybiBzY3JvbGxiYXItPmNvbnZlcnRGcm9tQ29udGFpbmluZ1ZpZXcoV2Vi Q29yZTo6SW50UG9pbnQocG9pbnRJbkNvbnRlbnRBcmVhKSk7CiB9CiAKQEAgLTI1NywxMSArMjU5 LDEyIEBAIHN0YXRpYyBOU1NpemUgYWJzKE5TU2l6ZSBzaXplKQogCiAtICh2b2lkKXNjcm9sbGVy SW1wUGFpcjooaWQpc2Nyb2xsZXJJbXBQYWlyIHVwZGF0ZVNjcm9sbGVyU3R5bGVGb3JOZXdSZWNv bW1lbmRlZFNjcm9sbGVyU3R5bGU6KE5TU2Nyb2xsZXJTdHlsZSluZXdSZWNvbW1lbmRlZFNjcm9s bGVyU3R5bGUKIHsKLSAgICBpZiAoIV9hbmltYXRvcikKKyAgICBpZiAoIV9zY3JvbGxhYmxlQXJl YSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgW3Njcm9sbGVySW1wUGFpciBzZXRTY3JvbGxlclN0 eWxlOm5ld1JlY29tbWVuZGVkU2Nyb2xsZXJTdHlsZV07Ci0gICAgX2FuaW1hdG9yLT51cGRhdGVT Y3JvbGxlclN0eWxlKCk7CisKKyAgICBzdGF0aWNfY2FzdDxTY3JvbGxBbmltYXRvck1hYyo+KF9z Y3JvbGxhYmxlQXJlYS0+c2Nyb2xsQW5pbWF0b3IoKSktPnVwZGF0ZVNjcm9sbGVyU3R5bGUoKTsK IH0KIAogQGVuZApAQCAtNTc3LDcgKzU4MCw3IEBAIFNjcm9sbEFuaW1hdG9yTWFjOjpTY3JvbGxB bmltYXRvck1hYyhTY3JvbGxhYmxlQXJlYSogc2Nyb2xsYWJsZUFyZWEpCiAgICAgbV9zY3JvbGxB bmltYXRpb25IZWxwZXIuYWRvcHROUyhbW05TQ2xhc3NGcm9tU3RyaW5nKEAiTlNTY3JvbGxBbmlt YXRpb25IZWxwZXIiKSBhbGxvY10gaW5pdFdpdGhEZWxlZ2F0ZTptX3Njcm9sbEFuaW1hdGlvbkhl bHBlckRlbGVnYXRlLmdldCgpXSk7CiAKICNpZiBVU0UoU0NST0xMQkFSX1BBSU5URVIpCi0gICAg bV9zY3JvbGxiYXJQYWludGVyQ29udHJvbGxlckRlbGVnYXRlLmFkb3B0TlMoW1tXZWJTY3JvbGxi YXJQYWludGVyQ29udHJvbGxlckRlbGVnYXRlIGFsbG9jXSBpbml0V2l0aFNjcm9sbEFuaW1hdG9y OnRoaXNdKTsKKyAgICBtX3Njcm9sbGJhclBhaW50ZXJDb250cm9sbGVyRGVsZWdhdGUuYWRvcHRO UyhbW1dlYlNjcm9sbGJhclBhaW50ZXJDb250cm9sbGVyRGVsZWdhdGUgYWxsb2NdIGluaXRXaXRo U2Nyb2xsYWJsZUFyZWE6c2Nyb2xsYWJsZUFyZWFdKTsKICAgICBtX3Njcm9sbGJhclBhaW50ZXJD b250cm9sbGVyID0gW1tbTlNDbGFzc0Zyb21TdHJpbmcoQCJOU1Njcm9sbGVySW1wUGFpciIpIGFs bG9jXSBpbml0XSBhdXRvcmVsZWFzZV07CiAgICAgW21fc2Nyb2xsYmFyUGFpbnRlckNvbnRyb2xs ZXIuZ2V0KCkgc2V0RGVsZWdhdGU6bV9zY3JvbGxiYXJQYWludGVyQ29udHJvbGxlckRlbGVnYXRl LmdldCgpXTsKICAgICBbbV9zY3JvbGxiYXJQYWludGVyQ29udHJvbGxlci5nZXQoKSBzZXRTY3Jv bGxlclN0eWxlOndrUmVjb21tZW5kZWRTY3JvbGxlclN0eWxlKCldOwpAQCAtNTg4LDcgKzU5MSw3 IEBAIFNjcm9sbEFuaW1hdG9yTWFjOjp+U2Nyb2xsQW5pbWF0b3JNYWMoKQogewogI2lmIFVTRShT Q1JPTExCQVJfUEFJTlRFUikKICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlM7Ci0gICAg W21fc2Nyb2xsYmFyUGFpbnRlckNvbnRyb2xsZXJEZWxlZ2F0ZS5nZXQoKSBzY3JvbGxBbmltYXRv ckRlc3Ryb3llZF07CisgICAgW21fc2Nyb2xsYmFyUGFpbnRlckNvbnRyb2xsZXJEZWxlZ2F0ZS5n ZXQoKSBpbnZhbGlkYXRlXTsKICAgICBbbV9zY3JvbGxiYXJQYWludGVyQ29udHJvbGxlci5nZXQo KSBzZXREZWxlZ2F0ZTpuaWxdOwogICAgIFttX2hvcml6b250YWxTY3JvbGxiYXJQYWludGVyRGVs ZWdhdGUuZ2V0KCkgc2Nyb2xsQW5pbWF0b3JEZXN0cm95ZWRdOwogICAgIFttX3ZlcnRpY2FsU2Ny b2xsYmFyUGFpbnRlckRlbGVnYXRlLmdldCgpIHNjcm9sbEFuaW1hdG9yRGVzdHJveWVkXTsK