262830 2023-10-06 20:25:56 -0700 [IFC][Ruby] Take block direction into account when computing annotation box position and size 2023-10-07 06:13:15 -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 1983412 0 zalan 2023-10-06 20:25:56 -0700 ssia 1983413 1 468104 zalan 2023-10-06 20:28:34 -0700 Created attachment 468104 [fast-cq]Patch 1983445 2 ews-feeder 2023-10-07 06:12:17 -0700 Committed 269039@main (9ea85b42cf89): <https://commits.webkit.org/269039@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 468104. 1983446 3 webkit-bug-importer 2023-10-07 06:13:15 -0700 <rdar://problem/116619775> 468104 2023-10-06 20:28:34 -0700 2023-10-07 06:12:18 -0700 [fast-cq]Patch bug-262830-20231006202833.patch text/plain 5945 zalan RnJvbSAzMzcyYjVjYzQ4ZDliODY3NWM1ZWY3N2NiYzQxMjRlODQ3ZWNkZTJiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IEZyaSwgNiBPY3QgMjAyMyAyMDoyNjowNCAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIFtJRkNdW1J1 YnldIFRha2UgYmxvY2sgZGlyZWN0aW9uIGludG8gYWNjb3VudCB3aGVuIGNvbXB1dGluZwogYW5u b3RhdGlvbiBib3ggcG9zaXRpb24gYW5kIHNpemUKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yNjI4MzAKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKKiBMYXlv dXRUZXN0cy9mYXN0L3J1Ynkvb3ZlcmhhbmctdmVydGljYWwtbWl4ZWQuaHRtbDoKKiBTb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0 aW5nQ29udGV4dC5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6OlJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6 cGxhY2VBbm5vdGF0aW9uQm94KToKKFdlYkNvcmU6OkxheW91dDo6UnVieUZvcm1hdHRpbmdDb250 ZXh0OjpzaXplQW5ub3RhdGlvbkJveCk6Ci0tLQogLi4uL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0 aW5nQ29udGV4dC5jcHAgICAgIHwgNDAgKysrKysrKysrKysrKystLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDMxIGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0 dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvcnVieS9SdWJ5Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IGZlMTIxNmQ1M2Qx Yi4uZTMxY2NlNGVmMDI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvcnVieS9SdWJ5 Rm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0xNjksMTcgKzE2OSwzNiBAQCBJbmxpbmVMYXlvdXRQ b2ludCBSdWJ5Rm9ybWF0dGluZ0NvbnRleHQ6OnBsYWNlQW5ub3RhdGlvbkJveChjb25zdCBCb3gm IHJ1YnlCYXNlTAogICAgIGF1dG8mIGFubm90YXRpb25Cb3hHZW9tZXRyeSA9IGlubGluZUZvcm1h dHRpbmdDb250ZXh0Lmdlb21ldHJ5Rm9yQm94KCphbm5vdGF0aW9uQm94KTsKIAogICAgIGlmIChp c0ludGVybGluZWFyQW5ub3RhdGlvbihhbm5vdGF0aW9uQm94KSkgewotICAgICAgICBhdXRvIHRv cExlZnQgPSBCb3hHZW9tZXRyeTo6bWFyZ2luQm94UmVjdChydWJ5QmFzZUdlb21ldHJ5KS50b3BM ZWZ0KCk7CiAgICAgICAgIC8vIE1vdmUgaXQgb3Zlci91bmRlciB0aGUgYmFzZSBhbmQgbWFrZSBp dCBib3JkZXIgYm94IHBvc2l0aW9uLgotICAgICAgICBhdXRvIGJvcmRlckJveFRvcCA9IGFubm90 YXRpb25Cb3gtPnN0eWxlKCkucnVieVBvc2l0aW9uKCkgPT0gUnVieVBvc2l0aW9uOjpCZWZvcmUg PyAtYW5ub3RhdGlvbkJveEdlb21ldHJ5Lm1hcmdpbkJveEhlaWdodCgpIDogcnVieUJhc2VHZW9t ZXRyeS5tYXJnaW5Cb3hIZWlnaHQoKTsKLSAgICAgICAgYm9yZGVyQm94VG9wICs9IGFubm90YXRp b25Cb3hHZW9tZXRyeS5tYXJnaW5CZWZvcmUoKTsKLSAgICAgICAgdG9wTGVmdC5tb3ZlKExheW91 dFNpemUgeyBhbm5vdGF0aW9uQm94R2VvbWV0cnkubWFyZ2luU3RhcnQoKSwgYm9yZGVyQm94VG9w IH0pOworICAgICAgICBhdXRvIGxlZnRPZmZzZXQgPSBhbm5vdGF0aW9uQm94R2VvbWV0cnkubWFy Z2luU3RhcnQoKTsKKyAgICAgICAgYXV0byB0b3BPZmZzZXQgPSBhbm5vdGF0aW9uQm94LT5zdHls ZSgpLnJ1YnlQb3NpdGlvbigpID09IFJ1YnlQb3NpdGlvbjo6QmVmb3JlID8gLWFubm90YXRpb25C b3hHZW9tZXRyeS5tYXJnaW5Cb3hIZWlnaHQoKSA6IHJ1YnlCYXNlR2VvbWV0cnkubWFyZ2luQm94 SGVpZ2h0KCk7CisgICAgICAgIHN3aXRjaCAod3JpdGluZ01vZGVUb0Jsb2NrRmxvd0RpcmVjdGlv bihydWJ5QmFzZUxheW91dEJveC5zdHlsZSgpLndyaXRpbmdNb2RlKCkpKSB7CisgICAgICAgIGNh c2UgQmxvY2tGbG93RGlyZWN0aW9uOjpUb3BUb0JvdHRvbToKKyAgICAgICAgY2FzZSBCbG9ja0Zs b3dEaXJlY3Rpb246OkJvdHRvbVRvVG9wOgorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNh c2UgQmxvY2tGbG93RGlyZWN0aW9uOjpSaWdodFRvTGVmdDoKKyAgICAgICAgICAgIHRvcE9mZnNl dCA9IGxlZnRPZmZzZXQ7CisgICAgICAgICAgICBsZWZ0T2Zmc2V0ID0gYW5ub3RhdGlvbkJveC0+ c3R5bGUoKS5ydWJ5UG9zaXRpb24oKSA9PSBSdWJ5UG9zaXRpb246OkJlZm9yZSA/IC1hbm5vdGF0 aW9uQm94R2VvbWV0cnkubWFyZ2luQm94SGVpZ2h0KCkgOiBydWJ5QmFzZUdlb21ldHJ5Lm1hcmdp bkJveFdpZHRoKCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBCbG9ja0Zsb3dE aXJlY3Rpb246OkxlZnRUb1JpZ2h0OgorICAgICAgICAgICAgdG9wT2Zmc2V0ID0gbGVmdE9mZnNl dDsKKyAgICAgICAgICAgIGxlZnRPZmZzZXQgPSBhbm5vdGF0aW9uQm94LT5zdHlsZSgpLnJ1YnlQ b3NpdGlvbigpID09IFJ1YnlQb3NpdGlvbjo6QmVmb3JlID8gcnVieUJhc2VHZW9tZXRyeS5tYXJn aW5Cb3hXaWR0aCgpIDogLWFubm90YXRpb25Cb3hHZW9tZXRyeS5tYXJnaW5Cb3hIZWlnaHQoKTsK KyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgICAgICBh dXRvIHRvcExlZnQgPSBCb3hHZW9tZXRyeTo6bWFyZ2luQm94UmVjdChydWJ5QmFzZUdlb21ldHJ5 KS50b3BMZWZ0KCk7CisgICAgICAgIHRvcExlZnQubW92ZShMYXlvdXRTaXplIHsgbGVmdE9mZnNl dCwgdG9wT2Zmc2V0IH0pOwogICAgICAgICByZXR1cm4gdG9wTGVmdDsKICAgICB9CiAgICAgLy8g SW50ZXItY2hhcmFjdGVyIGFubm90YXRpb24gYm94IGlzIHN0cmV0Y2hlZCB0byB0aGUgc2l6ZSBv ZiB0aGUgYmFzZSBjb250ZW50IGJveCBhbmQgdmVydGljYWxseSBjZW50ZXJlZC4KLSAgICBhdXRv IHJ1YnlCYXNlUmlnaHQgPSBCb3hHZW9tZXRyeTo6bWFyZ2luQm94UmVjdChydWJ5QmFzZUdlb21l dHJ5KS5yaWdodCgpOwotICAgIGF1dG8gYm9yZGVyQm94UmlnaHQgPSBydWJ5QmFzZVJpZ2h0ICsg YW5ub3RhdGlvbkJveEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCk7Ci0gICAgcmV0dXJuIHsgYm9yZGVy Qm94UmlnaHQsICgocnVieUJhc2VHZW9tZXRyeS5jb250ZW50Qm94SGVpZ2h0KCkgLSBhbm5vdGF0 aW9uQm94R2VvbWV0cnkuY29udGVudEJveEhlaWdodCgpKSAvIDIpIC0gYW5ub3RhdGlvbkJveEdl b21ldHJ5LmJvcmRlckJlZm9yZSgpIH07CisgICAgYXV0byBpc0hvcml6b250YWxXcml0aW5nTW9k ZSA9IHJ1YnlCYXNlTGF5b3V0Qm94LnN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKTsK KyAgICBhdXRvIGFubm90YXRpb25WaXN1YWxDb250ZW50Qm94SGVpZ2h0ID0gaXNIb3Jpem9udGFs V3JpdGluZ01vZGUgPyBhbm5vdGF0aW9uQm94R2VvbWV0cnkuY29udGVudEJveEhlaWdodCgpIDog YW5ub3RhdGlvbkJveEdlb21ldHJ5LmNvbnRlbnRCb3hXaWR0aCgpOworICAgIGF1dG8gYW5ub3Rh dGlvbkJvcmRlclRvcCA9IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlID8gYW5ub3RhdGlvbkJveEdl b21ldHJ5LmJvcmRlckJlZm9yZSgpIDogYW5ub3RhdGlvbkJveEdlb21ldHJ5LmJvcmRlclN0YXJ0 KCk7CisgICAgYXV0byBydWJ5QmFzZUxvZ2ljYWxSaWdodCA9IEJveEdlb21ldHJ5OjptYXJnaW5C b3hSZWN0KHJ1YnlCYXNlR2VvbWV0cnkpLnJpZ2h0KCk7CisgICAgYXV0byBib3JkZXJCb3hSaWdo dCA9IHJ1YnlCYXNlTG9naWNhbFJpZ2h0ICsgYW5ub3RhdGlvbkJveEdlb21ldHJ5Lm1hcmdpblN0 YXJ0KCk7CisgICAgcmV0dXJuIHsgYm9yZGVyQm94UmlnaHQsICgocnVieUJhc2VHZW9tZXRyeS5t YXJnaW5Cb3hIZWlnaHQoKSAtIGFubm90YXRpb25WaXN1YWxDb250ZW50Qm94SGVpZ2h0KSAvIDIp IC0gYW5ub3RhdGlvbkJvcmRlclRvcCB9OwogfQogCiBJbmxpbmVMYXlvdXRTaXplIFJ1YnlGb3Jt YXR0aW5nQ29udGV4dDo6c2l6ZUFubm90YXRpb25Cb3goY29uc3QgQm94JiBydWJ5QmFzZUxheW91 dEJveCkKQEAgLTE5NCw5ICsyMTMsMTIgQEAgSW5saW5lTGF5b3V0U2l6ZSBSdWJ5Rm9ybWF0dGlu Z0NvbnRleHQ6OnNpemVBbm5vdGF0aW9uQm94KGNvbnN0IEJveCYgcnVieUJhc2VMYXkKICAgICBh dXRvJiBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCA9IHBhcmVudEZvcm1hdHRpbmdDb250ZXh0KCk7 CiAgICAgYXV0byYgcnVieUJhc2VHZW9tZXRyeSA9IGlubGluZUZvcm1hdHRpbmdDb250ZXh0Lmdl b21ldHJ5Rm9yQm94KHJ1YnlCYXNlTGF5b3V0Qm94KTsKICAgICBhdXRvJiBhbm5vdGF0aW9uQm94 R2VvbWV0cnkgPSBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5nZW9tZXRyeUZvckJveCgqYW5ub3Rh dGlvbkJveCk7CisgICAgYXV0byBpc0hvcml6b250YWxXcml0aW5nTW9kZSA9IHJ1YnlCYXNlTGF5 b3V0Qm94LnN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKTsKKyAgICBhdXRvIHJ1YnlC YXNlTG9naWNhbFdpZHRoID0gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUgPyBydWJ5QmFzZUdlb21l dHJ5Lm1hcmdpbkJveFdpZHRoKCkgOiBydWJ5QmFzZUdlb21ldHJ5Lm1hcmdpbkJveEhlaWdodCgp OwogICAgIGlmIChpc0ludGVybGluZWFyQW5ub3RhdGlvbihhbm5vdGF0aW9uQm94KSkKLSAgICAg ICAgcmV0dXJuIHsgc3RkOjptYXgocnVieUJhc2VHZW9tZXRyeS5tYXJnaW5Cb3hXaWR0aCgpLCBh bm5vdGF0aW9uQm94R2VvbWV0cnkubWFyZ2luQm94V2lkdGgoKSkgLSBhbm5vdGF0aW9uQm94R2Vv bWV0cnkuaG9yaXpvbnRhbE1hcmdpbkJvcmRlckFuZFBhZGRpbmcoKSwgYW5ub3RhdGlvbkJveEdl b21ldHJ5LmNvbnRlbnRCb3hIZWlnaHQoKSB9OwotICAgIHJldHVybiB7IGFubm90YXRpb25Cb3hH ZW9tZXRyeS5jb250ZW50Qm94V2lkdGgoKSwgc3RkOjptYXgocnVieUJhc2VHZW9tZXRyeS5tYXJn aW5Cb3hIZWlnaHQoKSwgYW5ub3RhdGlvbkJveEdlb21ldHJ5Lm1hcmdpbkJveEhlaWdodCgpKSAt IGFubm90YXRpb25Cb3hHZW9tZXRyeS52ZXJ0aWNhbE1hcmdpbkJvcmRlckFuZFBhZGRpbmcoKSB9 OworICAgICAgICByZXR1cm4geyBzdGQ6Om1heChydWJ5QmFzZUxvZ2ljYWxXaWR0aCwgYW5ub3Rh dGlvbkJveEdlb21ldHJ5Lm1hcmdpbkJveFdpZHRoKCkpIC0gYW5ub3RhdGlvbkJveEdlb21ldHJ5 Lmhvcml6b250YWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nKCksIGFubm90YXRpb25Cb3hHZW9tZXRy eS5jb250ZW50Qm94SGVpZ2h0KCkgfTsKKyAgICBhdXRvIHJ1YnlCYXNlTG9naWNhbEhlaWdodCA9 IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlID8gcnVieUJhc2VHZW9tZXRyeS5tYXJnaW5Cb3hIZWln aHQoKSA6IHJ1YnlCYXNlR2VvbWV0cnkubWFyZ2luQm94V2lkdGgoKTsKKyAgICByZXR1cm4geyBh bm5vdGF0aW9uQm94R2VvbWV0cnkuY29udGVudEJveFdpZHRoKCksIHN0ZDo6bWF4KHJ1YnlCYXNl TG9naWNhbEhlaWdodCwgYW5ub3RhdGlvbkJveEdlb21ldHJ5Lm1hcmdpbkJveEhlaWdodCgpKSAt IGFubm90YXRpb25Cb3hHZW9tZXRyeS52ZXJ0aWNhbE1hcmdpbkJvcmRlckFuZFBhZGRpbmcoKSB9 OwogfQogCiBSdWJ5Rm9ybWF0dGluZ0NvbnRleHQ6Ok92ZXJVbmRlciBSdWJ5Rm9ybWF0dGluZ0Nv bnRleHQ6OmFubm90YXRpb25Db250cmlidXRpb25Ub0xheW91dEJvdW5kcyhjb25zdCBCb3gmIHJ1 YnlCYXNlTGF5b3V0Qm94KQo=