74139 2011-12-08 16:44:15 -0800 Add a scrollbarPainterForScrollbar helper function 2011-12-08 16:52:09 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 517912 0 andersca 2011-12-08 16:44:15 -0800 Add a scrollbarPainterForScrollbar helper function 517913 1 118490 andersca 2011-12-08 16:44:40 -0800 Created attachment 118490 Patch 517919 2 andersca 2011-12-08 16:52:09 -0800 Committed r102398: <http://trac.webkit.org/changeset/102398> 118490 2011-12-08 16:44:40 -0800 2011-12-08 16:46:27 -0800 Patch bug-74139-20111208164553.patch text/plain 6037 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyMzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTIzMDQwODNlNTVjMDFm ODcyMjFjNWIzNTRjZDgzNTUzMWYyNTJlNC4uNTZhNjQ0NGI0YTRlOGYxYzM0ZjE4ZmQ1ZDVhMDUx MTE3NGJmMjhjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDExLTEyLTA4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGEgc2Nyb2xs YmFyUGFpbnRlckZvclNjcm9sbGJhciBoZWxwZXIgZnVuY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0MTM5CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW06CisgICAgICAgIChtYWNT Y3JvbGxiYXJUaGVtZSk6CisgICAgICAgIChzY3JvbGxiYXJQYWludGVyRm9yU2Nyb2xsYmFyKToK KyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9yTWFjOjptb3VzZUVudGVyZWRTY3JvbGxi YXIpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3JNYWM6Om1vdXNlRXhpdGVkU2Ny b2xsYmFyKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9yTWFjOjpkaWRBZGRWZXJ0 aWNhbFNjcm9sbGJhcik6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvck1hYzo6d2ls bFJlbW92ZVZlcnRpY2FsU2Nyb2xsYmFyKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1h dG9yTWFjOjpkaWRBZGRIb3Jpem9udGFsU2Nyb2xsYmFyKToKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbEFuaW1hdG9yTWFjOjp3aWxsUmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhcik6CisKIDIwMTEt MTItMDggIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IHJldHVybiBub2RlIGNvdW50cyBvbiB0aGUgZG9jdW1lbnQgLyBkZXRhY2hl ZCByb290IGJhc2lzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Ny b2xsQW5pbWF0b3JNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5p bWF0b3JNYWMubW0KaW5kZXggNGYxNTA5ZmRjYmNiZDI3MWFmZDkyZDZhMGM1MWNmMGUwYmUxZWI2 OC4uNWU2MzA1MDM3OWY1MTU2ODk4Y2MwNzU3YjEyYjkzZjc2NjRjOTE1OCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQpAQCAtNTIsNiAr NTIsMjAgQEAgc3RhdGljIGJvb2wgc3VwcG9ydHNVSVN0YXRlVHJhbnNpdGlvblByb2dyZXNzKCkK ICAgICBzdGF0aWMgYm9vbCBnbG9iYWxTdXBwb3J0c1VJU3RhdGVUcmFuc2l0aW9uUHJvZ3Jlc3Mg PSBbTlNDbGFzc0Zyb21TdHJpbmcoQCJOU1Njcm9sbGVySW1wIikgaW5zdGFuY2VzUmVzcG9uZFRv U2VsZWN0b3I6QHNlbGVjdG9yKG1vdXNlRW50ZXJlZFNjcm9sbGVyKV07CiAgICAgcmV0dXJuIGds b2JhbFN1cHBvcnRzVUlTdGF0ZVRyYW5zaXRpb25Qcm9ncmVzczsKIH0KKworc3RhdGljIFNjcm9s bGJhclRoZW1lTWFjKiBtYWNTY3JvbGxiYXJUaGVtZSgpCit7CisgICAgU2Nyb2xsYmFyVGhlbWUq IHNjcm9sbGJhclRoZW1lID0gU2Nyb2xsYmFyVGhlbWU6OnRoZW1lKCk7CisgICAgcmV0dXJuICFz Y3JvbGxiYXJUaGVtZS0+aXNNb2NrVGhlbWUoKSA/IHN0YXRpY19jYXN0PFNjcm9sbGJhclRoZW1l TWFjKj4oc2Nyb2xsYmFyVGhlbWUpIDogMDsKK30KKworc3RhdGljIFNjcm9sbGJhclBhaW50ZXIg c2Nyb2xsYmFyUGFpbnRlckZvclNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJhcikKK3sKKyAg ICBpZiAoU2Nyb2xsYmFyVGhlbWVNYWMqIHNjcm9sbGJhclRoZW1lID0gbWFjU2Nyb2xsYmFyVGhl bWUoKSkKKyAgICAgICAgcmV0dXJuIHNjcm9sbGJhclRoZW1lLT5wYWludGVyRm9yU2Nyb2xsYmFy KHNjcm9sbGJhcik7CisKKyAgICByZXR1cm4gbmlsOworfQogI2VuZGlmCiAKIEBpbnRlcmZhY2Ug TlNPYmplY3QgKFNjcm9sbEFuaW1hdGlvbkhlbHBlckRldGFpbHMpCkBAIC01NTcsMTQgKzU3MSw2 IEBAIFBhc3NPd25QdHI8U2Nyb2xsQW5pbWF0b3I+IFNjcm9sbEFuaW1hdG9yOjpjcmVhdGUoU2Ny b2xsYWJsZUFyZWEqIHNjcm9sbGFibGVBcmVhCiAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBTY3Jv bGxBbmltYXRvck1hYyhzY3JvbGxhYmxlQXJlYSkpOwogfQogCi0jaWYgVVNFKFNDUk9MTEJBUl9Q QUlOVEVSKQotc3RhdGljIFNjcm9sbGJhclRoZW1lTWFjKiBtYWNTY3JvbGxiYXJUaGVtZSgpCi17 Ci0gICAgU2Nyb2xsYmFyVGhlbWUqIHNjcm9sbGJhclRoZW1lID0gU2Nyb2xsYmFyVGhlbWU6OnRo ZW1lKCk7Ci0gICAgcmV0dXJuICFzY3JvbGxiYXJUaGVtZS0+aXNNb2NrVGhlbWUoKSA/IHN0YXRp Y19jYXN0PFNjcm9sbGJhclRoZW1lTWFjKj4oc2Nyb2xsYmFyVGhlbWUpIDogMDsKLX0KLSNlbmRp ZgotCiBTY3JvbGxBbmltYXRvck1hYzo6U2Nyb2xsQW5pbWF0b3JNYWMoU2Nyb2xsYWJsZUFyZWEq IHNjcm9sbGFibGVBcmVhKQogICAgIDogU2Nyb2xsQW5pbWF0b3Ioc2Nyb2xsYWJsZUFyZWEpCiAj aWYgVVNFKFNDUk9MTEJBUl9QQUlOVEVSKQpAQCAtNzY1LDEwICs3NzEsOCBAQCB2b2lkIFNjcm9s bEFuaW1hdG9yTWFjOjptb3VzZUVudGVyZWRTY3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIp IGNvbnN0CiAjaWYgVVNFKFNDUk9MTEJBUl9QQUlOVEVSKQogICAgIGlmICghc3VwcG9ydHNVSVN0 YXRlVHJhbnNpdGlvblByb2dyZXNzKCkpCiAgICAgICAgIHJldHVybjsKLSAgICBpZiAoU2Nyb2xs YmFyVGhlbWVNYWMqIHRoZW1lID0gbWFjU2Nyb2xsYmFyVGhlbWUoKSkgewotICAgICAgICBTY3Jv bGxiYXJQYWludGVyIHBhaW50ZXIgPSB0aGVtZS0+cGFpbnRlckZvclNjcm9sbGJhcihzY3JvbGxi YXIpOworICAgIGlmIChTY3JvbGxiYXJQYWludGVyIHBhaW50ZXIgPSBzY3JvbGxiYXJQYWludGVy Rm9yU2Nyb2xsYmFyKHNjcm9sbGJhcikpCiAgICAgICAgIFtwYWludGVyIG1vdXNlRW50ZXJlZFNj cm9sbGVyXTsKLSAgICB9CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShzY3JvbGxiYXIpOwogI2Vu ZGlmCkBAIC03ODEsMTAgKzc4NSw4IEBAIHZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6Om1vdXNlRXhp dGVkU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKSBjb25zdAogI2lmIFVTRShTQ1JPTExC QVJfUEFJTlRFUikKICAgICBpZiAoIXN1cHBvcnRzVUlTdGF0ZVRyYW5zaXRpb25Qcm9ncmVzcygp KQogICAgICAgICByZXR1cm47Ci0gICAgaWYgKFNjcm9sbGJhclRoZW1lTWFjKiB0aGVtZSA9IG1h Y1Njcm9sbGJhclRoZW1lKCkpIHsKLSAgICAgICAgU2Nyb2xsYmFyUGFpbnRlciBwYWludGVyID0g dGhlbWUtPnBhaW50ZXJGb3JTY3JvbGxiYXIoc2Nyb2xsYmFyKTsKKyAgICBpZiAoU2Nyb2xsYmFy UGFpbnRlciBwYWludGVyID0gc2Nyb2xsYmFyUGFpbnRlckZvclNjcm9sbGJhcihzY3JvbGxiYXIp KQogICAgICAgICBbcGFpbnRlciBtb3VzZUV4aXRlZFNjcm9sbGVyXTsKLSAgICB9CiAjZWxzZQog ICAgIFVOVVNFRF9QQVJBTShzY3JvbGxiYXIpOwogI2VuZGlmCkBAIC04NTYsOCArODU4LDcgQEAg dm9pZCBTY3JvbGxBbmltYXRvck1hYzo6ZGlkRW5kU2Nyb2xsR2VzdHVyZSgpIGNvbnN0CiB2b2lk IFNjcm9sbEFuaW1hdG9yTWFjOjpkaWRBZGRWZXJ0aWNhbFNjcm9sbGJhcihTY3JvbGxiYXIqIHNj cm9sbGJhcikKIHsKICNpZiBVU0UoU0NST0xMQkFSX1BBSU5URVIpCi0gICAgaWYgKFNjcm9sbGJh clRoZW1lTWFjKiB0aGVtZSA9IG1hY1Njcm9sbGJhclRoZW1lKCkpIHsKLSAgICAgICAgU2Nyb2xs YmFyUGFpbnRlciBwYWludGVyID0gdGhlbWUtPnBhaW50ZXJGb3JTY3JvbGxiYXIoc2Nyb2xsYmFy KTsKKyAgICBpZiAoU2Nyb2xsYmFyUGFpbnRlciBwYWludGVyID0gc2Nyb2xsYmFyUGFpbnRlckZv clNjcm9sbGJhcihzY3JvbGxiYXIpKSB7CiAgICAgICAgIFtwYWludGVyIHNldERlbGVnYXRlOm1f c2Nyb2xsYmFyUGFpbnRlckRlbGVnYXRlLmdldCgpXTsKICAgICAgICAgW21fc2Nyb2xsYmFyUGFp bnRlckNvbnRyb2xsZXIuZ2V0KCkgc2V0VmVydGljYWxTY3JvbGxlckltcDpwYWludGVyXTsKICAg ICAgICAgaWYgKHNjcm9sbGFibGVBcmVhKCktPmluTGl2ZVJlc2l6ZSgpKQpAQCAtODcxLDggKzg3 Miw3IEBAIHZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6OmRpZEFkZFZlcnRpY2FsU2Nyb2xsYmFyKFNj cm9sbGJhciogc2Nyb2xsYmFyKQogdm9pZCBTY3JvbGxBbmltYXRvck1hYzo6d2lsbFJlbW92ZVZl cnRpY2FsU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQogewogI2lmIFVTRShTQ1JPTExC QVJfUEFJTlRFUikKLSAgICBpZiAoU2Nyb2xsYmFyVGhlbWVNYWMqIHRoZW1lID0gbWFjU2Nyb2xs YmFyVGhlbWUoKSkgewotICAgICAgICBTY3JvbGxiYXJQYWludGVyIHBhaW50ZXIgPSB0aGVtZS0+ cGFpbnRlckZvclNjcm9sbGJhcihzY3JvbGxiYXIpOworICAgIGlmIChTY3JvbGxiYXJQYWludGVy IHBhaW50ZXIgPSBzY3JvbGxiYXJQYWludGVyRm9yU2Nyb2xsYmFyKHNjcm9sbGJhcikpIHsKICAg ICAgICAgW3BhaW50ZXIgc2V0RGVsZWdhdGU6bmlsXTsKICAgICAgICAgW21fc2Nyb2xsYmFyUGFp bnRlckNvbnRyb2xsZXIuZ2V0KCkgc2V0VmVydGljYWxTY3JvbGxlckltcDpuaWxdOwogICAgIH0K QEAgLTg4NCw4ICs4ODQsNyBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjp3aWxsUmVtb3ZlVmVy dGljYWxTY3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIpCiB2b2lkIFNjcm9sbEFuaW1hdG9y TWFjOjpkaWRBZGRIb3Jpem9udGFsU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQogewog I2lmIFVTRShTQ1JPTExCQVJfUEFJTlRFUikKLSAgICBpZiAoU2Nyb2xsYmFyVGhlbWVNYWMqIHRo ZW1lID0gbWFjU2Nyb2xsYmFyVGhlbWUoKSkgewotICAgICAgICBTY3JvbGxiYXJQYWludGVyIHBh aW50ZXIgPSB0aGVtZS0+cGFpbnRlckZvclNjcm9sbGJhcihzY3JvbGxiYXIpOworICAgIGlmIChT Y3JvbGxiYXJQYWludGVyIHBhaW50ZXIgPSBzY3JvbGxiYXJQYWludGVyRm9yU2Nyb2xsYmFyKHNj cm9sbGJhcikpIHsKICAgICAgICAgW3BhaW50ZXIgc2V0RGVsZWdhdGU6bV9zY3JvbGxiYXJQYWlu dGVyRGVsZWdhdGUuZ2V0KCldOwogICAgICAgICBbbV9zY3JvbGxiYXJQYWludGVyQ29udHJvbGxl ci5nZXQoKSBzZXRIb3Jpem9udGFsU2Nyb2xsZXJJbXA6cGFpbnRlcl07CiAgICAgICAgIGlmIChz Y3JvbGxhYmxlQXJlYSgpLT5pbkxpdmVSZXNpemUoKSkKQEAgLTg5OSw4ICs4OTgsNyBAQCB2b2lk IFNjcm9sbEFuaW1hdG9yTWFjOjpkaWRBZGRIb3Jpem9udGFsU2Nyb2xsYmFyKFNjcm9sbGJhciog c2Nyb2xsYmFyKQogdm9pZCBTY3JvbGxBbmltYXRvck1hYzo6d2lsbFJlbW92ZUhvcml6b250YWxT Y3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIpCiB7CiAjaWYgVVNFKFNDUk9MTEJBUl9QQUlO VEVSKQotICAgIGlmIChTY3JvbGxiYXJUaGVtZU1hYyogdGhlbWUgPSBtYWNTY3JvbGxiYXJUaGVt ZSgpKSB7Ci0gICAgICAgIFNjcm9sbGJhclBhaW50ZXIgcGFpbnRlciA9IHRoZW1lLT5wYWludGVy Rm9yU2Nyb2xsYmFyKHNjcm9sbGJhcik7CisgICAgaWYgKFNjcm9sbGJhclBhaW50ZXIgcGFpbnRl ciA9IHNjcm9sbGJhclBhaW50ZXJGb3JTY3JvbGxiYXIoc2Nyb2xsYmFyKSkgewogICAgICAgICBb cGFpbnRlciBzZXREZWxlZ2F0ZTpuaWxdOwogICAgICAgICBbbV9zY3JvbGxiYXJQYWludGVyQ29u dHJvbGxlci5nZXQoKSBzZXRIb3Jpem9udGFsU2Nyb2xsZXJJbXA6bmlsXTsKICAgICB9Cg==