233083 2021-11-12 21:23:52 -0800 [LFC][IFC] Inline box end's padding/border/margin should be taken into account when computing horizontal position for bidi content 2021-11-13 15:29:21 -0800 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 1814738 0 zalan 2021-11-12 21:23:52 -0800 ssia 1814739 1 444134 zalan 2021-11-12 21:28:06 -0800 Created attachment 444134 Patch 1814808 2 ews-feeder 2021-11-13 15:28:24 -0800 Committed r285784 (244228@main): <https://commits.webkit.org/244228@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444134. 1814809 3 webkit-bug-importer 2021-11-13 15:29:21 -0800 <rdar://problem/85380109> 444134 2021-11-12 21:28:06 -0800 2021-11-13 15:28:25 -0800 Patch bug-233083-20211112212806.patch text/plain 7388 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NzcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmUzMTU2Y2FjZDczN2Y4 YzFjOGZkZDY5NzA1MTcwOGRjZGM1ZTMyNC4uYTkzNTQ5ZjVkY2QxMDgwZTc3MDNjZjY5OTk2MzU3 M2NhZGVkNDlkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTExLTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbmxpbmUg Ym94IGVuZCdzIHBhZGRpbmcvYm9yZGVyL21hcmdpbiBzaG91bGQgYmUgdGFrZW4gaW50byBhY2Nv dW50IHdoZW4gY29tcHV0aW5nIGhvcml6b250YWwgcG9zaXRpb24gZm9yIGJpZGkgY29udGVudAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzMDgzCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTGV0J3MgZGVj b3VwbGUgdGhlICJkaXNwbGF5IGJveCByZWN0IiBhbmQgdGhlICJjb250ZW50IHJpZ2h0IGluIHZp c3VhbCBvcmRlciIgY29tcHV0YXRpb24uCisgICAgICAgIFRoZXJlIGFyZSBydW5zIChlLmcuIGlu bGluZSBib3ggZW5kKSB0aGF0IGRvbid0IG5lZWQgdG8gY2FsbCBkaXNwbGF5Qm94UmVjdCgpIGJ1 dCB0aGV5CisgICAgICAgIHN0aWxsIGFmZmVjdCB0aGUgImNvbnRlbnQgcmlnaHQgaW4gdmlzdWFs IG9yZGVyIiAoPHNwYW4gc3R5bGU9ImJvcmRlci1yaWdodDogMTBweCBzb2xpZCBncmVlbiI+KS4K KworICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3Bs YXlDb250ZW50QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURp c3BsYXlDb250ZW50QnVpbGRlcjo6Y3JlYXRlQm94ZXNBbmRVcGRhdGVHZW9tZXRyeUZvckxpbmVD b250ZW50KTogYWRkIHRoZSBhZGRpdGlvbmFsIGxpbmVSdW4uaXNJbmxpbmVCb3hFbmQoKSBjYXNl LgorCiAyMDIxLTExLTEyICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTEZDXVtJRkNdIElubGluZSBib3ggZW5kIChvcGFxdWUgdG8gYmlkaSkgc2hvdWxkIGdldCB0 aGUgYmlkaSBsZXZlbCBmcm9tIGl0cyBhZGphY2VudCBjb250ZW50CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcAppbmRleCA4NGFjMmZi ZDQ4ZDU3MjgxMGFiYzY3M2QxMjUzYjRmZjY0OGEzZGViLi5kNWZmNzlkNjE0Y2UxNTNhZTQxOGIy ZTNjZmQ5ZDJiN2NmZjdlYjFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKQEAgLTEwMywxMCArMTAzLDEzIEBAIHZvaWQgSW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVCb3hlc0FuZFVwZGF0ZUdlb21ldHJ5Rm9y TGluZUNvbnRlbnQoY29uCiAgICAgICAgICAgICAgICAgbG9naWNhbFJlY3QgPSBsaW5lQm94Lmxv Z2ljYWxSZWN0Rm9yTGluZUJyZWFrQm94KGxheW91dEJveCk7CiAgICAgICAgICAgICBlbHNlIHsK ICAgICAgICAgICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZS5ib3hH ZW9tZXRyeShsYXlvdXRCb3gpOwotICAgICAgICAgICAgICAgIG1hcmdpblN0YXJ0ID0gYm94R2Vv bWV0cnkubWFyZ2luU3RhcnQoKTsKLSAgICAgICAgICAgICAgICBpZiAobGluZVJ1bi5pc0JveCgp KQorICAgICAgICAgICAgICAgIGlmIChsaW5lUnVuLmlzQm94KCkpIHsKKyAgICAgICAgICAgICAg ICAgICAgbWFyZ2luU3RhcnQgPSBib3hHZW9tZXRyeS5tYXJnaW5TdGFydCgpOwogICAgICAgICAg ICAgICAgICAgICBsb2dpY2FsUmVjdCA9IGxpbmVCb3gubG9naWNhbEJvcmRlckJveEZvckF0b21p Y0lubGluZUxldmVsQm94KGxheW91dEJveCwgYm94R2VvbWV0cnkpOwotICAgICAgICAgICAgICAg IGVsc2UgaWYgKGxpbmVSdW4uaXNJbmxpbmVCb3hTdGFydCgpIHx8IGxpbmVSdW4uaXNMaW5lU3Bh bm5pbmdJbmxpbmVCb3hTdGFydCgpKQorICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAobGluZVJ1 bi5pc0lubGluZUJveFN0YXJ0KCkpIHsKKyAgICAgICAgICAgICAgICAgICAgbWFyZ2luU3RhcnQg PSBib3hHZW9tZXRyeS5tYXJnaW5TdGFydCgpOworICAgICAgICAgICAgICAgICAgICBsb2dpY2Fs UmVjdCA9IGxpbmVCb3gubG9naWNhbEJvcmRlckJveEZvcklubGluZUJveChsYXlvdXRCb3gsIGJv eEdlb21ldHJ5KTsKKyAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKGxpbmVSdW4uaXNMaW5lU3Bh bm5pbmdJbmxpbmVCb3hTdGFydCgpKQogICAgICAgICAgICAgICAgICAgICBsb2dpY2FsUmVjdCA9 IGxpbmVCb3gubG9naWNhbEJvcmRlckJveEZvcklubGluZUJveChsYXlvdXRCb3gsIGJveEdlb21l dHJ5KTsKICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOwpAQCAtMTIzLDE2ICsxMjYsMTMgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29u dGVudEJ1aWxkZXI6OmNyZWF0ZUJveGVzQW5kVXBkYXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChj b24KICAgICAgICAgICAgIGF1dG8gdmlzdWFsT3JkZXJSZWN0ID0gbG9naWNhbFJlY3Q7CiAgICAg ICAgICAgICBhdXRvIGNvbnRlbnRMZWZ0ID0gY29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciArIGRp c3RhbmNlRnJvbUxvZ2ljYWxQcmV2aW91c1J1biArIG1hcmdpblN0YXJ0LnZhbHVlX29yKDApOwog ICAgICAgICAgICAgdmlzdWFsT3JkZXJSZWN0LnNldExlZnQoY29udGVudExlZnQpOwotICAgICAg ICAgICAgLy8gVGhlIGlubGluZSBib3ggcmlnaHQgZWRnZSBpbmNsdWRlcyBpdHMgY29udGVudCBh cyB3ZWxsIGFzIHRoZSBpbmxpbmUgYm94IGVuZCAocGFkZGluZy1yaWdodCBldGMpLgotICAgICAg ICAgICAgLy8gV2hhdCB3ZSBuZWVkIGhlcmUgaXMgdGhlIGlubGluZSBib3ggc3RhcnQgcnVuJ3Mg d2lkdGguCi0gICAgICAgICAgICAvLyBOb3RlIHRoYXQgY29udGVudCB3aWR0aCBkb2VzIG5vdCBy ZWZlciB0byBjb250ZW50IF9ib3hfIGhlcmUgKGl0IGRvZXMgaW5jbHVkZSBwYWRkaW5nIGFuZCBi b3JkZXIgZm9yIGlubGluZSBsZXZlbCBib3hlcykuCi0gICAgICAgICAgICBhdXRvIGNvbnRlbnRX aWR0aCA9IGxpbmVSdW4uaXNJbmxpbmVCb3hTdGFydCgpIHx8IGxpbmVSdW4uaXNMaW5lU3Bhbm5p bmdJbmxpbmVCb3hTdGFydCgpID8gbGluZVJ1bi5sb2dpY2FsV2lkdGgoKSAtICptYXJnaW5TdGFy dCA6IGxvZ2ljYWxSZWN0LndpZHRoKCk7Ci0gICAgICAgICAgICBjb250ZW50UmlnaHRJblZpc3Vh bE9yZGVyID0gdmlzdWFsT3JkZXJSZWN0LmxlZnQoKSArIGNvbnRlbnRXaWR0aDsKICAgICAgICAg ICAgIHJldHVybiB2aXN1YWxPcmRlclJlY3Q7CiAgICAgICAgIH07CiAKICAgICAgICAgaWYgKGxp bmVSdW4uaXNUZXh0KCkpIHsKICAgICAgICAgICAgIGF1dG8gdGV4dFJ1blJlY3QgPSBkaXNwbGF5 Qm94UmVjdCgpOworICAgICAgICAgICAgY29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciA9IHRleHRS dW5SZWN0LnJpZ2h0KCk7CisKICAgICAgICAgICAgIGF1dG8gaW5rT3ZlcmZsb3cgPSBbJl0gewog ICAgICAgICAgICAgICAgIGF1dG8gaW5pdGlhbENvbnRhaW5nQmxvY2tTaXplID0gUnVudGltZUVu YWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5sYXlvdXRGb3JtYXR0aW5nQ29udGV4dElu dGVncmF0aW9uRW5hYmxlZCgpCiAgICAgICAgICAgICAgICAgICAgID8gZm9ybWF0dGluZ1N0YXRl LmxheW91dFN0YXRlKCkudmlld3BvcnRTaXplKCkKQEAgLTE5MCw2ICsxOTAsNyBAQCB2b2lkIElu bGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6Y3JlYXRlQm94ZXNBbmRVcGRhdGVHZW9tZXRyeUZv ckxpbmVDb250ZW50KGNvbgogICAgICAgICBpZiAobGluZVJ1bi5pc0JveCgpKSB7CiAgICAgICAg ICAgICBBU1NFUlQobGF5b3V0Qm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSk7CiAgICAgICAg ICAgICBhdXRvIGJvcmRlckJveFJlY3QgPSBkaXNwbGF5Qm94UmVjdCgpOworICAgICAgICAgICAg Y29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciA9IGJvcmRlckJveFJlY3QucmlnaHQoKTsKICAgICAg ICAgICAgIC8vIEZJWE1FOiBBZGQgaW5rIG92ZXJmbG93IHN1cHBvcnQgZm9yIGF0b21pYyBpbmxp bmUgbGV2ZWwgYm94ZXMgKGUuZy4gYm94IHNoYWRvdykuCiAgICAgICAgICAgICBib3hlcy5hcHBl bmQoeyBsaW5lSW5kZXgsIElubGluZURpc3BsYXk6OkJveDo6VHlwZTo6QXRvbWljSW5saW5lTGV2 ZWxCb3gsIGxheW91dEJveCwgbGluZVJ1bi5iaWRpTGV2ZWwoKSwgYm9yZGVyQm94UmVjdCwgYm9y ZGVyQm94UmVjdCwgbGluZVJ1bi5leHBhbnNpb24oKSwgeyB9IH0pOwogCkBAIC0yMTAsOCArMjEx LDEwIEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVCb3hlc0FuZFVw ZGF0ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQoY29uCiAgICAgICAgICAgICBjb250aW51ZTsKICAg ICAgICAgfQogICAgICAgICBpZiAobGluZVJ1bi5pc0lubGluZUJveFN0YXJ0KCkpIHsKKyAgICAg ICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRlLmJveEdlb21ldHJ5KGxh eW91dEJveCk7CiAgICAgICAgICAgICAvLyBUaGlzIGlubGluZSBib3ggc2hvd2VkIHVwIGZpcnN0 IG9uIHRoaXMgbGluZS4KICAgICAgICAgICAgIGF1dG8gaW5saW5lQm94Qm9yZGVyQm94ID0gZGlz cGxheUJveFJlY3QoKTsKKyAgICAgICAgICAgIGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIgKz0g bGluZVJ1bi5sb2dpY2FsV2lkdGgoKTsKICAgICAgICAgICAgIGlmIChsaW5lQm94Lmhhc0NvbnRl bnQoKSkgewogICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBJdCdzIGV4cGVjdGVkIHRvIG5vdCBo YXZlIGFueSBib3hlcyBvbiBlbXB0eSBsaW5lcy4gV2Ugc2hvdWxkIHJlY29uc2lkZXIgdGhpcy4K ICAgICAgICAgICAgICAgICBtX2lubGluZUJveEluZGV4TWFwLmFkZCgmbGF5b3V0Qm94LCBib3hl cy5zaXplKCkpOwpAQCAtMjIyLDcgKzIyNSw2IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRC dWlsZGVyOjpjcmVhdGVCb3hlc0FuZFVwZGF0ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQoY29uCiAg ICAgICAgICAgICAgICAgYm94ZXMuYXBwZW5kKHsgbGluZUluZGV4LCBJbmxpbmVEaXNwbGF5OjpC b3g6OlR5cGU6Ok5vblJvb3RJbmxpbmVCb3gsIGxheW91dEJveCwgbGluZVJ1bi5iaWRpTGV2ZWwo KSwgaW5saW5lQm94Qm9yZGVyQm94LCBpbmxpbmVCb3hCb3JkZXJCb3gsIHsgfSwgeyB9LCBpbmxp bmVCb3guaGFzQ29udGVudCgpLCBpc0ZpcnN0TGFzdEJveChpbmxpbmVCb3gpIH0pOwogICAgICAg ICAgICAgfQogCi0gICAgICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0 ZS5ib3hHZW9tZXRyeShsYXlvdXRCb3gpOwogICAgICAgICAgICAgYXV0byBpbmxpbmVCb3hTaXpl ID0gTGF5b3V0U2l6ZSB7IExheW91dFVuaXQ6OmZyb21GbG9hdENlaWwoaW5saW5lQm94Qm9yZGVy Qm94LndpZHRoKCkpLCBMYXlvdXRVbml0Ojpmcm9tRmxvYXRDZWlsKGlubGluZUJveEJvcmRlckJv eC5oZWlnaHQoKSkgfTsKICAgICAgICAgICAgIGF1dG8gbG9naWNhbFJlY3QgPSBSZWN0IHsgTGF5 b3V0UG9pbnQgeyBpbmxpbmVCb3hCb3JkZXJCb3gudG9wTGVmdCgpIH0sIGlubGluZUJveFNpemUg fTsKICAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldExvZ2ljYWxUb3BMZWZ0KGxvZ2ljYWxSZWN0 LnRvcExlZnQoKSk7CkBAIC0yNDMsNiArMjQ1LDggQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVu dEJ1aWxkZXI6OmNyZWF0ZUJveGVzQW5kVXBkYXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb24K IAogICAgICAgICAgICAgYXV0byYgaW5saW5lQm94ID0gbGluZUJveC5pbmxpbmVMZXZlbEJveEZv ckxheW91dEJveChsYXlvdXRCb3gpOwogICAgICAgICAgICAgYXV0byBpbmxpbmVCb3hCb3JkZXJC b3ggPSBkaXNwbGF5Qm94UmVjdCgpOworICAgICAgICAgICAgLy8gVGhlIGNvbnRlbnQgcmlnaHQg ZWRnZSBzaG91bGQgbm90IGluY2x1ZGUgdGhlIGVudGlyZSBpbmxpbmUgYm94IGhlcmUgKGluY2x1 ZGluZyBpdHMgY29udGVudCBhbmQgcmlnaHQgZWRnZSkuCisgICAgICAgICAgICBjb250ZW50Umln aHRJblZpc3VhbE9yZGVyICs9IGxpbmVSdW4ubG9naWNhbFdpZHRoKCk7CiAgICAgICAgICAgICBB U1NFUlQoIWlubGluZUJveC5pc0ZpcnN0Qm94KCkpOwogICAgICAgICAgICAgYm94ZXMuYXBwZW5k KHsgbGluZUluZGV4LCBJbmxpbmVEaXNwbGF5OjpCb3g6OlR5cGU6Ok5vblJvb3RJbmxpbmVCb3gs IGxheW91dEJveCwgbGluZVJ1bi5iaWRpTGV2ZWwoKSwgaW5saW5lQm94Qm9yZGVyQm94LCBpbmxp bmVCb3hCb3JkZXJCb3gsIHsgfSwgeyB9LCBpbmxpbmVCb3guaGFzQ29udGVudCgpLCBpc0ZpcnN0 TGFzdEJveChpbmxpbmVCb3gpIH0pOwogCkBAIC0yNTgsNyArMjYyLDExIEBAIHZvaWQgSW5saW5l RGlzcGxheUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVCb3hlc0FuZFVwZGF0ZUdlb21ldHJ5Rm9yTGlu ZUNvbnRlbnQoY29uCiAgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRDb250ZW50Qm94V2lkdGgo ZW5jbG9zaW5nQm9yZGVyQm94UmVjdC53aWR0aCgpIC0gKGJveEdlb21ldHJ5Lmhvcml6b250YWxC b3JkZXIoKSArIGJveEdlb21ldHJ5Lmhvcml6b250YWxQYWRkaW5nKCkudmFsdWVfb3IoMF9sdSkp KTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9Ci0gICAgICAgIEFTU0VSVChsaW5l UnVuLmlzSW5saW5lQm94RW5kKCkgfHwgbGluZVJ1bi5pc1dvcmRCcmVha09wcG9ydHVuaXR5KCkp OworICAgICAgICBpZiAobGluZVJ1bi5pc0lubGluZUJveEVuZCgpKSB7CisgICAgICAgICAgICBj b250ZW50UmlnaHRJblZpc3VhbE9yZGVyICs9IGxpbmVSdW4ubG9naWNhbFdpZHRoKCk7CisgICAg ICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAgICBBU1NFUlQobGluZVJ1bi5pc1dv cmRCcmVha09wcG9ydHVuaXR5KCkpOwogICAgIH0KIH0KIAo=