236341 2022-02-08 16:22:40 -0800 [LFC][IFC] Transform root inline box's logical rect based on the writing mode 2022-02-09 08:18:31 -0800 1 1 1 Unclassified WebKit Layout and Rendering Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1838948 0 zalan 2022-02-08 16:22:40 -0800 ssia 1838950 1 451322 zalan 2022-02-08 16:28:14 -0800 Created attachment 451322 Patch 1839165 2 ews-feeder 2022-02-09 08:15:08 -0800 Committed r289471 (247014@main): <https://commits.webkit.org/247014@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451322. 1839169 3 webkit-bug-importer 2022-02-09 08:18:31 -0800 <rdar://problem/88690767> 451322 2022-02-08 16:28:14 -0800 2022-02-09 08:15:11 -0800 Patch bug-236341-20220208162813.patch text/plain 15948 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5Mzc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTQyMTIwZDlmYjM5ZTAw ODUzOTc5ZTRlZDBhZTk0MzhmN2MxMjQ5ZS4uODRhOTE0YTRiMGZjMmFmNzNhMzcxMDdjZmVhN2Nm NTZkY2YyZTUxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIyLTAyLTA4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFRyYW5zZm9y bSByb290IGlubGluZSBib3gncyBsb2dpY2FsIHJlY3QgYmFzZWQgb24gdGhlIHdyaXRpbmcgbW9k ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2MzQx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBz dXJlIHJvb3QgaW5saW5lIGJveCBoYXMgdGhlIGNvcnJlY3QgX3Zpc3VhbF8gY29vcmRpbmF0ZXMg aW4gdmVydGljYWwgbW9kZS4KKyAgICAgICAgKGFsc28gbGV0J3MgcmVuYW1lIERpc3BsYXlMaW5l Ojpjb250ZW50TGVmdCB0byBjb250ZW50TG9naWNhbE9mZnNldC4gVGhlIGVtcGhhc2lzIGlzIG9u IF9sb2dpY2FsXy4gSXQgaGVscHMgdG8gY2F0Y2ggaW5jb3JyZWN0IHVzZSAoZXZlbiB0aGlzIGRp ZmYgaGFzIGEgY291cGxlKSkuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YnVpbGQpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnBy b2Nlc3NOb25CaWRpQ29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURp c3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpmbGlwUm9vdElubGluZUJv eFJlY3RUb1Zpc3VhbEZvcldyaXRpbmdNb2RlIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRl ci5oOgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkv SW5saW5lRGlzcGxheUxpbmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZURpc3BsYXk6Okxp bmU6OmNvbnRlbnRMb2dpY2FsT2Zmc2V0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OklubGlu ZURpc3BsYXk6OkxpbmU6OkxpbmUpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lRGlzcGxheTo6 TGluZTo6Y29udGVudExlZnQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbnRl Z3JhdGlvbi9JbmxpbmVJdGVyYXRvckJveE1vZGVyblBhdGguaDoKKyAgICAgICAgKFdlYkNvcmU6 OklubGluZUl0ZXJhdG9yOjpCb3hNb2Rlcm5QYXRoOjpjcmVhdGVUZXh0UnVuIGNvbnN0KToKKyAg ICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lTW9kZXJuUGF0aC5o OgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0b3I6OkxpbmVJdGVyYXRvck1vZGVyblBh dGg6OmNvbnRlbnRMb2dpY2FsTGVmdCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0 aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OklubGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVE aXNwbGF5TGluZXMgY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJ bnRlZ3JhdGlvbkxpbmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpM aW5lOjpMaW5lKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lOjpj b250ZW50TG9naWNhbE9mZnNldCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRl Z3JhdGlvbjo6TGluZTo6Y29udGVudExlZnQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxh eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblBhZ2luYXRpb24uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246Om1ha2VBZGp1c3RlZENvbnRlbnQpOgorCiAy MDIyLTAyLTA4ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZD XVtJRkNdIFNldCBMaW5lQm94OjpzZXRCYXNlbGluZVR5cGUgd2hlbiB0aGUgbGluZSBpcyBjb21w dXRlZCB0byBiZSBJZGVvZ3JhcGhpY0Jhc2VsaW5lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlD b250ZW50QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKaW5kZXgg MTBhNzJkZGE1ZjY3YWU3MGE5ZTQ0NTg2NjkzYjJmYTE0NGRlYTFhYi4uYTQ3NTZmNzczYTcyNWIz ZWQyZDg0MzgxNWI1ODNlZjVmZTY3MDE5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVu dEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcApAQCAtOTQs MTAgKzk0LDcgQEAgRGlzcGxheUJveGVzIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YnVp bGQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JgogCiAgICAgbV9saW5lSW5kZXggPSBs aW5lSW5kZXg7CiAgICAgLy8gRXZlcnkgbGluZSBzdGFydHMgd2l0aCBhIHJvb3QgYm94LCBldmVu IHRoZSBlbXB0eSBvbmVzLgotICAgIGF1dG8gcm9vdElubGluZUJveFJlY3QgPSBsaW5lQm94Lmxv Z2ljYWxSZWN0Rm9yUm9vdElubGluZUJveCgpOwotICAgIHJvb3RJbmxpbmVCb3hSZWN0Lm1vdmVI b3Jpem9udGFsbHkoZGlzcGxheUxpbmUubGVmdCgpICsgZGlzcGxheUxpbmUuY29udGVudExlZnQo KSk7Ci0gICAgcm9vdElubGluZUJveFJlY3QubW92ZVZlcnRpY2FsbHkoZGlzcGxheUxpbmUudG9w KCkpOwotCisgICAgYXV0byByb290SW5saW5lQm94UmVjdCA9IGZsaXBSb290SW5saW5lQm94UmVj dFRvVmlzdWFsRm9yV3JpdGluZ01vZGUobGluZUJveC5sb2dpY2FsUmVjdEZvclJvb3RJbmxpbmVC b3goKSwgZGlzcGxheUxpbmUsIHJvb3QoKS5zdHlsZSgpLndyaXRpbmdNb2RlKCkpOwogICAgIGJv eGVzLmFwcGVuZCh7IG1fbGluZUluZGV4LCBJbmxpbmVEaXNwbGF5OjpCb3g6OlR5cGU6OlJvb3RJ bmxpbmVCb3gsIHJvb3QoKSwgVUJJRElfREVGQVVMVF9MVFIsIHJvb3RJbmxpbmVCb3hSZWN0LCBy b290SW5saW5lQm94UmVjdCwgeyB9LCB7IH0sIGxpbmVCb3gucm9vdElubGluZUJveCgpLmhhc0Nv bnRlbnQoKSB9KTsKIAogICAgIGF1dG8gY29udGVudE5lZWRzQmlkaVJlb3JkZXJpbmcgPSAhbGlu ZUNvbnRlbnQudmlzdWFsT3JkZXJMaXN0LmlzRW1wdHkoKTsKQEAgLTMyNyw3ICszMjQsNyBAQCB2 b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc05vbkJpZGlDb250ZW50KGNv bnN0IExpbmVCdWlsZGVyOjpMaW5lQwogICAgIEFTU0VSVChsaW5lQ29udGVudC5pbmxpbmVCYXNl RGlyZWN0aW9uID09IFRleHREaXJlY3Rpb246OkxUUiB8fCAhaGFzQ29udGVudCk7CiAjZW5kaWYK ICAgICBhdXRvIHdyaXRpbmdNb2RlID0gcm9vdCgpLnN0eWxlKCkud3JpdGluZ01vZGUoKTsKLSAg ICBhdXRvIGNvbnRlbnRTdGFydEluVmlzdWFsT3JkZXIgPSBtb3ZlUG9pbnRIb3Jpem9udGFsbHlG b3JXcml0aW5nTW9kZShkaXNwbGF5TGluZS50b3BMZWZ0KCksIGRpc3BsYXlMaW5lLmNvbnRlbnRM ZWZ0KCksIHdyaXRpbmdNb2RlKTsKKyAgICBhdXRvIGNvbnRlbnRTdGFydEluVmlzdWFsT3JkZXIg PSBtb3ZlUG9pbnRIb3Jpem9udGFsbHlGb3JXcml0aW5nTW9kZShkaXNwbGF5TGluZS50b3BMZWZ0 KCksIGRpc3BsYXlMaW5lLmNvbnRlbnRMb2dpY2FsT2Zmc2V0KCksIHdyaXRpbmdNb2RlKTsKIAog ICAgIGZvciAoYXV0byYgbGluZVJ1biA6IGxpbmVDb250ZW50LnJ1bnMpIHsKICAgICAgICAgYXV0 byYgbGF5b3V0Qm94ID0gbGluZVJ1bi5sYXlvdXRCb3goKTsKQEAgLTU0NSw3ICs1NDIsNyBAQCB2 b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KGNvbnN0 IExpbmVCdWlsZGVyOjpMaW5lQ29udAogICAgIGFuY2VzdG9yU3RhY2sucHVzaCh7IH0sIHJvb3Qo KSk7CiAKICAgICBhdXRvIHdyaXRpbmdNb2RlID0gcm9vdCgpLnN0eWxlKCkud3JpdGluZ01vZGUo KTsKLSAgICBhdXRvIGNvbnRlbnRTdGFydEluVmlzdWFsT3JkZXIgPSBkaXNwbGF5TGluZS5sZWZ0 KCkgKyBkaXNwbGF5TGluZS5jb250ZW50TGVmdCgpOworICAgIGF1dG8gY29udGVudFN0YXJ0SW5W aXN1YWxPcmRlciA9IGRpc3BsYXlMaW5lLmxlZnQoKSArIGRpc3BsYXlMaW5lLmNvbnRlbnRMb2dp Y2FsT2Zmc2V0KCk7CiAgICAgYXV0byBoYXNJbmxpbmVCb3ggPSBmYWxzZTsKICAgICBhdXRvIGNy ZWF0ZURpc3BsYXlCb3hlc0luVmlzdWFsT3JkZXIgPSBbJl0gewogCkBAIC04MDEsNiArNzk4LDI4 IEBAIElubGluZVJlY3QgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpmbGlwTG9naWNhbFJl Y3RUb1Zpc3VhbEZvcldyaXRpbmdNb2RlV2l0CiAgICAgcmV0dXJuIGxvZ2ljYWxSZWN0OwogfQog CitJbmxpbmVSZWN0IElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6ZmxpcFJvb3RJbmxpbmVC b3hSZWN0VG9WaXN1YWxGb3JXcml0aW5nTW9kZShjb25zdCBJbmxpbmVSZWN0JiByb290SW5saW5l Qm94TG9naWNhbFJlY3QsIGNvbnN0IElubGluZURpc3BsYXk6OkxpbmUmIGRpc3BsYXlMaW5lLCBX cml0aW5nTW9kZSB3cml0aW5nTW9kZSkgY29uc3QKK3sKKyAgICBzd2l0Y2ggKHdyaXRpbmdNb2Rl KSB7CisgICAgY2FzZSBXcml0aW5nTW9kZTo6VG9wVG9Cb3R0b206IHsKKyAgICAgICAgYXV0byB2 aXN1YWxSZWN0ID0gcm9vdElubGluZUJveExvZ2ljYWxSZWN0OworICAgICAgICB2aXN1YWxSZWN0 Lm1vdmVCeSh7IGRpc3BsYXlMaW5lLmxlZnQoKSArIGRpc3BsYXlMaW5lLmNvbnRlbnRMb2dpY2Fs T2Zmc2V0KCksIGRpc3BsYXlMaW5lLnRvcCgpIH0pOworICAgICAgICByZXR1cm4gdmlzdWFsUmVj dDsKKyAgICB9CisgICAgY2FzZSBXcml0aW5nTW9kZTo6TGVmdFRvUmlnaHQ6CisgICAgY2FzZSBX cml0aW5nTW9kZTo6UmlnaHRUb0xlZnQ6IHsKKyAgICAgICAgLy8gU2VlIElubGluZUZvcm1hdHRp bmdHZW9tZXRyeSBmb3IgbW9yZSBpbmZvLgorICAgICAgICBhdXRvIHZpc3VhbFJlY3QgPSBJbmxp bmVSZWN0IHsgcm9vdElubGluZUJveExvZ2ljYWxSZWN0LmxlZnQoKSwgcm9vdElubGluZUJveExv Z2ljYWxSZWN0LnRvcCgpLCByb290SW5saW5lQm94TG9naWNhbFJlY3QuaGVpZ2h0KCksIHJvb3RJ bmxpbmVCb3hMb2dpY2FsUmVjdC53aWR0aCgpIH07CisgICAgICAgIHZpc3VhbFJlY3QubW92ZUJ5 KHsgZGlzcGxheUxpbmUubGVmdCgpLCBkaXNwbGF5TGluZS50b3AoKSArIGRpc3BsYXlMaW5lLmNv bnRlbnRMb2dpY2FsT2Zmc2V0KCkgfSk7CisgICAgICAgIHJldHVybiB2aXN1YWxSZWN0OworICAg IH0KKyAgICBkZWZhdWx0OgorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAg YnJlYWs7CisgICAgfQorICAgIHJldHVybiByb290SW5saW5lQm94TG9naWNhbFJlY3Q7Cit9CisK IElubGluZUxheW91dFBvaW50IElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6bW92ZVBvaW50 SG9yaXpvbnRhbGx5Rm9yV3JpdGluZ01vZGUoY29uc3QgSW5saW5lTGF5b3V0UG9pbnQmIGxvZ2lj YWxQb2ludCwgSW5saW5lTGF5b3V0VW5pdCBob3Jpem9udGFsT2Zmc2V0LCBXcml0aW5nTW9kZSB3 cml0aW5nTW9kZSkgY29uc3QKIHsKICAgICBhdXRvIHZpc3VhbFBvaW50ID0gbG9naWNhbFBvaW50 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxh eUNvbnRlbnRCdWlsZGVyLmgKaW5kZXggOTQ3ZjhhM2VhZTBjZDUyNjFmM2M2N2NiNDUxNDY2NDI3 NzZhYzQzNS4uMzQ5ZDE1M2YyYWFlYmVlMmQ3ZGYwNDhmMWRmYWViMDljOTM4ZjlkOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlz cGxheS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlDb250 ZW50QnVpbGRlci5oCkBAIC02Nyw2ICs2Nyw3IEBAIHByaXZhdGU6CiAgICAgc2l6ZV90IGVuc3Vy ZURpc3BsYXlCb3hGb3JDb250YWluZXIoY29uc3QgQ29udGFpbmVyQm94JiwgRGlzcGxheUJveFRy ZWUmLCBBbmNlc3RvclN0YWNrJiwgRGlzcGxheUJveGVzJik7CiAKICAgICBJbmxpbmVSZWN0IGZs aXBMb2dpY2FsUmVjdFRvVmlzdWFsRm9yV3JpdGluZ01vZGVXaXRoaW5MaW5lKGNvbnN0IElubGlu ZVJlY3QmIGxvZ2ljYWxSZWN0LCBjb25zdCBJbmxpbmVSZWN0JiBsaW5lTG9naWNhbFJlY3QsIFdy aXRpbmdNb2RlKSBjb25zdDsKKyAgICBJbmxpbmVSZWN0IGZsaXBSb290SW5saW5lQm94UmVjdFRv VmlzdWFsRm9yV3JpdGluZ01vZGUoY29uc3QgSW5saW5lUmVjdCYgcm9vdElubGluZUJveExvZ2lj YWxSZWN0LCBjb25zdCBJbmxpbmVEaXNwbGF5OjpMaW5lJiwgV3JpdGluZ01vZGUpIGNvbnN0Owog ICAgIElubGluZUxheW91dFBvaW50IG1vdmVQb2ludEhvcml6b250YWxseUZvcldyaXRpbmdNb2Rl KGNvbnN0IElubGluZUxheW91dFBvaW50JiB0b3BMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGhvcml6 b250YWxPZmZzZXQsIFdyaXRpbmdNb2RlKSBjb25zdDsKIAogICAgIGNvbnN0IENvbnRhaW5lckJv eCYgcm9vdCgpIGNvbnN0IHsgcmV0dXJuIG1fZm9ybWF0dGluZ0NvbnRleHRSb290OyB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9k aXNwbGF5L0lubGluZURpc3BsYXlMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlMaW5lLmgKaW5kZXggNTY1 MjVjZGUzOWU3MmFjODQ0MTUzNmM4ZWFhOGZmMDAyNTdiNDcxOC4uNDFkNWViMjNiYmRmZmZmNjRm NzExMGNhNTA5NjQyNWE2NjlkZmMxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGluZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3Bs YXkvSW5saW5lRGlzcGxheUxpbmUuaApAQCAtNDAsNyArNDAsNyBAQCBwdWJsaWM6CiAgICAgICAg IGZsb2F0IHRvcCB7IDAgfTsKICAgICAgICAgZmxvYXQgYm90dG9tIHsgMCB9OwogICAgIH07Ci0g ICAgTGluZShjb25zdCBGbG9hdFJlY3QmIGxpbmVCb3hSZWN0LCBjb25zdCBGbG9hdFJlY3QmIHNj cm9sbGFibGVPdmVyZmxvdywgRW5jbG9zaW5nVG9wQW5kQm90dG9tLCBmbG9hdCBhbGlnbWVudEJh c2VsaW5lLCBGb250QmFzZWxpbmUgYmFzZWxpbmVUeXBlLCBmbG9hdCBjb250ZW50TGVmdCwgZmxv YXQgY29udGVudExvZ2ljYWxXaWR0aCk7CisgICAgTGluZShjb25zdCBGbG9hdFJlY3QmIGxpbmVC b3hSZWN0LCBjb25zdCBGbG9hdFJlY3QmIHNjcm9sbGFibGVPdmVyZmxvdywgRW5jbG9zaW5nVG9w QW5kQm90dG9tLCBmbG9hdCBhbGlnbWVudEJhc2VsaW5lLCBGb250QmFzZWxpbmUgYmFzZWxpbmVU eXBlLCBmbG9hdCBjb250ZW50TG9naWNhbE9mZnNldCwgZmxvYXQgY29udGVudExvZ2ljYWxXaWR0 aCk7CiAKICAgICBmbG9hdCBsZWZ0KCkgY29uc3QgeyByZXR1cm4gbV9saW5lQm94UmVjdC54KCk7 IH0KICAgICBmbG9hdCByaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveFJlY3QubWF4WCgp OyB9CkBAIC01Nyw3ICs1Nyw3IEBAIHB1YmxpYzoKICAgICBmbG9hdCBiYXNlbGluZSgpIGNvbnN0 IHsgcmV0dXJuIG1fYWxpZ21lbnRCYXNlbGluZTsgfQogICAgIEZvbnRCYXNlbGluZSBiYXNlbGlu ZVR5cGUoKSBjb25zdCB7IHJldHVybiBtX2Jhc2VsaW5lVHlwZTsgfQogCi0gICAgZmxvYXQgY29u dGVudExlZnQoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRMZWZ0OyB9CisgICAgZmxvYXQgY29u dGVudExvZ2ljYWxPZmZzZXQoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRMb2dpY2FsT2Zmc2V0 OyB9CiAgICAgZmxvYXQgY29udGVudExvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fY29u dGVudExvZ2ljYWxXaWR0aDsgfQogCiAgICAgdm9pZCBtb3ZlVmVydGljYWxseShmbG9hdCBvZmZz ZXQpIHsgbV9saW5lQm94UmVjdC5tb3ZlKHsgeyB9LCBvZmZzZXQgfSk7IH0KQEAgLTcxLDE3ICs3 MSwxNyBAQCBwcml2YXRlOgogICAgIC8vIHRoZSBsYXlvdXQgYm91bmRzIG9mIHRoZSBpbmxpbmUg bGV2ZWwgYm94ZXMgd2hpY2ggbWF5IGJlIGRpZmZlcmVudCB3aGVuIGxpbmUtaGVpZ2h0IGlzIHBy ZXNlbnQuCiAgICAgRW5jbG9zaW5nVG9wQW5kQm90dG9tIG1fZW5jbG9zaW5nVG9wQW5kQm90dG9t OwogICAgIGZsb2F0IG1fYWxpZ21lbnRCYXNlbGluZSB7IDAgfTsKLSAgICBmbG9hdCBtX2NvbnRl bnRMZWZ0IHsgMCB9OworICAgIGZsb2F0IG1fY29udGVudExvZ2ljYWxPZmZzZXQgeyAwIH07CiAg ICAgZmxvYXQgbV9jb250ZW50TG9naWNhbFdpZHRoIHsgMCB9OwogICAgIEZvbnRCYXNlbGluZSBt X2Jhc2VsaW5lVHlwZSB7IEFscGhhYmV0aWNCYXNlbGluZSB9OwogfTsKIAotaW5saW5lIExpbmU6 OkxpbmUoY29uc3QgRmxvYXRSZWN0JiBsaW5lQm94UmVjdCwgY29uc3QgRmxvYXRSZWN0JiBzY3Jv bGxhYmxlT3ZlcmZsb3csIEVuY2xvc2luZ1RvcEFuZEJvdHRvbSBlbmNsb3NpbmdUb3BBbmRCb3R0 b20sIGZsb2F0IGFsaWdtZW50QmFzZWxpbmUsIEZvbnRCYXNlbGluZSBiYXNlbGluZVR5cGUsIGZs b2F0IGNvbnRlbnRMZWZ0LCBmbG9hdCBjb250ZW50TG9naWNhbFdpZHRoKQoraW5saW5lIExpbmU6 OkxpbmUoY29uc3QgRmxvYXRSZWN0JiBsaW5lQm94UmVjdCwgY29uc3QgRmxvYXRSZWN0JiBzY3Jv bGxhYmxlT3ZlcmZsb3csIEVuY2xvc2luZ1RvcEFuZEJvdHRvbSBlbmNsb3NpbmdUb3BBbmRCb3R0 b20sIGZsb2F0IGFsaWdtZW50QmFzZWxpbmUsIEZvbnRCYXNlbGluZSBiYXNlbGluZVR5cGUsIGZs b2F0IGNvbnRlbnRMb2dpY2FsT2Zmc2V0LCBmbG9hdCBjb250ZW50TG9naWNhbFdpZHRoKQogICAg IDogbV9saW5lQm94UmVjdChsaW5lQm94UmVjdCkKICAgICAsIG1fc2Nyb2xsYWJsZU92ZXJmbG93 KHNjcm9sbGFibGVPdmVyZmxvdykKICAgICAsIG1fZW5jbG9zaW5nVG9wQW5kQm90dG9tKGVuY2xv c2luZ1RvcEFuZEJvdHRvbSkKICAgICAsIG1fYWxpZ21lbnRCYXNlbGluZShhbGlnbWVudEJhc2Vs aW5lKQotICAgICwgbV9jb250ZW50TGVmdChjb250ZW50TGVmdCkKKyAgICAsIG1fY29udGVudExv Z2ljYWxPZmZzZXQoY29udGVudExvZ2ljYWxPZmZzZXQpCiAgICAgLCBtX2NvbnRlbnRMb2dpY2Fs V2lkdGgoY29udGVudExvZ2ljYWxXaWR0aCkKICAgICAsIG1fYmFzZWxpbmVUeXBlKGJhc2VsaW5l VHlwZSkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9J bmxpbmVJdGVyYXRvckJveE1vZGVyblBhdGguaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9JbmxpbmVJdGVyYXRvckJveE1vZGVyblBhdGguaAppbmRleCBjODI3M2Q1MTUyZTQ1 NWFjMWNjMjI3MTQxNDA4ODY2NmFkMThjMzg4Li5kZmJjMjJkOGUxYWQwYzIxY2U1MTMxNzgzN2Nk NTg2MjFlODQyOGRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vSW5saW5lSXRlcmF0b3JCb3hNb2Rlcm5QYXRoLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yQm94TW9kZXJuUGF0aC5oCkBAIC04Myw3ICs4 Myw3IEBAIHB1YmxpYzoKICAgICAgICAgYXV0byYgc3R5bGUgPSBib3goKS5zdHlsZSgpOwogICAg ICAgICBhdXRvIGV4cGFuc2lvbiA9IGJveCgpLmV4cGFuc2lvbigpOwogICAgICAgICBhdXRvIHJl Y3QgPSB0aGlzLT5yZWN0KCk7Ci0gICAgICAgIGF1dG8geFBvcyA9IHJlY3QueCgpIC0gKGxpbmUo KS5saW5lQm94TGVmdCgpICsgbGluZSgpLmNvbnRlbnRMZWZ0KCkpOworICAgICAgICBhdXRvIHhQ b3MgPSByZWN0LngoKSAtIChsaW5lKCkubGluZUJveExlZnQoKSArIGxpbmUoKS5jb250ZW50TG9n aWNhbE9mZnNldCgpKTsKIAogICAgICAgICBhdXRvIHRleHRGb3JSdW4gPSBbJl0gewogICAgICAg ICAgICAgaWYgKG1vZGUgPT0gQ3JlYXRlVGV4dFJ1bk1vZGU6OkVkaXRpbmcgfHwgIWhhc0h5cGhl bigpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGlu ZUl0ZXJhdG9yTGluZU1vZGVyblBhdGguaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3Jh dGlvbi9JbmxpbmVJdGVyYXRvckxpbmVNb2Rlcm5QYXRoLmgKaW5kZXggNGQ3N2QyNzhlOTY5OGE4 ZjYxOWNiYjNmNTg0NWM1YzBkMTBhZTZjZC4uZmI2OWIwOGQ1OTAxMjY1ZTdjZTVjYzFkMjA3MDhi Njg1MTAwMjkyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0lubGluZUl0ZXJhdG9yTGluZU1vZGVyblBhdGguaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lTW9kZXJuUGF0aC5oCkBAIC02Miw3ICs2 Miw3IEBAIHB1YmxpYzoKICAgICAvLyBGSVhNRTogSW1wbGVtZW50IG9yIHJlcGxhY2UuCiAgICAg TGF5b3V0VW5pdCBzZWxlY3Rpb25Cb3R0b20oKSBjb25zdCB7IHJldHVybiBib3R0b20oKTsgfQog Ci0gICAgZmxvYXQgY29udGVudExvZ2ljYWxMZWZ0KCkgY29uc3QgeyByZXR1cm4gbGluZSgpLmxp bmVCb3hMZWZ0KCkgKyBsaW5lKCkuY29udGVudExlZnQoKTsgfQorICAgIGZsb2F0IGNvbnRlbnRM b2dpY2FsTGVmdCgpIGNvbnN0IHsgcmV0dXJuIGxpbmUoKS5saW5lQm94TGVmdCgpICsgbGluZSgp LmNvbnRlbnRMb2dpY2FsT2Zmc2V0KCk7IH0KICAgICBmbG9hdCBjb250ZW50TG9naWNhbFJpZ2h0 KCkgY29uc3QgeyByZXR1cm4gY29udGVudExvZ2ljYWxMZWZ0KCkgKyBsaW5lKCkuY29udGVudExv Z2ljYWxXaWR0aCgpOyB9CiAgICAgZmxvYXQgeSgpIGNvbnN0IHsgcmV0dXJuIGxpbmVCb3hUb3Ao KTsgfQogICAgIGZsb2F0IGxvZ2ljYWxIZWlnaHQoKSBjb25zdCB7IHJldHVybiBsaW5lQm94Qm90 dG9tKCkgLSBsaW5lQm94VG9wKCk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGlu ZUNvbnRlbnRCdWlsZGVyLmNwcAppbmRleCAwNTEyYmNmN2FiNjBhZDBlNGI5NDIxYWZlYWViZWM0 OTQzOGY4MWZkLi40MTJjNzVmNWI0Y2Q1YzBlYWMwMjQxNDc1ZGIyODkyMTQ4ZTNlNDQwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRp b25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCkBAIC0x MzcsNyArMTM3LDcgQEAgdm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxp bmVzKExheW91dDo6SW5saW5lRm9ybWF0dGluZ1N0YXRlJiBpbmwKICAgICAgICAgfQogCiAgICAg ICAgIGF1dG8gYm94Q291bnQgPSBib3hJbmRleCAtIGZpcnN0Qm94SW5kZXg7Ci0gICAgICAgIGlu bGluZUNvbnRlbnQubGluZXMuYXBwZW5kKHsgZmlyc3RCb3hJbmRleCwgYm94Q291bnQsIEZsb2F0 UmVjdCB7IGxpbmUubGluZUJveFJlY3QoKSB9LCBsaW5lLmVuY2xvc2luZ1RvcEFuZEJvdHRvbSgp LnRvcCwgbGluZS5lbmNsb3NpbmdUb3BBbmRCb3R0b20oKS5ib3R0b20sIHNjcm9sbGFibGVPdmVy Zmxvd1JlY3QsIGxpbmVJbmtPdmVyZmxvd1JlY3QsIGxpbmUuYmFzZWxpbmUoKSwgbGluZS5iYXNl bGluZVR5cGUoKSwgbGluZS5jb250ZW50TGVmdCgpLCBsaW5lLmNvbnRlbnRMb2dpY2FsV2lkdGgo KSB9KTsKKyAgICAgICAgaW5saW5lQ29udGVudC5saW5lcy5hcHBlbmQoeyBmaXJzdEJveEluZGV4 LCBib3hDb3VudCwgRmxvYXRSZWN0IHsgbGluZS5saW5lQm94UmVjdCgpIH0sIGxpbmUuZW5jbG9z aW5nVG9wQW5kQm90dG9tKCkudG9wLCBsaW5lLmVuY2xvc2luZ1RvcEFuZEJvdHRvbSgpLmJvdHRv bSwgc2Nyb2xsYWJsZU92ZXJmbG93UmVjdCwgbGluZUlua092ZXJmbG93UmVjdCwgbGluZS5iYXNl bGluZSgpLCBsaW5lLmJhc2VsaW5lVHlwZSgpLCBsaW5lLmNvbnRlbnRMb2dpY2FsT2Zmc2V0KCks IGxpbmUuY29udGVudExvZ2ljYWxXaWR0aCgpIH0pOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZS5o IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGlu ZS5oCmluZGV4IDI5MGM4MjVkYTc3MzdkMjRmZTI3ZmFlYmUxMDliZjUzZTFkNDJmZjIuLmYwNmE2 OTBjNzEwYTYyZmJkNGRkNzk2MWE3NzUwNjViMGJlZDUxM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmUuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lLmgK QEAgLTM2LDcgKzM2LDcgQEAgbmFtZXNwYWNlIExheW91dEludGVncmF0aW9uIHsKIGNsYXNzIExp bmUgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgotICAgIExpbmUoc2l6 ZV90IGZpcnN0Qm94SW5kZXgsIHNpemVfdCBib3hDb3VudCwgY29uc3QgRmxvYXRSZWN0JiBsaW5l Qm94UmVjdCwgZmxvYXQgZW5jbG9zaW5nQ29udGVudFRvcCwgZmxvYXQgZW5jbG9zaW5nQ29udGVu dEJvdHRvbSwgY29uc3QgRmxvYXRSZWN0JiBzY3JvbGxhYmxlT3ZlcmZsb3csIGNvbnN0IEZsb2F0 UmVjdCYgaW5rT3ZlcmZsb3csIGZsb2F0IGJhc2VsaW5lLCBGb250QmFzZWxpbmUgYmFzZWxpbmVU eXBlLCBmbG9hdCBjb250ZW50TGVmdCwgZmxvYXQgY29udGVudExvZ2ljYWxXaWR0aCkKKyAgICBM aW5lKHNpemVfdCBmaXJzdEJveEluZGV4LCBzaXplX3QgYm94Q291bnQsIGNvbnN0IEZsb2F0UmVj dCYgbGluZUJveFJlY3QsIGZsb2F0IGVuY2xvc2luZ0NvbnRlbnRUb3AsIGZsb2F0IGVuY2xvc2lu Z0NvbnRlbnRCb3R0b20sIGNvbnN0IEZsb2F0UmVjdCYgc2Nyb2xsYWJsZU92ZXJmbG93LCBjb25z dCBGbG9hdFJlY3QmIGlua092ZXJmbG93LCBmbG9hdCBiYXNlbGluZSwgRm9udEJhc2VsaW5lIGJh c2VsaW5lVHlwZSwgZmxvYXQgY29udGVudExvZ2ljYWxPZmZzZXQsIGZsb2F0IGNvbnRlbnRMb2dp Y2FsV2lkdGgpCiAgICAgICAgIDogbV9maXJzdEJveEluZGV4KGZpcnN0Qm94SW5kZXgpCiAgICAg ICAgICwgbV9ib3hDb3VudChib3hDb3VudCkKICAgICAgICAgLCBtX2xpbmVCb3hSZWN0KGxpbmVC b3hSZWN0KQpAQCAtNDUsNyArNDUsNyBAQCBwdWJsaWM6CiAgICAgICAgICwgbV9zY3JvbGxhYmxl T3ZlcmZsb3coc2Nyb2xsYWJsZU92ZXJmbG93KQogICAgICAgICAsIG1faW5rT3ZlcmZsb3coaW5r T3ZlcmZsb3cpCiAgICAgICAgICwgbV9iYXNlbGluZShiYXNlbGluZSkKLSAgICAgICAgLCBtX2Nv bnRlbnRMZWZ0KGNvbnRlbnRMZWZ0KQorICAgICAgICAsIG1fY29udGVudExvZ2ljYWxPZmZzZXQo Y29udGVudExvZ2ljYWxPZmZzZXQpCiAgICAgICAgICwgbV9jb250ZW50TG9naWNhbFdpZHRoKGNv bnRlbnRMb2dpY2FsV2lkdGgpCiAgICAgICAgICwgbV9iYXNlbGluZVR5cGUoYmFzZWxpbmVUeXBl KQogICAgIHsKQEAgLTY4LDcgKzY4LDcgQEAgcHVibGljOgogICAgIGZsb2F0IGJhc2VsaW5lKCkg Y29uc3QgeyByZXR1cm4gbV9iYXNlbGluZTsgfQogICAgIEZvbnRCYXNlbGluZSBiYXNlbGluZVR5 cGUoKSBjb25zdCB7IHJldHVybiBtX2Jhc2VsaW5lVHlwZTsgfQogCi0gICAgZmxvYXQgY29udGVu dExlZnQoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRMZWZ0OyB9CisgICAgZmxvYXQgY29udGVu dExvZ2ljYWxPZmZzZXQoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRMb2dpY2FsT2Zmc2V0OyB9 CiAgICAgZmxvYXQgY29udGVudExvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVu dExvZ2ljYWxXaWR0aDsgfQogCiBwcml2YXRlOgpAQCAtODQsNyArODQsNyBAQCBwcml2YXRlOgog ICAgIEZsb2F0UmVjdCBtX3Njcm9sbGFibGVPdmVyZmxvdzsKICAgICBGbG9hdFJlY3QgbV9pbmtP dmVyZmxvdzsKICAgICBmbG9hdCBtX2Jhc2VsaW5lIHsgMCB9OwotICAgIGZsb2F0IG1fY29udGVu dExlZnQgeyAwIH07CisgICAgZmxvYXQgbV9jb250ZW50TG9naWNhbE9mZnNldCB7IDAgfTsKICAg ICBmbG9hdCBtX2NvbnRlbnRMb2dpY2FsV2lkdGggeyAwIH07CiAgICAgRm9udEJhc2VsaW5lIG1f YmFzZWxpbmVUeXBlIHsgQWxwaGFiZXRpY0Jhc2VsaW5lIH07IAogfTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblBhZ2luYXRp b24uY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0 aW9uUGFnaW5hdGlvbi5jcHAKaW5kZXggMGYwMGRlNTMzNDdjMGE2MGVmYjgyMzQyNGNmODg0MTY4 MmQ2NmRhZS4uYzU0MGExMmU5MGYwNjQxMGRkNjgxZjVjNDZmODhjY2IxNTgxZGVlMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u UGFnaW5hdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xh eW91dEludGVncmF0aW9uUGFnaW5hdGlvbi5jcHAKQEAgLTEzNiw3ICsxMzYsNyBAQCBzdGF0aWMg UmVmPElubGluZUNvbnRlbnQ+IG1ha2VBZGp1c3RlZENvbnRlbnQoY29uc3QgSW5saW5lQ29udGVu dCYgaW5saW5lQ29udGVudAogICAgICAgICAgICAgbW92ZVZlcnRpY2FsbHkobGluZS5pbmtPdmVy ZmxvdygpLCBvZmZzZXQpLAogICAgICAgICAgICAgbGluZS5iYXNlbGluZSgpLAogICAgICAgICAg ICAgbGluZS5iYXNlbGluZVR5cGUoKSwKLSAgICAgICAgICAgIGxpbmUuY29udGVudExlZnQoKSwK KyAgICAgICAgICAgIGxpbmUuY29udGVudExvZ2ljYWxPZmZzZXQoKSwKICAgICAgICAgICAgIGxp bmUuY29udGVudExvZ2ljYWxXaWR0aCgpCiAgICAgICAgIH07CiAgICAgfTsK