241499 2022-06-09 20:29:46 -0700 Remove redundant OptionSet<TextDecorationLine> in InlineTextBoxStyle functions 2022-06-10 11:51:16 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1875164 0 zalan 2022-06-09 20:29:46 -0700 ssia 1875167 1 460153 zalan 2022-06-09 20:30:54 -0700 Created attachment 460153 Patch 1875282 2 ews-feeder 2022-06-10 11:50:17 -0700 Committed r295458 (251464@main): <https://commits.webkit.org/251464@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 460153. 1875283 3 webkit-bug-importer 2022-06-10 11:51:16 -0700 <rdar://problem/94829746> 460153 2022-06-09 20:30:54 -0700 2022-06-10 11:50:18 -0700 Patch bug-241499-20220609203053.patch text/plain 5798 zalan RnJvbSBiNTZmMTVkM2NmODYxNWE2ZDFhNjZmMjhlOGM3NzU5MjQyNGEyMGNjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBU aHUsIDkgSnVuIDIwMjIgMjA6MzA6MDAgLTA3MDAKU3ViamVjdDogW1BBVENIXSBSZW1vdmUgcmVk dW5kYW50IE9wdGlvblNldDxUZXh0RGVjb3JhdGlvbkxpbmU+IGluCiBJbmxpbmVUZXh0Qm94U3R5 bGUgZnVuY3Rpb25zIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDE0 OTkKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKKiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9J bmxpbmVUZXh0Qm94U3R5bGUuY3BwOgooV2ViQ29yZTo6bWluTG9naWNhbFRvcEZvclRleHREZWNv cmF0aW9uTGluZSk6CihXZWJDb3JlOjptYXhMb2dpY2FsQm90dG9tRm9yVGV4dERlY29yYXRpb25M aW5lKToKKFdlYkNvcmU6OmVuY2xvc2luZ1JlbmRlcmVyV2l0aFRleHREZWNvcmF0aW9uKToKKFdl YkNvcmU6OnRleHRSdW5Mb2dpY2FsT2Zmc2V0RnJvbUxpbmVCb3R0b20pOgotLS0KIFNvdXJjZS9X ZWJDb3JlL3N0eWxlL0lubGluZVRleHRCb3hTdHlsZS5jcHAgfCAxOCArKysrKysrKystLS0tLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvSW5saW5lVGV4dEJveFN0eWxlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL0lubGluZVRleHRCb3hTdHlsZS5jcHAKaW5kZXggNGFjMmM2ZThj MzUzLi45NjBlZDgxNTliYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0lubGlu ZVRleHRCb3hTdHlsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvSW5saW5lVGV4dEJv eFN0eWxlLmNwcApAQCAtNDgsMTQgKzQ4LDE0IEBAIHN0YXRpYyBib29sIGlzQW5jZXN0b3JBbmRX aXRoaW5CbG9jayhjb25zdCBSZW5kZXJJbmxpbmUmIGFuY2VzdG9yLCBjb25zdCBSZW5kZXJPCiAg ICAgcmV0dXJuIGZhbHNlOwogfQogCi1zdGF0aWMgZmxvYXQgbWluTG9naWNhbFRvcEZvclRleHRE ZWNvcmF0aW9uTGluZShjb25zdCBJbmxpbmVJdGVyYXRvcjo6TGluZUJveEl0ZXJhdG9yJiBsaW5l Qm94LCBmbG9hdCB0ZXh0UnVuTG9naWNhbFRvcCwgY29uc3QgUmVuZGVyRWxlbWVudCogZGVjb3Jh dGlvblJlbmRlcmVyLCBPcHRpb25TZXQ8VGV4dERlY29yYXRpb25MaW5lPiB0ZXh0RGVjb3JhdGlv bkxpbmUpCitzdGF0aWMgZmxvYXQgbWluTG9naWNhbFRvcEZvclRleHREZWNvcmF0aW9uTGluZShj b25zdCBJbmxpbmVJdGVyYXRvcjo6TGluZUJveEl0ZXJhdG9yJiBsaW5lQm94LCBmbG9hdCB0ZXh0 UnVuTG9naWNhbFRvcCwgY29uc3QgUmVuZGVyRWxlbWVudCogZGVjb3JhdGlvblJlbmRlcmVyKQog ewogICAgIGF1dG8gbWluTG9naWNhbFRvcCA9IHRleHRSdW5Mb2dpY2FsVG9wOwogICAgIGZvciAo YXV0byBydW4gPSBsaW5lQm94LT5maXJzdExlYWZCb3goKTsgcnVuOyBydW4udHJhdmVyc2VOZXh0 T25MaW5lKCkpIHsKICAgICAgICAgaWYgKHJ1bi0+cmVuZGVyZXIoKS5pc091dE9mRmxvd1Bvc2l0 aW9uZWQoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOyAvLyBQb3NpdGlvbmVkIHBsYWNlaG9sZGVy cyBkb24ndCBhZmZlY3QgY2FsY3VsYXRpb25zLgogCi0gICAgICAgIGlmICghKHJ1bi0+c3R5bGUo KS50ZXh0RGVjb3JhdGlvbnNJbkVmZmVjdCgpICYgdGV4dERlY29yYXRpb25MaW5lKSkKKyAgICAg ICAgaWYgKCFydW4tPnN0eWxlKCkudGV4dERlY29yYXRpb25zSW5FZmZlY3QoKS5jb250YWlucyhU ZXh0RGVjb3JhdGlvbkxpbmU6OlVuZGVybGluZSkpCiAgICAgICAgICAgICBjb250aW51ZTsgLy8g SWYgdGhlIHRleHQgZGVjb3JhdGlvbiBpc24ndCBpbiBlZmZlY3Qgb24gdGhlIGNoaWxkLCB0aGVu IGl0IG11c3QgYmUgb3V0c2lkZSBvZiB8ZGVjb3JhdGlvblJlbmRlcmVyfCdzIGhpZXJhcmNoeS4K IAogICAgICAgICBpZiAoZGVjb3JhdGlvblJlbmRlcmVyICYmIGRlY29yYXRpb25SZW5kZXJlci0+ aXNSZW5kZXJJbmxpbmUoKSAmJiAhaXNBbmNlc3RvckFuZFdpdGhpbkJsb2NrKGRvd25jYXN0PFJl bmRlcklubGluZT4oKmRlY29yYXRpb25SZW5kZXJlciksICZydW4tPnJlbmRlcmVyKCkpKQpAQCAt NjcsMTQgKzY3LDE0IEBAIHN0YXRpYyBmbG9hdCBtaW5Mb2dpY2FsVG9wRm9yVGV4dERlY29yYXRp b25MaW5lKGNvbnN0IElubGluZUl0ZXJhdG9yOjpMaW5lQm94SXRlCiAgICAgcmV0dXJuIG1pbkxv Z2ljYWxUb3A7CiB9CiAKLXN0YXRpYyBmbG9hdCBtYXhMb2dpY2FsQm90dG9tRm9yVGV4dERlY29y YXRpb25MaW5lKGNvbnN0IElubGluZUl0ZXJhdG9yOjpMaW5lQm94SXRlcmF0b3ImIGxpbmVCb3gs IGZsb2F0IHRleHRSdW5Mb2dpY2FsQm90dG9tLCBjb25zdCBSZW5kZXJFbGVtZW50KiBkZWNvcmF0 aW9uUmVuZGVyZXIsIE9wdGlvblNldDxUZXh0RGVjb3JhdGlvbkxpbmU+IHRleHREZWNvcmF0aW9u TGluZSkKK3N0YXRpYyBmbG9hdCBtYXhMb2dpY2FsQm90dG9tRm9yVGV4dERlY29yYXRpb25MaW5l KGNvbnN0IElubGluZUl0ZXJhdG9yOjpMaW5lQm94SXRlcmF0b3ImIGxpbmVCb3gsIGZsb2F0IHRl eHRSdW5Mb2dpY2FsQm90dG9tLCBjb25zdCBSZW5kZXJFbGVtZW50KiBkZWNvcmF0aW9uUmVuZGVy ZXIpCiB7CiAgICAgYXV0byBtYXhMb2dpY2FsQm90dG9tID0gdGV4dFJ1bkxvZ2ljYWxCb3R0b207 CiAgICAgZm9yIChhdXRvIHJ1biA9IGxpbmVCb3gtPmZpcnN0TGVhZkJveCgpOyBydW47IHJ1bi50 cmF2ZXJzZU5leHRPbkxpbmUoKSkgewogICAgICAgICBpZiAocnVuLT5yZW5kZXJlcigpLmlzT3V0 T2ZGbG93UG9zaXRpb25lZCgpKQogICAgICAgICAgICAgY29udGludWU7IC8vIFBvc2l0aW9uZWQg cGxhY2Vob2xkZXJzIGRvbid0IGFmZmVjdCBjYWxjdWxhdGlvbnMuCiAKLSAgICAgICAgaWYgKCEo cnVuLT5zdHlsZSgpLnRleHREZWNvcmF0aW9uc0luRWZmZWN0KCkgJiB0ZXh0RGVjb3JhdGlvbkxp bmUpKQorICAgICAgICBpZiAoIXJ1bi0+c3R5bGUoKS50ZXh0RGVjb3JhdGlvbnNJbkVmZmVjdCgp LmNvbnRhaW5zKFRleHREZWNvcmF0aW9uTGluZTo6VW5kZXJsaW5lKSkKICAgICAgICAgICAgIGNv bnRpbnVlOyAvLyBJZiB0aGUgdGV4dCBkZWNvcmF0aW9uIGlzbid0IGluIGVmZmVjdCBvbiB0aGUg Y2hpbGQsIHRoZW4gaXQgbXVzdCBiZSBvdXRzaWRlIG9mIHxkZWNvcmF0aW9uUmVuZGVyZXJ8J3Mg aGllcmFyY2h5LgogCiAgICAgICAgIGlmIChkZWNvcmF0aW9uUmVuZGVyZXIgJiYgZGVjb3JhdGlv blJlbmRlcmVyLT5pc1JlbmRlcklubGluZSgpICYmICFpc0FuY2VzdG9yQW5kV2l0aGluQmxvY2so ZG93bmNhc3Q8UmVuZGVySW5saW5lPigqZGVjb3JhdGlvblJlbmRlcmVyKSwgJnJ1bi0+cmVuZGVy ZXIoKSkpCkBAIC04Niw3ICs4Niw3IEBAIHN0YXRpYyBmbG9hdCBtYXhMb2dpY2FsQm90dG9tRm9y VGV4dERlY29yYXRpb25MaW5lKGNvbnN0IElubGluZUl0ZXJhdG9yOjpMaW5lQm94CiAgICAgcmV0 dXJuIG1heExvZ2ljYWxCb3R0b207CiB9CiAKLXN0YXRpYyBjb25zdCBSZW5kZXJFbGVtZW50KiBl bmNsb3NpbmdSZW5kZXJlcldpdGhUZXh0RGVjb3JhdGlvbihjb25zdCBSZW5kZXJUZXh0JiByZW5k ZXJlciwgT3B0aW9uU2V0PFRleHREZWNvcmF0aW9uTGluZT4gdGV4dERlY29yYXRpb25MaW5lLCBi b29sIGZpcnN0TGluZSkKK3N0YXRpYyBjb25zdCBSZW5kZXJFbGVtZW50KiBlbmNsb3NpbmdSZW5k ZXJlcldpdGhUZXh0RGVjb3JhdGlvbihjb25zdCBSZW5kZXJUZXh0JiByZW5kZXJlciwgYm9vbCBm aXJzdExpbmUpCiB7CiAgICAgY29uc3QgUmVuZGVyRWxlbWVudCogY3VycmVudCA9IHJlbmRlcmVy LnBhcmVudCgpOwogICAgIGRvIHsKQEAgLTk2LDcgKzk2LDcgQEAgc3RhdGljIGNvbnN0IFJlbmRl ckVsZW1lbnQqIGVuY2xvc2luZ1JlbmRlcmVyV2l0aFRleHREZWNvcmF0aW9uKGNvbnN0IFJlbmRl clRleHQKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgICAgIGNvbnN0IFJlbmRl clN0eWxlJiBzdHlsZVRvVXNlID0gZmlyc3RMaW5lID8gY3VycmVudC0+Zmlyc3RMaW5lU3R5bGUo KSA6IGN1cnJlbnQtPnN0eWxlKCk7Ci0gICAgICAgIGlmIChzdHlsZVRvVXNlLnRleHREZWNvcmF0 aW9uTGluZSgpICYgdGV4dERlY29yYXRpb25MaW5lKQorICAgICAgICBpZiAoc3R5bGVUb1VzZS50 ZXh0RGVjb3JhdGlvbkxpbmUoKS5jb250YWlucyhUZXh0RGVjb3JhdGlvbkxpbmU6OlVuZGVybGlu ZSkpCiAgICAgICAgICAgICByZXR1cm4gY3VycmVudDsKICAgICAgICAgY3VycmVudCA9IGN1cnJl bnQtPnBhcmVudCgpOwogICAgIH0gd2hpbGUgKGN1cnJlbnQgJiYgKCFjdXJyZW50LT5lbGVtZW50 KCkgfHwgKCFpczxIVE1MQW5jaG9yRWxlbWVudD4oKmN1cnJlbnQtPmVsZW1lbnQoKSkgJiYgIWN1 cnJlbnQtPmVsZW1lbnQoKS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OmZvbnRUYWcpKSkpOwpAQCAt MTA3LDEyICsxMDcsMTIgQEAgc3RhdGljIGNvbnN0IFJlbmRlckVsZW1lbnQqIGVuY2xvc2luZ1Jl bmRlcmVyV2l0aFRleHREZWNvcmF0aW9uKGNvbnN0IFJlbmRlclRleHQKIGZsb2F0IHRleHRSdW5M b2dpY2FsT2Zmc2V0RnJvbUxpbmVCb3R0b20oY29uc3QgSW5saW5lSXRlcmF0b3I6OlRleHRCb3hJ dGVyYXRvciYgdGV4dFJ1bikKIHsKICAgICBmbG9hdCBvZmZzZXQgPSAwLmY7Ci0gICAgYXV0byog ZGVjb3JhdGlvblJlbmRlcmVyID0gZW5jbG9zaW5nUmVuZGVyZXJXaXRoVGV4dERlY29yYXRpb24o dGV4dFJ1bi0+cmVuZGVyZXIoKSwgVGV4dERlY29yYXRpb25MaW5lOjpVbmRlcmxpbmUsIHRleHRS dW4tPmxpbmVCb3goKS0+aXNGaXJzdCgpKTsKKyAgICBhdXRvKiBkZWNvcmF0aW9uUmVuZGVyZXIg PSBlbmNsb3NpbmdSZW5kZXJlcldpdGhUZXh0RGVjb3JhdGlvbih0ZXh0UnVuLT5yZW5kZXJlcigp LCB0ZXh0UnVuLT5saW5lQm94KCktPmlzRmlyc3QoKSk7CiAgICAgaWYgKHRleHRSdW4tPnJlbmRl cmVyKCkuc3R5bGUoKS5pc0ZsaXBwZWRMaW5lc1dyaXRpbmdNb2RlKCkpIHsKLSAgICAgICAgYXV0 byBtaW5Mb2dpY2FsVG9wID0gbWluTG9naWNhbFRvcEZvclRleHREZWNvcmF0aW9uTGluZSh0ZXh0 UnVuLT5saW5lQm94KCksIHRleHRSdW4tPmxvZ2ljYWxUb3AoKSwgZGVjb3JhdGlvblJlbmRlcmVy LCBUZXh0RGVjb3JhdGlvbkxpbmU6OlVuZGVybGluZSk7CisgICAgICAgIGF1dG8gbWluTG9naWNh bFRvcCA9IG1pbkxvZ2ljYWxUb3BGb3JUZXh0RGVjb3JhdGlvbkxpbmUodGV4dFJ1bi0+bGluZUJv eCgpLCB0ZXh0UnVuLT5sb2dpY2FsVG9wKCksIGRlY29yYXRpb25SZW5kZXJlcik7CiAgICAgICAg IG9mZnNldCA9IHRleHRSdW4tPmxvZ2ljYWxUb3AoKSAtIG1pbkxvZ2ljYWxUb3A7CiAgICAgfSBl bHNlIHsKLSAgICAgICAgb2Zmc2V0ID0gbWF4TG9naWNhbEJvdHRvbUZvclRleHREZWNvcmF0aW9u TGluZSh0ZXh0UnVuLT5saW5lQm94KCksIHRleHRSdW4tPmxvZ2ljYWxCb3R0b20oKSwgZGVjb3Jh dGlvblJlbmRlcmVyLCBUZXh0RGVjb3JhdGlvbkxpbmU6OlVuZGVybGluZSk7CisgICAgICAgIG9m ZnNldCA9IG1heExvZ2ljYWxCb3R0b21Gb3JUZXh0RGVjb3JhdGlvbkxpbmUodGV4dFJ1bi0+bGlu ZUJveCgpLCB0ZXh0UnVuLT5sb2dpY2FsQm90dG9tKCksIGRlY29yYXRpb25SZW5kZXJlcik7CiAg ICAgICAgIG9mZnNldCAtPSB0ZXh0UnVuLT5sb2dpY2FsQm90dG9tKCk7CiAgICAgfQogICAgIHJl dHVybiBvZmZzZXQ7Ci0tIAoyLjMyLjAgKEFwcGxlIEdpdC0xMzIpCgo=