234287 2021-12-13 20:17:09 -0800 [LFC][IFC] Take text-align offset into account when computing the RTL display box geometry 2021-12-14 12:59:15 -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 1823886 0 zalan 2021-12-13 20:17:09 -0800 ssia 1823889 1 447101 zalan 2021-12-13 20:22:01 -0800 Created attachment 447101 Patch 1824085 2 ews-feeder 2021-12-14 12:58:35 -0800 Committed r287043 (245241@main): <https://commits.webkit.org/245241@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447101. 1824086 3 webkit-bug-importer 2021-12-14 12:59:15 -0800 <rdar://problem/86484729> 447101 2021-12-13 20:22:01 -0800 2021-12-14 12:58:37 -0800 Patch bug-234287-20211213202201.patch text/plain 7539 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2OTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDg4ZDM0NWU3YmY2ZGY0 NGNkNzJiMTgwNDFmN2UwZmUyZjFlN2VkNC4uYWM3NmE4NDc4MjFjMzcxNjhhYzM5Mzc2NjVhMGY5 NTE5ZTVmNDZiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTEyLTEzICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFRha2UgdGV4 dC1hbGlnbiBvZmZzZXQgaW50byBhY2NvdW50IHdoZW4gY29tcHV0aW5nIHRoZSBSVEwgZGlzcGxh eSBib3ggZ2VvbWV0cnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIzNDI4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFVzZSBMaW5lQm94Ojpyb290SW5saW5lQm94QWxpZ25tZW50T2Zmc2V0IHRvIG9mZnNl dCB0aGUgdmlzdWFsIHN0YXJ0IHBvc2l0aW9uIGZvciBSVEwgZGlzcGxheSBib3hlcy4KKworICAg ICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250 ZW50QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlD b250ZW50QnVpbGRlcjo6cHJvY2Vzc05vbkJpZGlDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQp OgorCiAyMDIxLTEyLTEzICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTEZDXVtJRkNdIFRha2UgaW5saW5lIGF4aXMgZGlyZWN0aW9uIGludG8gYWNjb3VudCB3aGVu IGNvbXB1dGluZyBob3Jpem9udGFsIGFsaWdubWVudCBvZmZzZXQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlD b250ZW50QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCmluZGV4IGFhMjA2ZmZm NzI1YmY1ZWYxYjcwYWZhNjRiNzM1OWYxZTJmZWNmODMuLmEwZjQ5ZDhlNmEyYTMxYjNkOTMyZWQw ZWUyNDg1MDcyOWI2NjZlMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l RGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcApAQCAtMjg4LDM5ICsyODgsNDIgQEAgdm9pZCBJbmxp bmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZElubGluZURpc3BsYXlCb3hBdEJpZGlCb3Vu ZGFyeShjb25zdCBCb3gKIAogdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nl c3NOb25CaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmIGxpbmVDb250 ZW50LCBjb25zdCBMaW5lQm94JiBsaW5lQm94LCBjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbGlu ZUJveExvZ2ljYWxUb3BMZWZ0LCBEaXNwbGF5Qm94ZXMmIGJveGVzKQogewotICAgIC8vIENyZWF0 ZSB0aGUgaW5saW5lIGJveGVzIG9uIHRoZSBjdXJyZW50IGxpbmUuIFRoaXMgaXMgbW9zdGx5IHRl eHQgYW5kIGF0b21pYyBpbmxpbmUgYm94ZXMuCisgICAgYXV0byByb290SW5saW5lQm94V2lkdGgg PSBsaW5lQm94LmxvZ2ljYWxSZWN0Rm9yUm9vdElubGluZUJveCgpLndpZHRoKCk7CiAgICAgYXV0 byByb290SW5saW5lQm94QWxpZ25tZW50T2Zmc2V0ID0gbGluZUJveC5yb290SW5saW5lQm94QWxp Z25tZW50T2Zmc2V0KCk7CisgICAgYXV0byBuZWVkc0RpcmVjdGlvbkFkanVzdG1lbnQgPSAhcm9v dCgpLnN0eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpOwogCiAgICAgZm9yIChhdXRvJiBs aW5lUnVuIDogbGluZUNvbnRlbnQucnVucykgewogICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSBs aW5lUnVuLmxheW91dEJveCgpOwogCi0gICAgICAgIGF1dG8gbG9naWNhbFJlY3RSZWxhdGl2ZVRv Um9vdCA9IFsmXShhdXRvIGxvZ2ljYWxSZWN0KSB7Ci0gICAgICAgICAgICBsb2dpY2FsUmVjdC5t b3ZlQnkoeyBsaW5lQm94TG9naWNhbFRvcExlZnQueCgpICsgcm9vdElubGluZUJveEFsaWdubWVu dE9mZnNldCwgbGluZUJveExvZ2ljYWxUb3BMZWZ0LnkoKSB9KTsKKyAgICAgICAgYXV0byB2aXN1 YWxSZWN0UmVsYXRpdmVUb1Jvb3QgPSBbJl0oYXV0byBsb2dpY2FsUmVjdCkgeworICAgICAgICAg ICAgLy8gV2hlbiB0aGUgbG9naWNhbCBvcmRlciA9PSB2aXN1YWwgb3JkZXIsIFJUTCBpbmxpbmUg ZGlyZWN0aW9uIGlzIGp1c3QgYW4gb2Zmc2V0LgorICAgICAgICAgICAgYXV0byBob3Jpem9udGFs T2Zmc2V0ID0gbmVlZHNEaXJlY3Rpb25BZGp1c3RtZW50ID8gbGluZUNvbnRlbnQubGluZUxvZ2lj YWxXaWR0aCAtIHJvb3RJbmxpbmVCb3hXaWR0aCAtIHJvb3RJbmxpbmVCb3hBbGlnbm1lbnRPZmZz ZXQgOiByb290SW5saW5lQm94QWxpZ25tZW50T2Zmc2V0OworICAgICAgICAgICAgbG9naWNhbFJl Y3QubW92ZUJ5KHsgbGluZUJveExvZ2ljYWxUb3BMZWZ0LngoKSArIGhvcml6b250YWxPZmZzZXQs IGxpbmVCb3hMb2dpY2FsVG9wTGVmdC55KCkgfSk7CiAgICAgICAgICAgICByZXR1cm4gbG9naWNh bFJlY3Q7CiAgICAgICAgIH07CiAKICAgICAgICAgaWYgKGxpbmVSdW4uaXNUZXh0KCkpIHsKLSAg ICAgICAgICAgIGFwcGVuZFRleHREaXNwbGF5Qm94KGxpbmVSdW4sIGxvZ2ljYWxSZWN0UmVsYXRp dmVUb1Jvb3QobGluZUJveC5sb2dpY2FsUmVjdEZvclRleHRSdW4obGluZVJ1bikpLCBib3hlcyk7 CisgICAgICAgICAgICBhcHBlbmRUZXh0RGlzcGxheUJveChsaW5lUnVuLCB2aXN1YWxSZWN0UmVs YXRpdmVUb1Jvb3QobGluZUJveC5sb2dpY2FsUmVjdEZvclRleHRSdW4obGluZVJ1bikpLCBib3hl cyk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogICAgICAgICBpZiAobGluZVJ1 bi5pc1NvZnRMaW5lQnJlYWsoKSkgewotICAgICAgICAgICAgYXBwZW5kU29mdExpbmVCcmVha0Rp c3BsYXlCb3gobGluZVJ1biwgbG9naWNhbFJlY3RSZWxhdGl2ZVRvUm9vdChsaW5lQm94LmxvZ2lj YWxSZWN0Rm9yVGV4dFJ1bihsaW5lUnVuKSksIGJveGVzKTsKKyAgICAgICAgICAgIGFwcGVuZFNv ZnRMaW5lQnJlYWtEaXNwbGF5Qm94KGxpbmVSdW4sIHZpc3VhbFJlY3RSZWxhdGl2ZVRvUm9vdChs aW5lQm94LmxvZ2ljYWxSZWN0Rm9yVGV4dFJ1bihsaW5lUnVuKSksIGJveGVzKTsKICAgICAgICAg ICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAgICAgICAgIGlmIChsaW5lUnVuLmlzSGFyZExpbmVC cmVhaygpKSB7Ci0gICAgICAgICAgICBhcHBlbmRIYXJkTGluZUJyZWFrRGlzcGxheUJveChsaW5l UnVuLCBsb2dpY2FsUmVjdFJlbGF0aXZlVG9Sb290KGxpbmVCb3gubG9naWNhbFJlY3RGb3JMaW5l QnJlYWtCb3gobGF5b3V0Qm94KSksIGJveGVzKTsKKyAgICAgICAgICAgIGFwcGVuZEhhcmRMaW5l QnJlYWtEaXNwbGF5Qm94KGxpbmVSdW4sIHZpc3VhbFJlY3RSZWxhdGl2ZVRvUm9vdChsaW5lQm94 LmxvZ2ljYWxSZWN0Rm9yTGluZUJyZWFrQm94KGxheW91dEJveCkpLCBib3hlcyk7CiAgICAgICAg ICAgICBjb250aW51ZTsKICAgICAgICAgfQogICAgICAgICBpZiAobGluZVJ1bi5pc0JveCgpKSB7 CiAgICAgICAgICAgICBhcHBlbmRBdG9taWNJbmxpbmVMZXZlbERpc3BsYXlCb3gobGluZVJ1bgot ICAgICAgICAgICAgICAgICwgbG9naWNhbFJlY3RSZWxhdGl2ZVRvUm9vdChsaW5lQm94LmxvZ2lj YWxCb3JkZXJCb3hGb3JBdG9taWNJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gsIGZvcm1hdHRpbmdT dGF0ZSgpLmJveEdlb21ldHJ5KGxheW91dEJveCkpKQorICAgICAgICAgICAgICAgICwgdmlzdWFs UmVjdFJlbGF0aXZlVG9Sb290KGxpbmVCb3gubG9naWNhbEJvcmRlckJveEZvckF0b21pY0lubGlu ZUxldmVsQm94KGxheW91dEJveCwgZm9ybWF0dGluZ1N0YXRlKCkuYm94R2VvbWV0cnkobGF5b3V0 Qm94KSkpCiAgICAgICAgICAgICAgICAgLCBib3hlcyk7CiAgICAgICAgICAgICBjb250aW51ZTsK ICAgICAgICAgfQogICAgICAgICBpZiAobGluZVJ1bi5pc0lubGluZUJveFN0YXJ0KCkpIHsKICAg ICAgICAgICAgIGFwcGVuZElubGluZUJveERpc3BsYXlCb3gobGluZVJ1bgogICAgICAgICAgICAg ICAgICwgbGluZUJveC5pbmxpbmVMZXZlbEJveEZvckxheW91dEJveChsaW5lUnVuLmxheW91dEJv eCgpKQotICAgICAgICAgICAgICAgICwgbG9naWNhbFJlY3RSZWxhdGl2ZVRvUm9vdChsaW5lQm94 LmxvZ2ljYWxCb3JkZXJCb3hGb3JJbmxpbmVCb3gobGF5b3V0Qm94LCBmb3JtYXR0aW5nU3RhdGUo KS5ib3hHZW9tZXRyeShsYXlvdXRCb3gpKSkKKyAgICAgICAgICAgICAgICAsIHZpc3VhbFJlY3RS ZWxhdGl2ZVRvUm9vdChsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hGb3JJbmxpbmVCb3gobGF5b3V0 Qm94LCBmb3JtYXR0aW5nU3RhdGUoKS5ib3hHZW9tZXRyeShsYXlvdXRCb3gpKSkKICAgICAgICAg ICAgICAgICAsIGxpbmVCb3guaGFzQ29udGVudCgpCiAgICAgICAgICAgICAgICAgLCBib3hlcyk7 CiAgICAgICAgICAgICBjb250aW51ZTsKQEAgLTMzNCw3ICszMzcsNyBAQCB2b2lkIElubGluZURp c3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc05vbkJpZGlDb250ZW50KGNvbnN0IExpbmVCdWls ZGVyOjpMaW5lQwogICAgICAgICAgICAgfQogICAgICAgICAgICAgYXBwZW5kU3Bhbm5pbmdJbmxp bmVCb3hEaXNwbGF5Qm94KGxpbmVSdW4KICAgICAgICAgICAgICAgICAsIGxpbmVCb3guaW5saW5l TGV2ZWxCb3hGb3JMYXlvdXRCb3gobGluZVJ1bi5sYXlvdXRCb3goKSkKLSAgICAgICAgICAgICAg ICAsIGxvZ2ljYWxSZWN0UmVsYXRpdmVUb1Jvb3QobGluZUJveC5sb2dpY2FsQm9yZGVyQm94Rm9y SW5saW5lQm94KGxheW91dEJveCwgZm9ybWF0dGluZ1N0YXRlKCkuYm94R2VvbWV0cnkobGF5b3V0 Qm94KSkpCisgICAgICAgICAgICAgICAgLCB2aXN1YWxSZWN0UmVsYXRpdmVUb1Jvb3QobGluZUJv eC5sb2dpY2FsQm9yZGVyQm94Rm9ySW5saW5lQm94KGxheW91dEJveCwgZm9ybWF0dGluZ1N0YXRl KCkuYm94R2VvbWV0cnkobGF5b3V0Qm94KSkpCiAgICAgICAgICAgICAgICAgLCBib3hlcyk7CiAg ICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQpAQCAtNDg0LDE2ICs0ODcsMTEgQEAgdm9p ZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudChjb25zdCBM aW5lQnVpbGRlcjo6TGluZUNvbnQKICAgICBhbmNlc3RvclN0YWNrLnB1c2goeyB9LCByb290KCkp OwogCiAgICAgYXV0byByb290SW5saW5lQm94QWxpZ25tZW50T2Zmc2V0ID0gbGluZUJveC5yb290 SW5saW5lQm94QWxpZ25tZW50T2Zmc2V0KCk7Ci0gICAgYXV0byBjb250ZW50U3RhcnRJblZpc3Vh bE9yZGVyID0gSW5saW5lTGF5b3V0VW5pdCB7IH07CisgICAgYXV0byBjb250ZW50U3RhcnRJblZp c3VhbE9yZGVyID0gcm9vdElubGluZUJveEFsaWdubWVudE9mZnNldDsKICAgICBhdXRvIGNyZWF0 ZURpc3BsYXlCb3hlc0luVmlzdWFsT3JkZXIgPSBbJl0gewotICAgICAgICBhdXRvIHJvb3RJbmxp bmVCb3hSZWN0ID0gbGluZUJveC5sb2dpY2FsUmVjdEZvclJvb3RJbmxpbmVCb3goKTsKICAgICAg ICAgLy8gRmlyc3QgdmlzdWFsIHJ1bidzIGluaXRpYWwgY29udGVudCBwb3NpdGlvbiBkZXBlbmRz IG9uIHRoZSBibG9jaydzIGlubGluZSBkaXJlY3Rpb24uCi0gICAgICAgIGlmICghcm9vdCgpLnN0 eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpKSB7Ci0gICAgICAgICAgICAvLyBGSVhNRTog VGhpcyBuZWVkcyB0aGUgYmxvY2sgZW5kIHBvc2l0aW9uIGluc3RlYWQgb2YgdGhlIGxpbmVMb2dp Y2FsV2lkdGguCi0gICAgICAgICAgICBjb250ZW50U3RhcnRJblZpc3VhbE9yZGVyICs9IGxpbmVD b250ZW50LmxpbmVMb2dpY2FsV2lkdGggLSByb290SW5saW5lQm94UmVjdC53aWR0aCgpOwotICAg ICAgICB9Ci0gICAgICAgIC8vIEFkanVzdCB0aGUgY29udGVudCBzdGFydCBwb3NpdGlvbiB3aXRo IHRoZSAodGV4dClhbGlnbm1lbnQgb2Zmc2V0IChyb290IGlubGluZSBib3ggaGFzIHRoZSBhbGln bm1lbnQgb2Zmc2V0IGFuZCBub3QgdGhlIGluZGl2aWR1YWwgcnVucykuCi0gICAgICAgIGNvbnRl bnRTdGFydEluVmlzdWFsT3JkZXIgKz0gcm9vdElubGluZUJveEFsaWdubWVudE9mZnNldDsKKyAg ICAgICAgaWYgKCFyb290KCkuc3R5bGUoKS5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkpCisgICAg ICAgICAgICBjb250ZW50U3RhcnRJblZpc3VhbE9yZGVyID0gbGluZUNvbnRlbnQubGluZUxvZ2lj YWxXaWR0aCAtIGxpbmVCb3gubG9naWNhbFJlY3RGb3JSb290SW5saW5lQm94KCkud2lkdGgoKSAt IHJvb3RJbmxpbmVCb3hBbGlnbm1lbnRPZmZzZXQ7CiAKICAgICAgICAgYXV0byBjb250ZW50Umln aHRJblZpc3VhbE9yZGVyID0gY29udGVudFN0YXJ0SW5WaXN1YWxPcmRlcjsKICAgICAgICAgYXV0 byYgcnVucyA9IGxpbmVDb250ZW50LnJ1bnM7CkBAIC01MDcsMTAgKzUwNSwxMCBAQCB2b2lkIElu bGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KGNvbnN0IExpbmVC dWlsZGVyOjpMaW5lQ29udAogICAgICAgICAgICAgaWYgKCFuZWVkc0Rpc3BsYXlCb3gpCiAgICAg ICAgICAgICAgICAgY29udGludWU7CiAKLSAgICAgICAgICAgIGF1dG8gdmlzdWFsUmVjdFJlbGF0 aXZlVG9Sb290ID0gWyZdKGF1dG8gbG9naWNhbGxSZWN0KSB7Ci0gICAgICAgICAgICAgICAgbG9n aWNhbGxSZWN0LnNldExlZnQoY29udGVudFJpZ2h0SW5WaXN1YWxPcmRlcik7Ci0gICAgICAgICAg ICAgICAgbG9naWNhbGxSZWN0Lm1vdmVCeShsaW5lQm94TG9naWNhbFRvcExlZnQpOwotICAgICAg ICAgICAgICAgIHJldHVybiBsb2dpY2FsbFJlY3Q7CisgICAgICAgICAgICBhdXRvIHZpc3VhbFJl Y3RSZWxhdGl2ZVRvUm9vdCA9IFsmXShhdXRvIGxvZ2ljYWxSZWN0KSB7CisgICAgICAgICAgICAg ICAgbG9naWNhbFJlY3Quc2V0TGVmdChjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyKTsKKyAgICAg ICAgICAgICAgICBsb2dpY2FsUmVjdC5tb3ZlQnkobGluZUJveExvZ2ljYWxUb3BMZWZ0KTsKKyAg ICAgICAgICAgICAgICByZXR1cm4gbG9naWNhbFJlY3Q7CiAgICAgICAgICAgICB9OwogCiAgICAg ICAgICAgICBhdXRvIHBhcmVudERpc3BsYXlCb3hOb2RlSW5kZXggPSBlbnN1cmVEaXNwbGF5Qm94 Rm9yQ29udGFpbmVyKGxheW91dEJveC5wYXJlbnQoKSwgZGlzcGxheUJveFRyZWUsIGFuY2VzdG9y U3RhY2ssIGJveGVzKTsK