178613 2017-10-20 19:44:01 -0700 Write InlineTextBox::paintCompositionUnderline() in terms of InlineTextBox::localSelectionRectWithClampedPositions() 2017-11-12 22:53:33 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Local Build Unspecified Unspecified ASSIGNED InRadar P2 Normal --- 178232 1 dbates dbates bfulgham darin simon.fraser webkit-bug-importer zalan oldest_to_newest 1362963 0 dbates 2017-10-20 19:44:01 -0700 Following up from bug #178232 we should write InlineTextBox::paintCompositionUnderline() in terms of InlineTextBox::localSelectionRectWithClampedPositions(). 1362964 1 webkit-bug-importer 2017-10-20 19:44:37 -0700 <rdar://problem/35107859> 1362966 2 324481 dbates 2017-10-20 19:51:24 -0700 Created attachment 324481 Patch 324481 2017-10-20 19:51:24 -0700 2017-11-12 22:53:33 -0800 Patch bug-178613-20171020195123.patch text/plain 7547 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzNzg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTE4MGE5ZGY3NDViNWQ0 ZGY0NGVhZTFlMzI2OGEyZGMxYmEwNGM3Ni4uZGEzMzc5OWI5OWFiMjVkZjE5NzRhZWI0NjY0NTEy YjRjZDJlYjJkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE3LTEwLTIwICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAorICAgICAgICBXcml0ZSBJbmxpbmVUZXh0 Qm94OjpwYWludENvbXBvc2l0aW9uVW5kZXJsaW5lKCkgaW4gdGVybXMgb2YgSW5saW5lVGV4dEJv eDo6bG9jYWxTZWxlY3Rpb25SZWN0V2l0aENsYW1wZWRQb3NpdGlvbnMoKQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc4NjEzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIGR1cGxpY2F0ZSBsb2dp YyB0byBjb21wdXRlIHRoZSBwb3NpdGlvbiBhbmQgd2lkdGggb2YgdGhlIGNvbXBvc2l0aW9uIHVu ZGVybGluZSBhbmQgbWFrZQorICAgICAgICB1c2Ugb2YgSW5saW5lVGV4dEJveDo6bG9jYWxTZWxl Y3Rpb25SZWN0V2l0aENsYW1wZWRQb3NpdGlvbnMoKS4KKworICAgICAgICAqIHJlbmRlcmluZy9J bmxpbmVUZXh0Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OnBhaW50 KTogUGFzcyB0aGUgcGFpbnQgb2Zmc2V0IHRvIHBhaW50Q29tcG9zaXRpb25VbmRlcmxpbmVzKCku CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVUZXh0Qm94OjpwYWludENvbXBvc2l0aW9uVW5kZXJs aW5lcyBjb25zdCk6IE1vZGlmaWVkIHRvIHRha2UgdGhlIHBhaW50IG9mZnNldCBpbnN0ZWFkCisg ICAgICAgIG9mIHRoZSBib3ggb3JpZ2luIGFuZCBwYXNzIHRoaXMgdGhyb3VnaCB0byBwYWludENv bXBvc2l0aW9uVW5kZXJsaW5lKCkuCisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVUZXh0Qm94Ojpw YWludENvbXBvc2l0aW9uVW5kZXJsaW5lIGNvbnN0KTogTW9kaWZpZWQgdG8gdGFrZSB0aGUgcGFp bnQgb2Zmc2V0IGFuZAorICAgICAgICB1c2UgSW5saW5lVGV4dEJveDo6bG9jYWxTZWxlY3Rpb25S ZWN0V2l0aENsYW1wZWRQb3NpdGlvbnMoKSB0byBjb21wdXRlIHRoZSBwb3NpdGlvbiBhbmQKKyAg ICAgICAgd2lkdGggb2YgdGhlIGNvbXBvc2l0aW9uIHVuZGVybGluZS4gQW1vbmcgdGhlIGJlbmVm aXRzIG9mIGxvY2FsU2VsZWN0aW9uUmVjdFdpdGhDbGFtcGVkUG9zaXRpb25zKCkKKyAgICAgICAg aXMgdGhhdCB3ZSBubyBsb25nZXIgbmVlZCB0byBjYWxsIG1pcnJvclJUTFNlZ21lbnQoKSB0byBh ZGp1c3QgdGhlIHN0YXJ0IHBvc2l0aW9uIGZvciBhIHJpZ2h0LXRvLWxlZnQKKyAgICAgICAgdGV4 dCBib3ggYXMgbG9jYWxTZWxlY3Rpb25SZWN0V2l0aENsYW1wZWRQb3NpdGlvbnMoKSBkb2VzIHRo aXMgYWRqdXN0bWVudCBmb3IgdXMuCisgICAgICAgICogcmVuZGVyaW5nL0lubGluZVRleHRCb3gu aDoKKworMjAxNy0xMC0yMCAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CisKICAg ICAgICAgUkVHUkVTU0lPTiAocjIyMzY5OSk6IFNwZWxsaW5nIGVycm9yIGRvdHMgZHJhd24gaW4g d3JvbmcgcGxhY2UgZm9yIG92ZXJsYXBwaW5nIGxpbmVzCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzg2MTEKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL0lubGluZVRleHRCb3guY3BwCmluZGV4IGYxMDZhNDkzNWUwM2RjYzE5YWUyZjZiNjFmMTRl YzM2ZTkxMjIzNmIuLjk4ZjA1OTgwMTNhZjVlZjA5MmMzNjZjMjlkZTc1MjA5MzMxNGY1MTUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAKQEAgLTYwNiw3ICs2 MDYsNyBAQCB2b2lkIElubGluZVRleHRCb3g6OnBhaW50KFBhaW50SW5mbyYgcGFpbnRJbmZvLCBj b25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQsCiAgICAgICAgIHBhaW50RG9jdW1lbnRNYXJr ZXJzKGNvbnRleHQsIGxvY2FsUGFpbnRPZmZzZXQsIGZhbHNlKTsKIAogICAgICAgICBpZiAodXNl Q3VzdG9tVW5kZXJsaW5lcykKLSAgICAgICAgICAgIHBhaW50Q29tcG9zaXRpb25VbmRlcmxpbmVz KGNvbnRleHQsIGJveE9yaWdpbik7CisgICAgICAgICAgICBwYWludENvbXBvc2l0aW9uVW5kZXJs aW5lcyhjb250ZXh0LCBsb2NhbFBhaW50T2Zmc2V0KTsKICAgICB9CiAgICAgCiAgICAgaWYgKHNo b3VsZFJvdGF0ZSkKQEAgLTk0Nyw3ICs5NDcsNyBAQCB2b2lkIElubGluZVRleHRCb3g6OnBhaW50 RG9jdW1lbnRNYXJrZXJzKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgTGF5b3V0UAog ICAgIH0KIH0KIAotdm9pZCBJbmxpbmVUZXh0Qm94OjpwYWludENvbXBvc2l0aW9uVW5kZXJsaW5l cyhHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEZsb2F0UG9pbnQmIGJveE9yaWdpbikg Y29uc3QKK3ZvaWQgSW5saW5lVGV4dEJveDo6cGFpbnRDb21wb3NpdGlvblVuZGVybGluZXMoR3Jh cGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQpIGNv bnN0CiB7CiAgICAgaWYgKG1fdHJ1bmNhdGlvbiA9PSBjRnVsbFRydW5jYXRpb24pCiAgICAgICAg IHJldHVybjsKQEAgLTk2NCw0MCArOTY0LDIyIEBAIHZvaWQgSW5saW5lVGV4dEJveDo6cGFpbnRD b21wb3NpdGlvblVuZGVybGluZXMoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBGCiAg ICAgICAgICAgICBicmVhazsgLy8gVW5kZXJsaW5lIGlzIGNvbXBsZXRlbHkgYWZ0ZXIgdGhpcyBy dW4sIGJhaWwuIEEgbGF0ZXIgcnVuIHdpbGwgcGFpbnQgaXQuCiAKICAgICAgICAgLy8gVW5kZXJs aW5lIGludGVyc2VjdHMgdGhpcyBydW4uIFBhaW50IGl0LgotICAgICAgICBwYWludENvbXBvc2l0 aW9uVW5kZXJsaW5lKGNvbnRleHQsIGJveE9yaWdpbiwgdW5kZXJsaW5lKTsKKyAgICAgICAgcGFp bnRDb21wb3NpdGlvblVuZGVybGluZShjb250ZXh0LCBwYWludE9mZnNldCwgdW5kZXJsaW5lKTsK IAogICAgICAgICBpZiAodW5kZXJsaW5lLmVuZE9mZnNldCA+IGVuZCgpICsgMSkKICAgICAgICAg ICAgIGJyZWFrOyAvLyBVbmRlcmxpbmUgYWxzbyBydW5zIGludG8gdGhlIG5leHQgcnVuLiBCYWls IG5vdywgbm8gbW9yZSBtYXJrZXIgYWR2YW5jZW1lbnQuCiAgICAgfQogfQogCi12b2lkIElubGlu ZVRleHRCb3g6OnBhaW50Q29tcG9zaXRpb25VbmRlcmxpbmUoR3JhcGhpY3NDb250ZXh0JiBjb250 ZXh0LCBjb25zdCBGbG9hdFBvaW50JiBib3hPcmlnaW4sIGNvbnN0IENvbXBvc2l0aW9uVW5kZXJs aW5lJiB1bmRlcmxpbmUpIGNvbnN0Cit2b2lkIElubGluZVRleHRCb3g6OnBhaW50Q29tcG9zaXRp b25VbmRlcmxpbmUoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBMYXlvdXRQb2ludCYg cGFpbnRPZmZzZXQsIGNvbnN0IENvbXBvc2l0aW9uVW5kZXJsaW5lJiB1bmRlcmxpbmUpIGNvbnN0 CiB7CiAgICAgaWYgKG1fdHJ1bmNhdGlvbiA9PSBjRnVsbFRydW5jYXRpb24pCiAgICAgICAgIHJl dHVybjsKLSAgICAKLSAgICBmbG9hdCBzdGFydCA9IDA7IC8vIHN0YXJ0IG9mIGxpbmUgdG8gZHJh dywgcmVsYXRpdmUgdG8gdHgKLSAgICBmbG9hdCB3aWR0aCA9IG1fbG9naWNhbFdpZHRoOyAvLyBo b3cgbXVjaCBsaW5lIHRvIGRyYXcKLSAgICBib29sIHVzZVdob2xlV2lkdGggPSB0cnVlOwotICAg IHVuc2lnbmVkIHBhaW50U3RhcnQgPSBtX3N0YXJ0OwotICAgIHVuc2lnbmVkIHBhaW50RW5kID0g ZW5kKCkgKyAxOyAvLyBlbmQgcG9pbnRzIGF0IHRoZSBsYXN0IGNoYXIsIG5vdCBwYXN0IGl0Ci0g ICAgaWYgKHBhaW50U3RhcnQgPD0gdW5kZXJsaW5lLnN0YXJ0T2Zmc2V0KSB7Ci0gICAgICAgIHBh aW50U3RhcnQgPSB1bmRlcmxpbmUuc3RhcnRPZmZzZXQ7Ci0gICAgICAgIHVzZVdob2xlV2lkdGgg PSBmYWxzZTsKLSAgICAgICAgc3RhcnQgPSByZW5kZXJlcigpLndpZHRoKG1fc3RhcnQsIHBhaW50 U3RhcnQgLSBtX3N0YXJ0LCB0ZXh0UG9zKCksIGlzRmlyc3RMaW5lKCkpOwotICAgIH0KLSAgICBp ZiAocGFpbnRFbmQgIT0gdW5kZXJsaW5lLmVuZE9mZnNldCkgeyAgICAgIC8vIGVuZCBwb2ludHMg YXQgdGhlIGxhc3QgY2hhciwgbm90IHBhc3QgaXQKLSAgICAgICAgcGFpbnRFbmQgPSBzdGQ6Om1p bihwYWludEVuZCwgKHVuc2lnbmVkKXVuZGVybGluZS5lbmRPZmZzZXQpOwotICAgICAgICB1c2VX aG9sZVdpZHRoID0gZmFsc2U7Ci0gICAgfQotICAgIGlmIChtX3RydW5jYXRpb24gIT0gY05vVHJ1 bmNhdGlvbikgewotICAgICAgICBwYWludEVuZCA9IHN0ZDo6bWluKHBhaW50RW5kLCAodW5zaWdu ZWQpbV9zdGFydCArIG1fdHJ1bmNhdGlvbik7Ci0gICAgICAgIHVzZVdob2xlV2lkdGggPSBmYWxz ZTsKLSAgICB9Ci0gICAgaWYgKCF1c2VXaG9sZVdpZHRoKSB7Ci0gICAgICAgIHdpZHRoID0gcmVu ZGVyZXIoKS53aWR0aChwYWludFN0YXJ0LCBwYWludEVuZCAtIHBhaW50U3RhcnQsIHRleHRQb3Mo KSArIHN0YXJ0LCBpc0ZpcnN0TGluZSgpKTsKLSAgICAgICAgbWlycm9yUlRMU2VnbWVudChtX2xv Z2ljYWxXaWR0aCwgZGlyZWN0aW9uKCksIHN0YXJ0LCB3aWR0aCk7Ci0gICAgfQorCisgICAgTGF5 b3V0UmVjdCBzZWxlY3Rpb25SZWN0ID0gbG9jYWxTZWxlY3Rpb25SZWN0V2l0aENsYW1wZWRQb3Np dGlvbnMoY2xhbXBlZE9mZnNldCh1bmRlcmxpbmUuc3RhcnRPZmZzZXQpLCBjbGFtcGVkT2Zmc2V0 KHVuZGVybGluZS5lbmRPZmZzZXQpKTsKKyAgICBGbG9hdFBvaW50IGxvY2F0aW9uID0gc2VsZWN0 aW9uUmVjdC5taW5YTWF4WUNvcm5lcigpOworICAgIGZsb2F0IHdpZHRoID0gc2VsZWN0aW9uUmVj dC53aWR0aCgpOworICAgIGxvY2F0aW9uLm1vdmVCeShwYWludE9mZnNldCk7CiAKICAgICAvLyBU aGljayBtYXJrZWQgdGV4dCB1bmRlcmxpbmVzIGFyZSAycHggdGhpY2sgYXMgbG9uZyBhcyB0aGVy ZSBpcyByb29tIGZvciB0aGUgMnB4IGxpbmUgdW5kZXIgdGhlIGJhc2VsaW5lLgogICAgIC8vIEFs bCBvdGhlciBtYXJrZWQgdGV4dCB1bmRlcmxpbmVzIGFyZSAxcHggdGhpY2suCkBAIC0xMDA2LDE1 ICs5ODgsMTYgQEAgdm9pZCBJbmxpbmVUZXh0Qm94OjpwYWludENvbXBvc2l0aW9uVW5kZXJsaW5l KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgRmwKICAgICBpbnQgYmFzZWxpbmUgPSBs aW5lU3R5bGUoKS5mb250TWV0cmljcygpLmFzY2VudCgpOwogICAgIGlmICh1bmRlcmxpbmUudGhp Y2sgJiYgbG9naWNhbEhlaWdodCgpIC0gYmFzZWxpbmUgPj0gMikKICAgICAgICAgbGluZVRoaWNr bmVzcyA9IDI7CisgICAgbG9jYXRpb24ubW92ZSgwLCAtbGluZVRoaWNrbmVzcyk7CiAKICAgICAv LyBXZSBuZWVkIHRvIGhhdmUgc29tZSBzcGFjZSBiZXR3ZWVuIHVuZGVybGluZXMgb2Ygc3Vic2Vx dWVudCBjbGF1c2VzLCBiZWNhdXNlIHNvbWUgaW5wdXQgbWV0aG9kcyBkbyBub3QgdXNlIGRpZmZl cmVudCB1bmRlcmxpbmUgc3R5bGVzIGZvciB0aG9zZS4KICAgICAvLyBXZSBtYWtlIGVhY2ggbGlu ZSBzaG9ydGVyLCB3aGljaCBoYXMgYSBoYXJtbGVzcyBzaWRlIGVmZmVjdCBvZiBzaG9ydGVuaW5n IHRoZSBmaXJzdCBhbmQgbGFzdCBjbGF1c2VzLCB0b28uCi0gICAgc3RhcnQgKz0gMTsKKyAgICBs b2NhdGlvbi5tb3ZlKDEsIDApOwogICAgIHdpZHRoIC09IDI7CiAKICAgICBjb250ZXh0LnNldFN0 cm9rZUNvbG9yKHVuZGVybGluZS5jb21wb3NpdGlvblVuZGVybGluZUNvbG9yID09IENvbXBvc2l0 aW9uVW5kZXJsaW5lQ29sb3I6OlRleHRDb2xvciA/IHJlbmRlcmVyKCkuc3R5bGUoKS52aXNpdGVk RGVwZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlXZWJraXRUZXh0RmlsbENvbG9yKSA6IHVuZGVybGlu ZS5jb2xvcik7CiAgICAgY29udGV4dC5zZXRTdHJva2VUaGlja25lc3MobGluZVRoaWNrbmVzcyk7 Ci0gICAgY29udGV4dC5kcmF3TGluZUZvclRleHQoRmxvYXRQb2ludChib3hPcmlnaW4ueCgpICsg c3RhcnQsIGJveE9yaWdpbi55KCkgKyBsb2dpY2FsSGVpZ2h0KCkgLSBsaW5lVGhpY2tuZXNzKSwg d2lkdGgsIHJlbmRlcmVyKCkuZG9jdW1lbnQoKS5wcmludGluZygpKTsKKyAgICBjb250ZXh0LmRy YXdMaW5lRm9yVGV4dChsb2NhdGlvbiwgd2lkdGgsIHJlbmRlcmVyKCkuZG9jdW1lbnQoKS5wcmlu dGluZygpKTsKIH0KIAogaW50IElubGluZVRleHRCb3g6OmNhcmV0TWluT2Zmc2V0KCkgY29uc3QK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5oCmluZGV4IDQ1NjlmZWE1ZmYx NDYyNmNjZTkzNTU4NjA0MTc1Y2VlNmRmOWRlNmEuLjQ4YjgzMTM0MjYwZTRjNzZiYzI4ZjJlY2Nm MmMzYTE4NDA0YzQ3OWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Jbmxp bmVUZXh0Qm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3gu aApAQCAtMTU5LDggKzE1OSw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCBwYWludFRleHRNYXRjaE1h cmtlcihHcmFwaGljc0NvbnRleHQmLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQsIGNv bnN0IE1hcmtlclN1YnJhbmdlJiwgYm9vbCBpc0FjdGl2ZU1hdGNoKTsKIAogICAgIHZvaWQgcGFp bnRDb21wb3NpdGlvbkJhY2tncm91bmQoR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgTGF5b3V0UG9p bnQmIHBhaW50T2Zmc2V0KTsKLSAgICB2b2lkIHBhaW50Q29tcG9zaXRpb25VbmRlcmxpbmVzKEdy YXBoaWNzQ29udGV4dCYsIGNvbnN0IEZsb2F0UG9pbnQmIGJveE9yaWdpbikgY29uc3Q7Ci0gICAg dm9pZCBwYWludENvbXBvc2l0aW9uVW5kZXJsaW5lKEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IEZs b2F0UG9pbnQmIGJveE9yaWdpbiwgY29uc3QgQ29tcG9zaXRpb25VbmRlcmxpbmUmKSBjb25zdDsK KyAgICB2b2lkIHBhaW50Q29tcG9zaXRpb25VbmRlcmxpbmVzKEdyYXBoaWNzQ29udGV4dCYsIGNv bnN0IExheW91dFBvaW50JiBwYWludE9mZnNldCkgY29uc3Q7CisgICAgdm9pZCBwYWludENvbXBv c2l0aW9uVW5kZXJsaW5lKEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IExheW91dFBvaW50JiBwYWlu dE9mZnNldCwgY29uc3QgQ29tcG9zaXRpb25VbmRlcmxpbmUmKSBjb25zdDsKIAogICAgIHZvaWQg cGFpbnRUZXh0U3VicmFuZ2VCYWNrZ3JvdW5kKEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IExheW91 dFBvaW50JiBwYWludE9mZnNldCwgY29uc3QgQ29sb3ImLCB1bnNpZ25lZCBzdGFydE9mZnNldCwg dW5zaWduZWQgZW5kT2Zmc2V0KTsKIAo=