274937 2024-05-30 17:28:32 -0700 REGRESSION(273633@main): Text is displayed outside of the view in DHL app 2024-05-31 05:44:08 -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 zalan oldest_to_newest 2038922 0 zalan 2024-05-30 17:28:32 -0700 <rdar://128348427> 2038926 1 471549 zalan 2024-05-30 17:38:50 -0700 Created attachment 471549 [fast-cq]Patch 2039016 2 ews-feeder 2024-05-31 05:44:06 -0700 Committed 279572@main (c05a8c24b9c1): <https://commits.webkit.org/279572@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 471549. 471549 2024-05-30 17:38:50 -0700 2024-05-31 05:44:07 -0700 [fast-cq]Patch bug-274937-20240530173849.patch text/plain 11121 zalan RnJvbSBkNDFhNzE1YjU5MTgxNzhmOTVlY2I5NzI3OTY1YzFjOGFjYWY2NTMxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFRodSwgMzAgTWF5IDIwMjQgMTc6Mjk6MTEgLTA3MDAKU3ViamVjdDogW1BBVENIXSBSRUdSRVNT SU9OKDI3MzYzM0BtYWluKTogVGV4dCBpcyBkaXNwbGF5ZWQgb3V0c2lkZSBvZiB0aGUKIHZpZXcg aW4gREhMIGFwcCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc0OTM3 CiA8cmRhcjovLzEyODM0ODQyNz4KClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKVGhpcyBj aGFuZ2UgZW5zdXJlcyB0aGF0IHRoZSBjb3JyZWN0IGNvbnRhaW5lciBpcyBwYXNzZWQgaW4gdG8g TGluZUJ1aWxkZXJzIGFzIHJvb3Qgc28gdGhhdCB0aGV5IGNhbiBjb25zdWx0IHRoZSBjb3JyZWN0 IFJlbmRlclN0eWxlLgoKVGhpcyBmaXggaXMgc3BlY2lmaWMgdG8gcmFuZ2UgYnVpbGRlcnMgd2hl biB3ZSBhc2sgdGhlIFRleHRPbmx5TGluZUJ1aWxkZXIgdG8gcnVuIGxheW91dCBvbmx5IG9uIGEg c3Vic2V0IG9mIGlubGluZSBpdGVtcwplLmcuCjxkaXY+PHNwYW4+cnVuIGxheW91dCBvbiB0aGlz IHRleHQgY29udGVudCBvbmx5PC9zcGFuPjwvZGl2PgoKTGluZSBidWlsZGVyIG9ubHkgInNlZXMi IHRoZSB0ZXh0IGNvbnRlbnQuIEhvd2V2ZXIgd2UgaW5jb3JyZWN0bHkgcGFzcyBpbiB0aGUgSUZD IHJvb3QgKDxkaXY+KSBhcyB0aGUgY29udGFpbmVyIGZvciB0aGlzIHRleHQgY29udGVudC4KVGhp cyBtb3N0bHkgd29ya3MgdW5sZXNzIHRoZSBhY3R1YWwgY29udGFpbmVyIChoYXMgdG8gYmUgYW4g aW5saW5lIGJveCBlLmcuIDxzcGFuPikgb3ZlcnJpZGVzIGNlcnRhaW4gc3R5bGVzIHJlbGF0ZWQg dG8gbGluZSBicmVha2luZy4KCiogTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvbWluLXdpZHRoLXdp dGgtaW5saW5lLWJveGVzLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgoqIExheW91dFRlc3RzL2Zhc3Qv aW5saW5lL21pbi13aWR0aC13aXRoLWlubGluZS1ib3hlcy5odG1sOiBBZGRlZC4KKiBTb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9BYnN0cmFjdExpbmVCdWls ZGVyLmg6CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW50cmluc2ljV2lkdGhIYW5kbGVyLmNwcDoKKFdlYkNvcmU6OkxheW91dDo6SW50cmluc2ljV2lk dGhIYW5kbGVyOjpJbnRyaW5zaWNXaWR0aEhhbmRsZXIpOgooV2ViQ29yZTo6TGF5b3V0OjpJbnRy aW5zaWNXaWR0aEhhbmRsZXI6Om1pbmltdW1Db250ZW50U2l6ZSk6CihXZWJDb3JlOjpMYXlvdXQ6 OkludHJpbnNpY1dpZHRoSGFuZGxlcjo6bWF4aW11bUNvbnRlbnRTaXplKToKKFdlYkNvcmU6Okxh eW91dDo6SW50cmluc2ljV2lkdGhIYW5kbGVyOjpzaW1wbGlmaWVkTWF4aW11bVdpZHRoKToKKFdl YkNvcmU6OkxheW91dDo6SW50cmluc2ljV2lkdGhIYW5kbGVyOjpmb3JtYXR0aW5nQ29udGV4dFJv b3QgY29uc3QpOgooV2ViQ29yZTo6TGF5b3V0OjpJbnRyaW5zaWNXaWR0aEhhbmRsZXI6OmxpbmVC dWlsZXJSb290IGNvbnN0KToKKFdlYkNvcmU6OkxheW91dDo6SW50cmluc2ljV2lkdGhIYW5kbGVy Ojpyb290IGNvbnN0KTogRGVsZXRlZC4KKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbnRyaW5zaWNXaWR0aEhhbmRsZXIuaDoKLS0tCiAuLi4vaW5saW5l L0Fic3RyYWN0TGluZUJ1aWxkZXIuaCAgICAgICAgICAgICAgfCAgMiArLQogLi4uL2lubGluZS9J bnRyaW5zaWNXaWR0aEhhbmRsZXIuY3BwICAgICAgICAgIHwgNDEgKysrKysrKysrKysrKystLS0t LQogLi4uL2lubGluZS9JbnRyaW5zaWNXaWR0aEhhbmRsZXIuaCAgICAgICAgICAgIHwgIDMgKy0K IC4uLi9taW4td2lkdGgtd2l0aC1pbmxpbmUtYm94ZXMtZXhwZWN0ZWQuaHRtbCB8IDE3ICsrKysr KysrCiAuLi4vaW5saW5lL21pbi13aWR0aC13aXRoLWlubGluZS1ib3hlcy5odG1sICAgfCAyMCAr KysrKysrKysKIDUgZmlsZXMgY2hhbmdlZCwgNzEgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25z KC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvbWluLXdpZHRo LXdpdGgtaW5saW5lLWJveGVzLWV4cGVjdGVkLmh0bWwKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlv dXRUZXN0cy9mYXN0L2lubGluZS9taW4td2lkdGgtd2l0aC1pbmxpbmUtYm94ZXMuaHRtbAoKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0Fic3RyYWN0TGluZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0Fic3RyYWN0TGluZUJ1aWxkZXIuaAppbmRleCAwZWQxYmM1ZWRiOGEu LmYyM2JlYzgxZmYzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvQWJzdHJhY3RMaW5lQnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0Fic3RyYWN0TGluZUJ1aWxkZXIu aApAQCAtODAsNyArODAsNyBAQCBwcm90ZWN0ZWQ6CiAKIHByaXZhdGU6CiAgICAgSW5saW5lRm9y bWF0dGluZ0NvbnRleHQmIG1faW5saW5lRm9ybWF0dGluZ0NvbnRleHQ7Ci0gICAgY29uc3QgRWxl bWVudEJveCYgbV9yb290Qm94OworICAgIGNvbnN0IEVsZW1lbnRCb3gmIG1fcm9vdEJveDsgLy8g Tm90ZSB0aGF0IHRoaXMgaXMgbm90IG5lY2Vzc2FyaWx5IGEgYmxvY2sgY29udGFpbmVyIChzZWUg cmFuZ2UgYnVpbGRlcikuCiAgICAgSG9yaXpvbnRhbENvbnN0cmFpbnRzIG1fcm9vdEhvcml6b250 YWxDb25zdHJhaW50czsKIAogICAgIElubGluZUNvbnRlbnRCcmVha2VyIG1faW5saW5lQ29udGVu dEJyZWFrZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbnRyaW5zaWNXaWR0aEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW50cmluc2ljV2lkdGhIYW5kbGVyLmNw cAppbmRleCA4ZWE4Yzg0MTlkZGIuLjdiMzRjNTI2ZDc0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW50cmluc2ljV2lkdGhIYW5k bGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbnRyaW5zaWNXaWR0aEhhbmRsZXIuY3BwCkBAIC05MCw3ICs5MCw3IEBAIEludHJpbnNp Y1dpZHRoSGFuZGxlcjo6SW50cmluc2ljV2lkdGhIYW5kbGVyKElubGluZUZvcm1hdHRpbmdDb250 ZXh0JiBpbmxpbmVGb3JtCiB7CiAgICAgYXV0byBpbml0aWFsaXplUmFuZ2VBbmRUZXh0T25seUJ1 aWxkZXJFbGlnaWJpbGl0eSA9IFsmXSB7CiAgICAgICAgIG1faW5saW5lSXRlbVJhbmdlID0geyAw LCBpbmxpbmVJdGVtcy5jb250ZW50KCkuc2l6ZSgpIH07Ci0gICAgICAgIG1fbWF5VXNlU2ltcGxp ZmllZFRleHRPbmx5SW5saW5lTGF5b3V0SW5SYW5nZSA9IFRleHRPbmx5U2ltcGxlTGluZUJ1aWxk ZXI6OmlzRWxpZ2libGVGb3JTaW1wbGlmaWVkSW5saW5lTGF5b3V0QnlTdHlsZShyb290KCkuc3R5 bGUoKSk7CisgICAgICAgIG1fbWF5VXNlU2ltcGxpZmllZFRleHRPbmx5SW5saW5lTGF5b3V0SW5S YW5nZSA9IFRleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXI6OmlzRWxpZ2libGVGb3JTaW1wbGlmaWVk SW5saW5lTGF5b3V0QnlTdHlsZShmb3JtYXR0aW5nQ29udGV4dFJvb3QoKS5zdHlsZSgpKTsKICAg ICAgICAgaWYgKCFtX21heVVzZVNpbXBsaWZpZWRUZXh0T25seUlubGluZUxheW91dEluUmFuZ2Up CiAgICAgICAgICAgICByZXR1cm47CiAKQEAgLTEyNywxMCArMTI3LDEwIEBAIElubGluZUxheW91 dFVuaXQgSW50cmluc2ljV2lkdGhIYW5kbGVyOjptaW5pbXVtQ29udGVudFNpemUoKQogewogICAg IGF1dG8gbWluaW11bUNvbnRlbnRTaXplID0gSW5saW5lTGF5b3V0VW5pdCB7IH07CiAKLSAgICBp ZiAoaXNDb250ZW50RWxpZ2libGVGb3JOb25MaW5lQnVpbGRlck1pbmltdW1XaWR0aChyb290KCks IG1fbWF5VXNlU2ltcGxpZmllZFRleHRPbmx5SW5saW5lTGF5b3V0SW5SYW5nZSkpCi0gICAgICAg IG1pbmltdW1Db250ZW50U2l6ZSA9IHNpbXBsaWZpZWRNaW5pbXVtV2lkdGgocm9vdCgpKTsKKyAg ICBpZiAoaXNDb250ZW50RWxpZ2libGVGb3JOb25MaW5lQnVpbGRlck1pbmltdW1XaWR0aChmb3Jt YXR0aW5nQ29udGV4dFJvb3QoKSwgbV9tYXlVc2VTaW1wbGlmaWVkVGV4dE9ubHlJbmxpbmVMYXlv dXRJblJhbmdlKSkKKyAgICAgICAgbWluaW11bUNvbnRlbnRTaXplID0gc2ltcGxpZmllZE1pbmlt dW1XaWR0aChmb3JtYXR0aW5nQ29udGV4dFJvb3QoKSk7CiAgICAgZWxzZSBpZiAobV9tYXlVc2VT aW1wbGlmaWVkVGV4dE9ubHlJbmxpbmVMYXlvdXRJblJhbmdlKSB7Ci0gICAgICAgIGF1dG8gc2lt cGxpZmllZExpbmVCdWlsZGVyID0gVGV4dE9ubHlTaW1wbGVMaW5lQnVpbGRlciB7IGZvcm1hdHRp bmdDb250ZXh0KCksIGZvcm1hdHRpbmdDb250ZXh0KCkucm9vdCgpLCB7IH0sIGlubGluZUl0ZW1M aXN0KCkgfTsKKyAgICAgICAgYXV0byBzaW1wbGlmaWVkTGluZUJ1aWxkZXIgPSBUZXh0T25seVNp bXBsZUxpbmVCdWlsZGVyIHsgZm9ybWF0dGluZ0NvbnRleHQoKSwgbGluZUJ1aWxlclJvb3QoKSwg eyB9LCBpbmxpbmVJdGVtTGlzdCgpIH07CiAgICAgICAgIG1pbmltdW1Db250ZW50U2l6ZSA9IGNv bXB1dGVkSW50cmluc2ljV2lkdGhGb3JDb25zdHJhaW50KEludHJpbnNpY1dpZHRoTW9kZTo6TWlu aW11bSwgc2ltcGxpZmllZExpbmVCdWlsZGVyLCBNYXlDYWNoZUxheW91dFJlc3VsdDo6Tm8pOwog ICAgIH0gZWxzZSB7CiAgICAgICAgIGF1dG8gbGluZUJ1aWxkZXIgPSBMaW5lQnVpbGRlciB7IGZv cm1hdHRpbmdDb250ZXh0KCksIHsgfSwgaW5saW5lSXRlbUxpc3QoKSB9OwpAQCAtMTQ1LDE3ICsx NDUsMTcgQEAgSW5saW5lTGF5b3V0VW5pdCBJbnRyaW5zaWNXaWR0aEhhbmRsZXI6Om1heGltdW1D b250ZW50U2l6ZSgpCiAgICAgYXV0byBtYXlDYWNoZUxheW91dFJlc3VsdCA9IG1fbWF5VXNlU2lt cGxpZmllZFRleHRPbmx5SW5saW5lTGF5b3V0SW5SYW5nZSAmJiAhbV9pbmxpbmVJdGVtUmFuZ2Uu c3RhcnRJbmRleCgpID8gTWF5Q2FjaGVMYXlvdXRSZXN1bHQ6OlllcyA6IE1heUNhY2hlTGF5b3V0 UmVzdWx0OjpObzsKICAgICBhdXRvIG1heGltdW1Db250ZW50U2l6ZSA9IElubGluZUxheW91dFVu aXQgeyB9OwogCi0gICAgaWYgKGlzQ29udGVudEVsaWdpYmxlRm9yTm9uTGluZUJ1aWxkZXJNYXhp bXVtV2lkdGgocm9vdCgpLCBpbmxpbmVJdGVtTGlzdCgpKSkKKyAgICBpZiAoaXNDb250ZW50RWxp Z2libGVGb3JOb25MaW5lQnVpbGRlck1heGltdW1XaWR0aChmb3JtYXR0aW5nQ29udGV4dFJvb3Qo KSwgaW5saW5lSXRlbUxpc3QoKSkpCiAgICAgICAgIG1heGltdW1Db250ZW50U2l6ZSA9IHNpbXBs aWZpZWRNYXhpbXVtV2lkdGgobWF5Q2FjaGVMYXlvdXRSZXN1bHQpOwogICAgIGVsc2UgaWYgKG1f bWF5VXNlU2ltcGxpZmllZFRleHRPbmx5SW5saW5lTGF5b3V0SW5SYW5nZSkgewotICAgICAgICBp ZiAobV9tYXhpbXVtQ29udGVudFdpZHRoQmV0d2VlbkxpbmVCcmVha3MgJiYgbWF5VXNlQ29udGVu dFdpZHRoQmV0d2VlbkxpbmVCcmVha3NBc01heGltdW1TaXplKHJvb3QoKSwgaW5saW5lSXRlbUxp c3QoKSkpIHsKKyAgICAgICAgaWYgKG1fbWF4aW11bUNvbnRlbnRXaWR0aEJldHdlZW5MaW5lQnJl YWtzICYmIG1heVVzZUNvbnRlbnRXaWR0aEJldHdlZW5MaW5lQnJlYWtzQXNNYXhpbXVtU2l6ZShm b3JtYXR0aW5nQ29udGV4dFJvb3QoKSwgaW5saW5lSXRlbUxpc3QoKSkpIHsKICAgICAgICAgICAg IG1heGltdW1Db250ZW50U2l6ZSA9ICptX21heGltdW1Db250ZW50V2lkdGhCZXR3ZWVuTGluZUJy ZWFrczsKICNpZm5kZWYgTkRFQlVHCi0gICAgICAgICAgICBhdXRvIHNpbXBsaWZpZWRMaW5lQnVp bGRlciA9IFRleHRPbmx5U2ltcGxlTGluZUJ1aWxkZXIgeyBmb3JtYXR0aW5nQ29udGV4dCgpLCBm b3JtYXR0aW5nQ29udGV4dCgpLnJvb3QoKSwgeyB9LCBpbmxpbmVJdGVtTGlzdCgpIH07CisgICAg ICAgICAgICBhdXRvIHNpbXBsaWZpZWRMaW5lQnVpbGRlciA9IFRleHRPbmx5U2ltcGxlTGluZUJ1 aWxkZXIgeyBmb3JtYXR0aW5nQ29udGV4dCgpLCBsaW5lQnVpbGVyUm9vdCgpLCB7IH0sIGlubGlu ZUl0ZW1MaXN0KCkgfTsKICAgICAgICAgICAgIEFTU0VSVChzdGQ6OmFicyhtYXhpbXVtQ29udGVu dFNpemUgLSBjb21wdXRlZEludHJpbnNpY1dpZHRoRm9yQ29uc3RyYWludChJbnRyaW5zaWNXaWR0 aE1vZGU6Ok1heGltdW0sIHNpbXBsaWZpZWRMaW5lQnVpbGRlciwgTWF5Q2FjaGVMYXlvdXRSZXN1 bHQ6Ok5vKSkgPCAxKTsKICNlbmRpZgogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgYXV0 byBzaW1wbGlmaWVkTGluZUJ1aWxkZXIgPSBUZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyIHsgZm9y bWF0dGluZ0NvbnRleHQoKSwgZm9ybWF0dGluZ0NvbnRleHQoKS5yb290KCksIHsgfSwgaW5saW5l SXRlbUxpc3QoKSB9OworICAgICAgICAgICAgYXV0byBzaW1wbGlmaWVkTGluZUJ1aWxkZXIgPSBU ZXh0T25seVNpbXBsZUxpbmVCdWlsZGVyIHsgZm9ybWF0dGluZ0NvbnRleHQoKSwgbGluZUJ1aWxl clJvb3QoKSwgeyB9LCBpbmxpbmVJdGVtTGlzdCgpIH07CiAgICAgICAgICAgICBtYXhpbXVtQ29u dGVudFNpemUgPSBjb21wdXRlZEludHJpbnNpY1dpZHRoRm9yQ29uc3RyYWludChJbnRyaW5zaWNX aWR0aE1vZGU6Ok1heGltdW0sIHNpbXBsaWZpZWRMaW5lQnVpbGRlciwgbWF5Q2FjaGVMYXlvdXRS ZXN1bHQpOwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKQEAgLTI3MSw3ICsyNzEsNyBAQCBJbmxp bmVMYXlvdXRVbml0IEludHJpbnNpY1dpZHRoSGFuZGxlcjo6c2ltcGxpZmllZE1pbmltdW1XaWR0 aChjb25zdCBFbGVtZW50Qm94JgogCiBJbmxpbmVMYXlvdXRVbml0IEludHJpbnNpY1dpZHRoSGFu ZGxlcjo6c2ltcGxpZmllZE1heGltdW1XaWR0aChNYXlDYWNoZUxheW91dFJlc3VsdCBtYXlDYWNo ZUxheW91dFJlc3VsdCkKIHsKLSAgICBBU1NFUlQocm9vdCgpLmZpcnN0Q2hpbGQoKSAmJiByb290 KCkuZmlyc3RDaGlsZCgpID09IHJvb3QoKS5sYXN0Q2hpbGQoKSk7CisgICAgQVNTRVJUKGZvcm1h dHRpbmdDb250ZXh0Um9vdCgpLmZpcnN0Q2hpbGQoKSAmJiBmb3JtYXR0aW5nQ29udGV4dFJvb3Qo KS5maXJzdENoaWxkKCkgPT0gZm9ybWF0dGluZ0NvbnRleHRSb290KCkubGFzdENoaWxkKCkpOwog ICAgIGF1dG8mIGlubGluZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KGlubGlu ZUl0ZW1MaXN0KClbMF0pOwogICAgIGF1dG8mIHN0eWxlID0gaW5saW5lVGV4dEl0ZW0uZmlyc3RM aW5lU3R5bGUoKTsKIApAQCAtMzAyLDExICszMDIsMzIgQEAgY29uc3QgSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQmIEludHJpbnNpY1dpZHRoSGFuZGxlcjo6Zm9ybWF0dGluZ0NvbnRleHQoKSBjb25z dAogICAgIHJldHVybiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0OwogfQogCi1jb25zdCBFbGVt ZW50Qm94JiBJbnRyaW5zaWNXaWR0aEhhbmRsZXI6OnJvb3QoKSBjb25zdAorY29uc3QgRWxlbWVu dEJveCYgSW50cmluc2ljV2lkdGhIYW5kbGVyOjpmb3JtYXR0aW5nQ29udGV4dFJvb3QoKSBjb25z dAogewogICAgIHJldHVybiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0LnJvb3QoKTsKIH0KIAor Y29uc3QgRWxlbWVudEJveCYgSW50cmluc2ljV2lkdGhIYW5kbGVyOjpsaW5lQnVpbGVyUm9vdCgp IGNvbnN0Cit7CisgICAgaWYgKCFtX2lubGluZUl0ZW1SYW5nZS5zdGFydEluZGV4KCkpCisgICAg ICAgIHJldHVybiBmb3JtYXR0aW5nQ29udGV4dFJvb3QoKTsKKworICAgIGF1dG8gcm9vdEJveElu ZGV4ID0gbV9pbmxpbmVJdGVtUmFuZ2Uuc3RhcnRJbmRleCgpIC0gMTsKKyAgICBhdXRvJiBpbmxp bmVJdGVtcyA9IGlubGluZUl0ZW1MaXN0KCk7CisgICAgaWYgKHJvb3RCb3hJbmRleCA+PSBpbmxp bmVJdGVtcy5zaXplKCkpIHsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAg IHJldHVybiBmb3JtYXR0aW5nQ29udGV4dFJvb3QoKTsKKyAgICB9CisKKyAgICBpZiAoYXV0byog aW5saW5lQm94ID0gZHluYW1pY0Rvd25jYXN0PEVsZW1lbnRCb3g+KGlubGluZUl0ZW1zW3Jvb3RC b3hJbmRleF0ubGF5b3V0Qm94KCkpOyBpbmxpbmVCb3ggJiYgaW5saW5lQm94LT5pc0lubGluZUJv eCgpKSB7CisgICAgICAgIC8vIFdlIGFyZSBydW5uaW5nIGEgcmFuZ2UgYmFzZWQgbGluZSBidWls ZGluZyB3aGVyZSB3ZSBvbmx5IG5lZWQgdG8gbGF5b3V0IHRoZSBpbm5lciB0ZXh0IGNvbnRlbnQg KGUuZy4gPHNwYW4+aW5uZXIgdGV4dCBjb250ZW50PC9zcGFuPikKKyAgICAgICAgcmV0dXJuICpp bmxpbmVCb3g7CisgICAgfQorCisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJu IGZvcm1hdHRpbmdDb250ZXh0Um9vdCgpOworfQorCiB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0ludHJpbnNpY1dpZHRo SGFuZGxlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW50cmluc2ljV2lkdGhIYW5kbGVyLmgKaW5kZXggMzY2MmRiMjQ5N2IzLi40NTBjNGI1YzUx MjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0ludHJpbnNpY1dpZHRoSGFuZGxlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0ludHJpbnNpY1dpZHRoSGFuZGxlci5oCkBAIC01 Miw3ICs1Miw4IEBAIHByaXZhdGU6CiAgICAgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGZvcm1h dHRpbmdDb250ZXh0KCk7CiAgICAgY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGZvcm1h dHRpbmdDb250ZXh0KCkgY29uc3Q7CiAgICAgY29uc3QgSW5saW5lQ29udGVudENhY2hlJiBmb3Jt YXR0aW5nU3RhdGUoKSBjb25zdDsKLSAgICBjb25zdCBFbGVtZW50Qm94JiByb290KCkgY29uc3Q7 CisgICAgY29uc3QgRWxlbWVudEJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290KCkgY29uc3Q7Cisg ICAgY29uc3QgRWxlbWVudEJveCYgbGluZUJ1aWxlclJvb3QoKSBjb25zdDsKICAgICBjb25zdCBJ bmxpbmVJdGVtTGlzdCYgaW5saW5lSXRlbUxpc3QoKSBjb25zdCB7IHJldHVybiBtX2lubGluZUl0 ZW1zLmNvbnRlbnQoKTsgfQogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9pbmxpbmUvbWluLXdpZHRoLXdpdGgtaW5saW5lLWJveGVzLWV4cGVjdGVkLmh0bWwgYi9MYXlv dXRUZXN0cy9mYXN0L2lubGluZS9taW4td2lkdGgtd2l0aC1pbmxpbmUtYm94ZXMtZXhwZWN0ZWQu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjNkNTlhYTViOThk MAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL21pbi13aWR0aC13 aXRoLWlubGluZS1ib3hlcy1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMTcgQEAKKzwhRE9DVFlQ RSBodG1sPgorPHN0eWxlPgorZGl2IHsKKyAgd2hpdGUtc3BhY2U6IG5vcm1hbDsKKyAgYm9yZGVy OiBzb2xpZCBvcmFuZ2U7CisgIHdpZHRoOiBtaW4tY29udGVudDsKKyAgZm9udC1zaXplOiAxMHB4 OworICBmb250LWZhbWlseTogQWhlbTsKKyAgY29sb3I6IHRyYW5zcGFyZW50OworfQorPC9zdHls ZT4KKzxkaXY+dmVyeSBsb25nIGxpbmUgaXMgdmVyeSBsb25nPC9kaXY+Cis8ZGl2PnZlcnkgbG9u ZyBsaW5lIGlzIHZlcnkgbG9uZzwvZGl2PgorPGRpdj52ZXJ5IGxvbmcgbGluZSBpcyB2ZXJ5IGxv bmc8L2Rpdj4KKzxkaXY+dmVyeSBsb25nIGxpbmUgaXMgdmVyeSBsb25nPC9kaXY+Cis8ZGl2PnZl cnkgbG9uZyBsaW5lIGlzIHZlcnkgbG9uZzwvZGl2PgorPGRpdiBzdHlsZT0icGFkZGluZy1yaWdo dDogMXB4Ij52ZXJ5IGxvbmcgbGluZSBpcyB2ZXJ5IGxvbmc8L2Rpdj4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2Zhc3QvaW5saW5lL21pbi13aWR0aC13aXRoLWlubGluZS1ib3hlcy5odG1sIGIv TGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvbWluLXdpZHRoLXdpdGgtaW5saW5lLWJveGVzLmh0bWwK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi4yYzc3YmU3NDgxZjUKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9taW4td2lkdGgtd2l0aC1p bmxpbmUtYm94ZXMuaHRtbApAQCAtMCwwICsxLDIwIEBACis8IURPQ1RZUEUgaHRtbD4KKzxzdHls ZT4KK2RpdiB7CisgIHdoaXRlLXNwYWNlOiBub3dyYXA7CisgIGJvcmRlcjogc29saWQgb3Jhbmdl OworICB3aWR0aDogbWluLWNvbnRlbnQ7CisgIGZvbnQtc2l6ZTogMTBweDsKKyAgZm9udC1mYW1p bHk6IEFoZW07CisgIGNvbG9yOiB0cmFuc3BhcmVudDsKK30KK3NwYW4geworICB3aGl0ZS1zcGFj ZTogbm9ybWFsOworfQorPC9zdHlsZT4KKzxkaXY+PHNwYW4+dmVyeSBsb25nIGxpbmUgaXMgdmVy eSBsb25nPC9zcGFuPjwvZGl2PgorPGRpdj48c3Bhbj52ZXJ5IGxvbmcgbGluZSBpcyB2ZXJ5IGxv bmc8L3NwYW4+IDwvZGl2PgorPGRpdj48c3Bhbj48c3Bhbj52ZXJ5IGxvbmcgbGluZSBpcyB2ZXJ5 IGxvbmc8L3NwYW4+PC9zcGFuPjwvZGl2PgorPGRpdj48c3BhbiBzdHlsZT0id2hpdGUtc3BhY2U6 IGluaGVyaXQiPjxzcGFuPnZlcnkgbG9uZyBsaW5lIGlzIHZlcnkgbG9uZzwvc3Bhbj48L3NwYW4+ PC9kaXY+Cis8ZGl2PjxzcGFuIHN0eWxlPSJ3aGl0ZS1zcGFjZTogaW5oZXJpdCI+IDxzcGFuPnZl cnkgbG9uZyBsaW5lIGlzIHZlcnkgbG9uZzwvc3Bhbj48L3NwYW4+PC9kaXY+Cis8ZGl2PjxzcGFu IHN0eWxlPSJwYWRkaW5nOiAxcHgiPnZlcnkgbG9uZyBsaW5lIGlzIHZlcnkgbG9uZzwvc3Bhbj48 L2Rpdj4K