147058 2015-07-17 16:51:43 -0700 [iOS] TextIndicator has a large forehead when line-height > 1 2015-07-17 17:22:32 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca enrica sam simon.fraser oldest_to_newest 1110265 0 thorton 2015-07-17 16:51:43 -0700 [iOS] TextIndicator has a large forehead when line-height > 1 1110266 1 257004 thorton 2015-07-17 16:53:34 -0700 Created attachment 257004 Patch 1110273 2 257004 dino 2015-07-17 17:09:00 -0700 Comment on attachment 257004 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257004&action=review > Source/WebKit2/ChangeLog:11 > + Apply a review comment that I left myself and then forgot about. Huh? A review comment from another fix? 1110280 3 thorton 2015-07-17 17:20:50 -0700 (In reply to comment #2) > Comment on attachment 257004 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=257004&action=review > > > Source/WebKit2/ChangeLog:11 > > + Apply a review comment that I left myself and then forgot about. > > Huh? A review comment from another fix? Yes. But still related to this! (and the original version of this patch actually depended on that review comment having been applied, so I've just kept it around). 1110281 4 thorton 2015-07-17 17:22:32 -0700 http://trac.webkit.org/changeset/186978 257004 2015-07-17 16:53:34 -0700 2015-07-17 17:09:00 -0700 Patch bug-147058-20150717165224.patch text/plain 7417 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2OTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDE5N2VjNzFjNmQ1ZjNi NTYyMzhlN2EyODY4OTE0ODUyNzQyZmUzMC4uNjVjYzJjNWU3MDA1N2JmZTQ4OTgwM2Y1NTE5ZDU1 NzczYjFjMjRkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE1LTA3LTE3ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCisgICAgICAgIFtpT1NdIFRleHRJ bmRpY2F0b3IgaGFzIGEgbGFyZ2UgZm9yZWhlYWQgd2hlbiBsaW5lLWhlaWdodCA+IDEKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzA1OAorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMjE2NDMwOTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBlZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkZyYW1lU2VsZWN0aW9uOjpnZXRDbGlwcGVkVmlzaWJsZVRleHRSZWN0YW5n bGVzKToKKyAgICAgICAgKiBlZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmg6CisgICAgICAgIEFkZCBh IHBhcmFtZXRlciBjb250cm9sbGluZyB3aGV0aGVyIGdldENsaXBwZWRWaXNpYmxlVGV4dFJlY3Rh bmdsZXMKKyAgICAgICAgcmV0dXJucyBzZWxlY3Rpb24taGVpZ2h0IHJlY3RzIChpbmNsdWRpbmcg ZXh0cmEgbGluZS1oZWlnaHQpIG9yIHRleHQtaGVpZ2h0CisgICAgICAgIHJlY3RzIChpbmNsdWRp bmcgb25seSB0aGUgdGV4dCBoZWlnaHQpLiBQbHVtYiBpdCBkb3duLgorCisgICAgICAgICogcGFn ZS9UZXh0SW5kaWNhdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRJbmRpY2F0b3I6OmNy ZWF0ZVdpdGhSYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0SW5kaWNhdG9yOjpjcmVhdGVX aXRoU2VsZWN0aW9uSW5GcmFtZSk6CisgICAgICAgIFVzZSB0aGUgdGlnaHRlciB0ZXh0LWhlaWdo dCByZWN0cyBvbiBpT1MsIHdoZXJlIHRoZXJlJ3Mgbm8gc2VsZWN0aW9uIGhpZ2hsaWdodCB0byBj b3ZlciB1cC4KKyAgICAgICAgUmVtb3ZlIGFuIGFzc2VydGlvbiB0aGF0IGlzIG5vIGxvbmdlciBh bHdheXMgdHJ1ZSwgYW5kIHdoaWNoIGlzIG1vc3RseSBvYnNvbGV0ZWQgYnkgdGhlCisgICAgICAg IGZhY3QgdGhhdCB3ZSBkb24ndCBsZXQgRnJhbWVTbmFwc2hvdHRpbmcgY29kZSBhcmJpdHJhcmls eSBkZWNpZGUgdGhlIHJlY3QgdG8gc25hcHNob3QgYW55bW9yZS4KKworMjAxNS0wNy0xNyAgVGlt IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKwogICAgICAgICBJbXByb3ZlIHJl Y3Qgc2hyaW5rLXdyYXBwaW5nIGFsZ29yaXRobQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MDM3CiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMTY0 MzA5ND4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZwppbmRleCBiOTc4YTc4ODIxZmZmMTQ1MTAyOTljMzk0OTUyNzA5YjUwZGYy ODEyLi45ZTJkOWU1OTEzNjBiZWIyYzllMzBlN2JiNzhkMGYwYmQ2OTE0MGUwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n CkBAIC0xLDUgKzEsMTcgQEAKIDIwMTUtMDctMTcgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRv bkBhcHBsZS5jb20+CiAKKyAgICAgICAgW2lPU10gVGV4dEluZGljYXRvciBoYXMgYSBsYXJnZSBm b3JlaGVhZCB3aGVuIGxpbmUtaGVpZ2h0ID4gMQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MDU4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMTY0 MzA5ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZTo6Z2V0UG9zaXRpb25JbmZvcm1hdGlvbik6CisgICAgICAgIEFwcGx5IGEgcmV2aWV3 IGNvbW1lbnQgdGhhdCBJIGxlZnQgbXlzZWxmIGFuZCB0aGVuIGZvcmdvdCBhYm91dC4KKworMjAx NS0wNy0xNyAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKwogICAgICAg ICBpT1MgVGV4dEluZGljYXRvcnMgaW5jbHVkZSB0ZXh0IHRoYXQgaXMgbm90IHN1cHBvc2VkIHRv IGJlIGluZGljYXRlZAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQ3MDI4CiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMTY0MzA5ND4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwIGIvU291cmNlL1dl YkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAKaW5kZXggZmEwODgzNzEyNTM3MWExMWNi ODc5OThmYTRhMTU3MWRkMTg0ZmIzMy4uM2FkODRkNzc4YjExMmExODFmZTcyY2VmNmFhZTY2MmRj NjYwMDdiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlv bi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAKQEAg LTIwNzUsNyArMjA3NSw3IEBAIEZsb2F0UmVjdCBGcmFtZVNlbGVjdGlvbjo6c2VsZWN0aW9uQm91 bmRzKGJvb2wgY2xpcFRvVmlzaWJsZUNvbnRlbnQpIGNvbnN0CiAgICAgcmV0dXJuIGNsaXBUb1Zp c2libGVDb250ZW50ID8gaW50ZXJzZWN0aW9uKHNlbGVjdGlvblJlY3QsIHZpZXctPnZpc2libGVD b250ZW50UmVjdChTY3JvbGxhYmxlQXJlYTo6TGVnYWN5SU9TRG9jdW1lbnRWaXNpYmxlUmVjdCkp IDogc2VsZWN0aW9uUmVjdDsKIH0KIAotdm9pZCBGcmFtZVNlbGVjdGlvbjo6Z2V0Q2xpcHBlZFZp c2libGVUZXh0UmVjdGFuZ2xlcyhWZWN0b3I8RmxvYXRSZWN0PiYgcmVjdGFuZ2xlcykgY29uc3QK K3ZvaWQgRnJhbWVTZWxlY3Rpb246OmdldENsaXBwZWRWaXNpYmxlVGV4dFJlY3RhbmdsZXMoVmVj dG9yPEZsb2F0UmVjdD4mIHJlY3RhbmdsZXMsIFRleHRSZWN0YW5nbGVIZWlnaHQgdGV4dFJlY3RI ZWlnaHQpIGNvbnN0CiB7CiAgICAgUmVuZGVyVmlldyogcm9vdCA9IG1fZnJhbWUtPmNvbnRlbnRS ZW5kZXJlcigpOwogICAgIGlmICghcm9vdCkKQEAgLTIwODQsNyArMjA4NCw3IEBAIHZvaWQgRnJh bWVTZWxlY3Rpb246OmdldENsaXBwZWRWaXNpYmxlVGV4dFJlY3RhbmdsZXMoVmVjdG9yPEZsb2F0 UmVjdD4mIHJlY3RhbmdsCiAgICAgRmxvYXRSZWN0IHZpc2libGVDb250ZW50UmVjdCA9IG1fZnJh bWUtPnZpZXcoKS0+dmlzaWJsZUNvbnRlbnRSZWN0KFNjcm9sbGFibGVBcmVhOjpMZWdhY3lJT1NE b2N1bWVudFZpc2libGVSZWN0KTsKIAogICAgIFZlY3RvcjxGbG9hdFF1YWQ+IHF1YWRzOwotICAg IHRvTm9ybWFsaXplZFJhbmdlKCktPnRleHRRdWFkcyhxdWFkcywgdHJ1ZSk7CisgICAgdG9Ob3Jt YWxpemVkUmFuZ2UoKS0+dGV4dFF1YWRzKHF1YWRzLCB0ZXh0UmVjdEhlaWdodCA9PSBUZXh0UmVj dGFuZ2xlSGVpZ2h0OjpTZWxlY3Rpb25IZWlnaHQpOwogCiAgICAgc2l6ZV90IHNpemUgPSBxdWFk cy5zaXplKCk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBzaXplOyArK2kpIHsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uaCBiL1NvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uaAppbmRleCAzMTBhNzRhYWI5ZDJmNTFkZmE3 MWJkMWFkOTY2MzQ4MzdiNjEyNWMwLi5kZjc3N2M5YWIyNjI2MWE0OGExMmNmNzlhMGVkYTc1OWIx NDVmNDAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9u LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5oCkBAIC0yNjAs NyArMjYwLDggQEAgcHVibGljOgogCiAgICAgV0VCQ09SRV9FWFBPUlQgRmxvYXRSZWN0IHNlbGVj dGlvbkJvdW5kcyhib29sIGNsaXBUb1Zpc2libGVDb250ZW50ID0gdHJ1ZSkgY29uc3Q7CiAKLSAg ICBXRUJDT1JFX0VYUE9SVCB2b2lkIGdldENsaXBwZWRWaXNpYmxlVGV4dFJlY3RhbmdsZXMoVmVj dG9yPEZsb2F0UmVjdD4mKSBjb25zdDsKKyAgICBlbnVtIGNsYXNzIFRleHRSZWN0YW5nbGVIZWln aHQgeyBUZXh0SGVpZ2h0LCBTZWxlY3Rpb25IZWlnaHQgfTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2 b2lkIGdldENsaXBwZWRWaXNpYmxlVGV4dFJlY3RhbmdsZXMoVmVjdG9yPEZsb2F0UmVjdD4mLCBU ZXh0UmVjdGFuZ2xlSGVpZ2h0ID0gVGV4dFJlY3RhbmdsZUhlaWdodDo6U2VsZWN0aW9uSGVpZ2h0 KSBjb25zdDsKIAogICAgIFdFQkNPUkVfRVhQT1JUIEhUTUxGb3JtRWxlbWVudCogY3VycmVudEZv cm0oKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9UZXh0SW5kaWNh dG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVGV4dEluZGljYXRvci5jcHAKaW5kZXggNzRl NjQ1Mzk5ZmU1YjY3NjcwMWM5OTBiYmU4MTdiNGJlNTkxYzg4Zi4uY2NlZmMyYjI0M2I5NGYyYjJh YWU4MjI3ZDM1N2JkMTRmMjU1MjkwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9U ZXh0SW5kaWNhdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RleHRJbmRpY2F0b3Iu Y3BwCkBAIC0xMDQsNyArMTA0LDE2IEBAIHN0YXRpYyBSZWZQdHI8SW1hZ2U+IHNuYXBzaG90U2Vs ZWN0aW9uV2l0aEhpZ2hsaWdodChGcmFtZSYgZnJhbWUpCiBSZWZQdHI8VGV4dEluZGljYXRvcj4g VGV4dEluZGljYXRvcjo6Y3JlYXRlV2l0aFNlbGVjdGlvbkluRnJhbWUoRnJhbWUmIGZyYW1lLCBU ZXh0SW5kaWNhdG9yUHJlc2VudGF0aW9uVHJhbnNpdGlvbiBwcmVzZW50YXRpb25UcmFuc2l0aW9u LCB1bnNpZ25lZCBtYXJnaW4pCiB7CiAgICAgVmVjdG9yPEZsb2F0UmVjdD4gdGV4dFJlY3RzOwot ICAgIGZyYW1lLnNlbGVjdGlvbigpLmdldENsaXBwZWRWaXNpYmxlVGV4dFJlY3RhbmdsZXModGV4 dFJlY3RzKTsKKworICAgIC8vIE9uIGlPUywgd2UgZG9uJ3QgbmVlZCB0byBleHBhbmQgdGhlIFRl eHRJbmRpY2F0b3IgdG8gY292ZXIgdGhlIHdob2xlIHNlbGVjdGlvbiBoZWlnaHQuCisgICAgLy8g RklYTUU6IElkZWFsbHksIG9uIE1hYywgdGhlcmUgYXJlIHRpbWVzIHdoZW4gd2UgZG9uJ3QgbmVl ZCB0byAoaWYgd2UgZG9uJ3QgaGF2ZSBhIHNlbGVjdGlvbiksCisgICAgLy8gYW5kIHVzaW5nIFRl eHRIZWlnaHQgd291bGQgcHJvdmlkZSBhIG1vcmUgc2Vuc2libGUgYXBwZWFyYW5jZS4KKyNpZiBQ TEFURk9STShJT1MpCisgICAgRnJhbWVTZWxlY3Rpb246OlRleHRSZWN0YW5nbGVIZWlnaHQgdGV4 dFJlY3RIZWlnaHQgPSBGcmFtZVNlbGVjdGlvbjo6VGV4dFJlY3RhbmdsZUhlaWdodDo6VGV4dEhl aWdodDsKKyNlbHNlCisgICAgRnJhbWVTZWxlY3Rpb246OlRleHRSZWN0YW5nbGVIZWlnaHQgdGV4 dFJlY3RIZWlnaHQgPSBGcmFtZVNlbGVjdGlvbjo6VGV4dFJlY3RhbmdsZUhlaWdodDo6U2VsZWN0 aW9uSGVpZ2h0OworI2VuZGlmCisgICAgZnJhbWUuc2VsZWN0aW9uKCkuZ2V0Q2xpcHBlZFZpc2li bGVUZXh0UmVjdGFuZ2xlcyh0ZXh0UmVjdHMsIHRleHRSZWN0SGVpZ2h0KTsKIAogICAgIC8vIFRo ZSBib3VuZGluZyByZWN0IG9mIGFsbCB0aGUgdGV4dCByZWN0cyBjYW4gYmUgZGlmZmVyZW50IHRo YW4gdGhlIHNlbGVjdGlvbgogICAgIC8vIHJlY3Qgd2hlbiB0aGUgc2VsZWN0aW9uIHNwYW5zIG11 bHRpcGxlIGxpbmVzOyB0aGUgaW5kaWNhdG9yIGRvZXNuJ3QgYWN0dWFsbHkKQEAgLTE2Niw3ICsx NzUsNiBAQCBSZWZQdHI8VGV4dEluZGljYXRvcj4gVGV4dEluZGljYXRvcjo6Y3JlYXRlV2l0aFNl bGVjdGlvbkluRnJhbWUoRnJhbWUmIGZyYW1lLCBUZQogVGV4dEluZGljYXRvcjo6VGV4dEluZGlj YXRvcihjb25zdCBUZXh0SW5kaWNhdG9yRGF0YSYgZGF0YSkKICAgICA6IG1fZGF0YShkYXRhKQog ewotICAgIEFTU0VSVChtX2RhdGEuY29udGVudEltYWdlU2NhbGVGYWN0b3IgIT0gMSB8fCBtX2Rh dGEuY29udGVudEltYWdlLT5zaXplKCkgPT0gZW5jbG9zaW5nSW50UmVjdChtX2RhdGEuc2VsZWN0 aW9uUmVjdEluUm9vdFZpZXdDb29yZGluYXRlcykuc2l6ZSgpKTsKIH0KIAogVGV4dEluZGljYXRv cjo6flRleHRJbmRpY2F0b3IoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCmluZGV4IGFiZTA1MTcwNGRhZThhZjQzMTc5N2RhMjdh Njk3YjhhNDg3YTBjODQuLjYwNjcyNTJlMjRiYzRiYWE5MzYzNzMyOWZlZWJjNGMxNjQ0MGM0NDMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFn ZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBh Z2VJT1MubW0KQEAgLTIxOTgsNyArMjE5OCw3IEBAIHZvaWQgV2ViUGFnZTo6Z2V0UG9zaXRpb25J bmZvcm1hdGlvbihjb25zdCBJbnRQb2ludCYgcG9pbnQsIEludGVyYWN0aW9uSW5mb3JtYXRpCiAg ICAgICAgICAgICAgICAgICAgIGlmIChsaW5rUmFuZ2UpIHsKICAgICAgICAgICAgICAgICAgICAg ICAgIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yID0gY29yZVBhZ2UoKS0+ZGV2aWNlU2NhbGVGYWN0 b3IoKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGZsb2F0IG1hcmdpbkluUG9pbnRz ID0gNDsKLSAgICAgICAgICAgICAgICAgICAgICAgIFJlZlB0cjxUZXh0SW5kaWNhdG9yPiB0ZXh0 SW5kaWNhdG9yID0gVGV4dEluZGljYXRvcjo6Y3JlYXRlV2l0aFJhbmdlKCpsaW5rUmFuZ2UsIFRl eHRJbmRpY2F0b3JQcmVzZW50YXRpb25UcmFuc2l0aW9uOjpGYWRlSW4sIG1hcmdpbkluUG9pbnRz ICogZGV2aWNlU2NhbGVGYWN0b3IpOworICAgICAgICAgICAgICAgICAgICAgICAgUmVmUHRyPFRl eHRJbmRpY2F0b3I+IHRleHRJbmRpY2F0b3IgPSBUZXh0SW5kaWNhdG9yOjpjcmVhdGVXaXRoUmFu Z2UoKmxpbmtSYW5nZSwgVGV4dEluZGljYXRvclByZXNlbnRhdGlvblRyYW5zaXRpb246Ok5vbmUs IG1hcmdpbkluUG9pbnRzICogZGV2aWNlU2NhbGVGYWN0b3IpOwogICAgICAgICAgICAgICAgICAg ICAgICAgaWYgKHRleHRJbmRpY2F0b3IpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5m by5saW5rSW5kaWNhdG9yID0gdGV4dEluZGljYXRvci0+ZGF0YSgpOwogICAgICAgICAgICAgICAg ICAgICB9Cg==