236280 2022-02-07 20:09:00 -0800 [LFC][IFC] Take writing direction into account when applying RenderBlockFlow end padding quirk 2022-02-08 06:57:17 -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 1838498 0 zalan 2022-02-07 20:09:00 -0800 ssia 1838499 1 451198 zalan 2022-02-07 20:14:58 -0800 Created attachment 451198 Patch 1838646 2 ews-feeder 2022-02-08 06:56:27 -0800 Committed r289374 (246962@main): <https://commits.webkit.org/246962@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451198. 1838647 3 webkit-bug-importer 2022-02-08 06:57:17 -0800 <rdar://problem/88627172> 451198 2022-02-07 20:14:58 -0800 2022-02-08 06:56:29 -0800 Patch bug-236280-20220207201457.patch text/plain 12764 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTljYzAwZjk1MGVmOWJh YjZmN2EwYzc0M2UxNzdiYmVkZmQ4M2QzNC4uY2Q4ODAyMzE2MmYwMzI4NWYzODlmYzNkMThjMDc4 MzY1NGMyNWQ4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIyLTAyLTA3ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFRha2Ugd3Jp dGluZyBkaXJlY3Rpb24gaW50byBhY2NvdW50IHdoZW4gYXBwbHlpbmcgUmVuZGVyQmxvY2tGbG93 IGVuZCBwYWRkaW5nIHF1aXJrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzYyODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBJbiB2ZXJ0aWNhbCB3cml0aW5nIG1vZGUgdGhlIG92ZXJmbG93IHNob3VsZCBi ZSBleHBhbmRlZCBpbiB0aGUgdmVydGljYWwgZGlyZWN0aW9uIGlmIGFwcGxpY2FibGUuCisKKyAg ICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURp c3BsYXlMaW5lLmg6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVEaXNwbGF5OjpMaW5lOjpjb250 ZW50TG9naWNhbFdpZHRoIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZURpc3BsYXk6 OkxpbmU6OkxpbmUpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lRGlzcGxheTo6TGluZTo6Y29u dGVudFdpZHRoIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24v SW5saW5lSXRlcmF0b3JMaW5lTW9kZXJuUGF0aC5oOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5l SXRlcmF0b3I6OkxpbmVJdGVyYXRvck1vZGVyblBhdGg6OmNvbnRlbnRMb2dpY2FsUmlnaHQgY29u c3QpOgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGlu ZUNvbnRlbnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9u OjpsaW5lT3ZlcmZsb3dMb2dpY2FsV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50 ZWdyYXRpb246OklubGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5TGluZXMgY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OmxpbmVPdmVyZmxvd1dpZHRo KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRp b25MaW5lLmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZTo6TGlu ZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZTo6Y29udGVudExv Z2ljYWxXaWR0aCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6 TGluZTo6Y29udGVudFdpZHRoIGNvbnN0KTogRGVsZXRlZC4gLT4gdGhpcyBpcyBhIGxvZ2ljYWwg d2lkdGggdmFsdWUuCisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0 aW9uUGFnaW5hdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6 bWFrZUFkanVzdGVkQ29udGVudCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRS ZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpGbG9hdFJlY3Q6OnNoaWZ0TWF4WUVkZ2VCeSk6CisK IDIwMjItMDItMDcgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtM RkNdW0lGQ10gQWRkIHN1cHBvcnQgZm9yIGlkZW9ncmFwaGljIGJhc2VsaW5lIG9uIGF0b21pYyBp bmxpbmUgbGV2ZWwgYm94ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5lRGlzcGxheUxpbmUuaCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL2Rpc3BsYXkvSW5saW5l RGlzcGxheUxpbmUuaAppbmRleCBhMzY1MTg4MzE4OGExZTdmMjQ5YzNjY2ZiNWEwZDlmNWU4MWVh MGI3Li44MWY3OWY0MThhM2EwNGEwYmIzZTgzYzM2MTUyOTYxZDI0NjAwMTQwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5 L0lubGluZURpc3BsYXlMaW5lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5TGluZS5oCkBAIC00MCw3ICs0 MCw3IEBAIHB1YmxpYzoKICAgICAgICAgZmxvYXQgdG9wIHsgMCB9OwogICAgICAgICBmbG9hdCBi b3R0b20geyAwIH07CiAgICAgfTsKLSAgICBMaW5lKGNvbnN0IEZsb2F0UmVjdCYgbGluZUJveFJl Y3QsIGNvbnN0IEZsb2F0UmVjdCYgc2Nyb2xsYWJsZU92ZXJmbG93LCBFbmNsb3NpbmdUb3BBbmRC b3R0b20sIGZsb2F0IGFsaWdtZW50QmFzZWxpbmUsIGZsb2F0IGNvbnRlbnRMZWZ0LCBmbG9hdCBj b250ZW50V2lkdGgpOworICAgIExpbmUoY29uc3QgRmxvYXRSZWN0JiBsaW5lQm94UmVjdCwgY29u c3QgRmxvYXRSZWN0JiBzY3JvbGxhYmxlT3ZlcmZsb3csIEVuY2xvc2luZ1RvcEFuZEJvdHRvbSwg ZmxvYXQgYWxpZ21lbnRCYXNlbGluZSwgZmxvYXQgY29udGVudExlZnQsIGZsb2F0IGNvbnRlbnRM b2dpY2FsV2lkdGgpOwogCiAgICAgZmxvYXQgbGVmdCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJv eFJlY3QueCgpOyB9CiAgICAgZmxvYXQgcmlnaHQoKSBjb25zdCB7IHJldHVybiBtX2xpbmVCb3hS ZWN0Lm1heFgoKTsgfQpAQCAtNTcsNyArNTcsNyBAQCBwdWJsaWM6CiAgICAgZmxvYXQgYmFzZWxp bmUoKSBjb25zdCB7IHJldHVybiBtX2FsaWdtZW50QmFzZWxpbmU7IH0KIAogICAgIGZsb2F0IGNv bnRlbnRMZWZ0KCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50TGVmdDsgfQotICAgIGZsb2F0IGNv bnRlbnRXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudFdpZHRoOyB9CisgICAgZmxvYXQg Y29udGVudExvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudExvZ2ljYWxXaWR0 aDsgfQogCiAgICAgdm9pZCBtb3ZlVmVydGljYWxseShmbG9hdCBvZmZzZXQpIHsgbV9saW5lQm94 UmVjdC5tb3ZlKHsgeyB9LCBvZmZzZXQgfSk7IH0KIApAQCAtNzEsMTYgKzcxLDE2IEBAIHByaXZh dGU6CiAgICAgRW5jbG9zaW5nVG9wQW5kQm90dG9tIG1fZW5jbG9zaW5nVG9wQW5kQm90dG9tOwog ICAgIGZsb2F0IG1fYWxpZ21lbnRCYXNlbGluZSB7IDAgfTsKICAgICBmbG9hdCBtX2NvbnRlbnRM ZWZ0IHsgMCB9OwotICAgIGZsb2F0IG1fY29udGVudFdpZHRoIHsgMCB9OworICAgIGZsb2F0IG1f Y29udGVudExvZ2ljYWxXaWR0aCB7IDAgfTsKIH07CiAKLWlubGluZSBMaW5lOjpMaW5lKGNvbnN0 IEZsb2F0UmVjdCYgbGluZUJveFJlY3QsIGNvbnN0IEZsb2F0UmVjdCYgc2Nyb2xsYWJsZU92ZXJm bG93LCBFbmNsb3NpbmdUb3BBbmRCb3R0b20gZW5jbG9zaW5nVG9wQW5kQm90dG9tLCBmbG9hdCBh bGlnbWVudEJhc2VsaW5lLCBmbG9hdCBjb250ZW50TGVmdCwgZmxvYXQgY29udGVudFdpZHRoKQor aW5saW5lIExpbmU6OkxpbmUoY29uc3QgRmxvYXRSZWN0JiBsaW5lQm94UmVjdCwgY29uc3QgRmxv YXRSZWN0JiBzY3JvbGxhYmxlT3ZlcmZsb3csIEVuY2xvc2luZ1RvcEFuZEJvdHRvbSBlbmNsb3Np bmdUb3BBbmRCb3R0b20sIGZsb2F0IGFsaWdtZW50QmFzZWxpbmUsIGZsb2F0IGNvbnRlbnRMZWZ0 LCBmbG9hdCBjb250ZW50TG9naWNhbFdpZHRoKQogICAgIDogbV9saW5lQm94UmVjdChsaW5lQm94 UmVjdCkKICAgICAsIG1fc2Nyb2xsYWJsZU92ZXJmbG93KHNjcm9sbGFibGVPdmVyZmxvdykKICAg ICAsIG1fZW5jbG9zaW5nVG9wQW5kQm90dG9tKGVuY2xvc2luZ1RvcEFuZEJvdHRvbSkKICAgICAs IG1fYWxpZ21lbnRCYXNlbGluZShhbGlnbWVudEJhc2VsaW5lKQogICAgICwgbV9jb250ZW50TGVm dChjb250ZW50TGVmdCkKLSAgICAsIG1fY29udGVudFdpZHRoKGNvbnRlbnRXaWR0aCkKKyAgICAs IG1fY29udGVudExvZ2ljYWxXaWR0aChjb250ZW50TG9naWNhbFdpZHRoKQogewogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JM aW5lTW9kZXJuUGF0aC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGlu ZUl0ZXJhdG9yTGluZU1vZGVyblBhdGguaAppbmRleCBlMTc4M2U1NzM5ZTc1ZDkyZmM1NDdlMzg4 ZDc4ZjAwYTI4MDI5ZDhlLi4zNjYyZTgxNjRjMzRjYTJlNGVhYmFiMmY2ODRiNGM0OGRlOTg5ZWU3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRl cmF0b3JMaW5lTW9kZXJuUGF0aC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3Jh dGlvbi9JbmxpbmVJdGVyYXRvckxpbmVNb2Rlcm5QYXRoLmgKQEAgLTYzLDcgKzYzLDcgQEAgcHVi bGljOgogICAgIExheW91dFVuaXQgc2VsZWN0aW9uQm90dG9tKCkgY29uc3QgeyByZXR1cm4gYm90 dG9tKCk7IH0KIAogICAgIGZsb2F0IGNvbnRlbnRMb2dpY2FsTGVmdCgpIGNvbnN0IHsgcmV0dXJu IGxpbmUoKS5saW5lQm94TGVmdCgpICsgbGluZSgpLmNvbnRlbnRMZWZ0KCk7IH0KLSAgICBmbG9h dCBjb250ZW50TG9naWNhbFJpZ2h0KCkgY29uc3QgeyByZXR1cm4gY29udGVudExvZ2ljYWxMZWZ0 KCkgKyBsaW5lKCkuY29udGVudFdpZHRoKCk7IH0KKyAgICBmbG9hdCBjb250ZW50TG9naWNhbFJp Z2h0KCkgY29uc3QgeyByZXR1cm4gY29udGVudExvZ2ljYWxMZWZ0KCkgKyBsaW5lKCkuY29udGVu dExvZ2ljYWxXaWR0aCgpOyB9CiAgICAgZmxvYXQgeSgpIGNvbnN0IHsgcmV0dXJuIGxpbmVCb3hU b3AoKTsgfQogICAgIGZsb2F0IGxvZ2ljYWxIZWlnaHQoKSBjb25zdCB7IHJldHVybiBsaW5lQm94 Qm90dG9tKCkgLSBsaW5lQm94VG9wKCk7IH0KICAgICBib29sIGlzSG9yaXpvbnRhbCgpIGNvbnN0 IHsgcmV0dXJuIHRydWU7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRl bnRCdWlsZGVyLmNwcAppbmRleCBlMmExNThmNDAyNmRkZTJkYWEyZTRiMmU1NjkxMDg1MTc0MDcz ODk0Li43ZDFkYzdjMzI3NGJmMmI4YmExOTIxY2FhOWM3ZWYxNzQwZDliOGJjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Jbmxp bmVDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCkBAIC00Niw3ICs0 Niw3IEBAIGlubGluZSBJbmxpbmVEaXNwbGF5OjpMaW5lOjpFbmNsb3NpbmdUb3BBbmRCb3R0b20g b3BlcmF0b3IrKGNvbnN0IElubGluZURpc3BsYXk6CiAgICAgcmV0dXJuIHsgZW5jbG9zaW5nVG9w QW5kQm90dG9tLnRvcCArIG9mZnNldCwgZW5jbG9zaW5nVG9wQW5kQm90dG9tLmJvdHRvbSArIG9m ZnNldCB9OwogfQogCi1pbmxpbmUgc3RhdGljIGZsb2F0IGxpbmVPdmVyZmxvd1dpZHRoKGNvbnN0 IFJlbmRlckJsb2NrRmxvdyYgZmxvdywgTGF5b3V0OjpJbmxpbmVMYXlvdXRVbml0IGxpbmVDb250 ZW50V2lkdGgpCitpbmxpbmUgc3RhdGljIGZsb2F0IGxpbmVPdmVyZmxvd0xvZ2ljYWxXaWR0aChj b25zdCBSZW5kZXJCbG9ja0Zsb3cmIGZsb3csIExheW91dDo6SW5saW5lTGF5b3V0VW5pdCBsaW5l Q29udGVudExvZ2ljYWxXaWR0aCkKIHsKICAgICAvLyBGSVhNRTogSXQncyB0aGUgY29weSBvZiB0 aGUgbGV0cy1hZGp1c3Qtb3ZlcmZsb3ctZm9yLXRoZS1jYXJldCBiZWhhdmlvciBmcm9tIExlZ2Fj eUxpbmVMYXlvdXQ6OmFkZE92ZXJmbG93RnJvbUlubGluZUNoaWxkcmVuLgogICAgIGF1dG8gZW5k UGFkZGluZyA9IGZsb3cuaGFzTm9uVmlzaWJsZU92ZXJmbG93KCkgPyBmbG93LnBhZGRpbmdFbmQo KSA6IDBfbHU7CkBAIC01NCw3ICs1NCw3IEBAIGlubGluZSBzdGF0aWMgZmxvYXQgbGluZU92ZXJm bG93V2lkdGgoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBmbG93LCBMYXlvdXQ6OklubGluCiAgICAg ICAgIGVuZFBhZGRpbmcgPSBmbG93LmVuZFBhZGRpbmdXaWR0aEZvckNhcmV0KCk7CiAgICAgaWYg KGZsb3cuaGFzTm9uVmlzaWJsZU92ZXJmbG93KCkgJiYgIWVuZFBhZGRpbmcgJiYgZmxvdy5lbGVt ZW50KCkgJiYgZmxvdy5lbGVtZW50KCktPmlzUm9vdEVkaXRhYmxlRWxlbWVudCgpKQogICAgICAg ICBlbmRQYWRkaW5nID0gMTsKLSAgICByZXR1cm4gbGluZUNvbnRlbnRXaWR0aCArIGVuZFBhZGRp bmc7CisgICAgcmV0dXJuIGxpbmVDb250ZW50TG9naWNhbFdpZHRoICsgZW5kUGFkZGluZzsKIH0K IAogSW5saW5lQ29udGVudEJ1aWxkZXI6OklubGluZUNvbnRlbnRCdWlsZGVyKGNvbnN0IFJlbmRl ckJsb2NrRmxvdyYgYmxvY2tGbG93LCBCb3hUcmVlJiBib3hUcmVlKQpAQCAtOTEsMTAgKzkxLDIx IEBAIHZvaWQgSW5saW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0ZURpc3BsYXlMaW5lcyhMYXlvdXQ6 OklubGluZUZvcm1hdHRpbmdTdGF0ZSYgaW5sCiAgICAgZm9yIChzaXplX3QgbGluZUluZGV4ID0g MDsgbGluZUluZGV4IDwgbGluZXMuc2l6ZSgpOyArK2xpbmVJbmRleCkgewogICAgICAgICBhdXRv JiBsaW5lID0gbGluZXNbbGluZUluZGV4XTsKICAgICAgICAgYXV0byBzY3JvbGxhYmxlT3ZlcmZs b3dSZWN0ID0gRmxvYXRSZWN0IHsgbGluZS5zY3JvbGxhYmxlT3ZlcmZsb3coKSB9OwotICAgICAg ICBpZiAoYXV0byBvdmVyZmxvd1dpZHRoID0gbGluZU92ZXJmbG93V2lkdGgobV9ibG9ja0Zsb3cs IGxpbmUuY29udGVudFdpZHRoKCkpOyBvdmVyZmxvd1dpZHRoID4gc2Nyb2xsYWJsZU92ZXJmbG93 UmVjdC53aWR0aCgpKSB7Ci0gICAgICAgICAgICBhdXRvIG92ZXJmbG93VmFsdWUgPSBvdmVyZmxv d1dpZHRoIC0gc2Nyb2xsYWJsZU92ZXJmbG93UmVjdC53aWR0aCgpOwotICAgICAgICAgICAgbV9i bG9ja0Zsb3cuc3R5bGUoKS5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkgPyBzY3JvbGxhYmxlT3Zl cmZsb3dSZWN0LnNoaWZ0TWF4WEVkZ2VCeShvdmVyZmxvd1ZhbHVlKSA6IHNjcm9sbGFibGVPdmVy Zmxvd1JlY3Quc2hpZnRYRWRnZUJ5KC1vdmVyZmxvd1ZhbHVlKTsKLSAgICAgICAgfQorCisgICAg ICAgIGF1dG8gYWRqdXN0T3ZlcmZsb3dMb2dpY2FsV2lkdGhXaXRoQmxvY2tGbG93UXVpcmsgPSBb Jl0geworICAgICAgICAgICAgYXV0byYgcm9vdFN0eWxlID0gbV9ibG9ja0Zsb3cuc3R5bGUoKTsK KyAgICAgICAgICAgIGF1dG8gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUgPSByb290U3R5bGUuaXNI b3Jpem9udGFsV3JpdGluZ01vZGUoKTsKKyAgICAgICAgICAgIGF1dG8gYWRqdXN0ZWRPdmVyZmxv d0xvZ2ljYWxXaWR0aCA9IGxpbmVPdmVyZmxvd0xvZ2ljYWxXaWR0aChtX2Jsb2NrRmxvdywgbGlu ZS5jb250ZW50TG9naWNhbFdpZHRoKCkpOworICAgICAgICAgICAgYXV0byBzY3JvbGxhYmxlT3Zl cmZsb3dMb2dpY2FsV2lkdGggPSBpc0hvcml6b250YWxXcml0aW5nTW9kZSA/IHNjcm9sbGFibGVP dmVyZmxvd1JlY3Qud2lkdGgoKSA6IHNjcm9sbGFibGVPdmVyZmxvd1JlY3QuaGVpZ2h0KCk7Cisg ICAgICAgICAgICBpZiAoYWRqdXN0ZWRPdmVyZmxvd0xvZ2ljYWxXaWR0aCA+IHNjcm9sbGFibGVP dmVyZmxvd0xvZ2ljYWxXaWR0aCkgeworICAgICAgICAgICAgICAgIGF1dG8gb3ZlcmZsb3dWYWx1 ZSA9IGFkanVzdGVkT3ZlcmZsb3dMb2dpY2FsV2lkdGggLSBzY3JvbGxhYmxlT3ZlcmZsb3dMb2dp Y2FsV2lkdGg7CisgICAgICAgICAgICAgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKQor ICAgICAgICAgICAgICAgICAgICByb290U3R5bGUuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID8g c2Nyb2xsYWJsZU92ZXJmbG93UmVjdC5zaGlmdE1heFhFZGdlQnkob3ZlcmZsb3dWYWx1ZSkgOiBz Y3JvbGxhYmxlT3ZlcmZsb3dSZWN0LnNoaWZ0WEVkZ2VCeSgtb3ZlcmZsb3dWYWx1ZSk7CisgICAg ICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICByb290U3R5bGUuaXNMZWZ0VG9S aWdodERpcmVjdGlvbigpID8gc2Nyb2xsYWJsZU92ZXJmbG93UmVjdC5zaGlmdE1heFlFZGdlQnko b3ZlcmZsb3dWYWx1ZSkgOiBzY3JvbGxhYmxlT3ZlcmZsb3dSZWN0LnNoaWZ0WUVkZ2VCeSgtb3Zl cmZsb3dWYWx1ZSk7CisgICAgICAgICAgICB9CisgICAgICAgIH07CisgICAgICAgIGFkanVzdE92 ZXJmbG93TG9naWNhbFdpZHRoV2l0aEJsb2NrRmxvd1F1aXJrKCk7CiAKICAgICAgICAgYXV0byBm aXJzdEJveEluZGV4ID0gYm94SW5kZXg7CiAgICAgICAgIGF1dG8gbGluZUlua092ZXJmbG93UmVj dCA9IHNjcm9sbGFibGVPdmVyZmxvd1JlY3Q7CkBAIC0xMjYsNyArMTM3LDcgQEAgdm9pZCBJbmxp bmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlzcGxheUxpbmVzKExheW91dDo6SW5saW5lRm9ybWF0 dGluZ1N0YXRlJiBpbmwKICAgICAgICAgfQogCiAgICAgICAgIGF1dG8gYm94Q291bnQgPSBib3hJ bmRleCAtIGZpcnN0Qm94SW5kZXg7Ci0gICAgICAgIGlubGluZUNvbnRlbnQubGluZXMuYXBwZW5k KHsgZmlyc3RCb3hJbmRleCwgYm94Q291bnQsIEZsb2F0UmVjdCB7IGxpbmUubGluZUJveFJlY3Qo KSB9LCBsaW5lLmVuY2xvc2luZ1RvcEFuZEJvdHRvbSgpLnRvcCwgbGluZS5lbmNsb3NpbmdUb3BB bmRCb3R0b20oKS5ib3R0b20sIHNjcm9sbGFibGVPdmVyZmxvd1JlY3QsIGxpbmVJbmtPdmVyZmxv d1JlY3QsIGxpbmUuYmFzZWxpbmUoKSwgbGluZS5jb250ZW50TGVmdCgpLCBsaW5lLmNvbnRlbnRX aWR0aCgpIH0pOworICAgICAgICBpbmxpbmVDb250ZW50LmxpbmVzLmFwcGVuZCh7IGZpcnN0Qm94 SW5kZXgsIGJveENvdW50LCBGbG9hdFJlY3QgeyBsaW5lLmxpbmVCb3hSZWN0KCkgfSwgbGluZS5l bmNsb3NpbmdUb3BBbmRCb3R0b20oKS50b3AsIGxpbmUuZW5jbG9zaW5nVG9wQW5kQm90dG9tKCku Ym90dG9tLCBzY3JvbGxhYmxlT3ZlcmZsb3dSZWN0LCBsaW5lSW5rT3ZlcmZsb3dSZWN0LCBsaW5l LmJhc2VsaW5lKCksIGxpbmUuY29udGVudExlZnQoKSwgbGluZS5jb250ZW50TG9naWNhbFdpZHRo KCkgfSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50 ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lLmgKaW5kZXggNmRmZTZiYzkzZjExZTMw MWNmYTllZTc1MTZmMDMzNzQxOGE2ZjY3Mi4uOWEyZDk4MTg3MzI3MjBhMzU2ZmJhNGVmNTBiNGM3 YjZjZjY3NWMwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uTGluZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmUuaApAQCAtMzYsNyArMzYsNyBAQCBuYW1lc3Bh Y2UgTGF5b3V0SW50ZWdyYXRpb24gewogY2xhc3MgTGluZSB7CiAgICAgV1RGX01BS0VfRkFTVF9B TExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAgTGluZShzaXplX3QgZmlyc3RCb3hJbmRleCwgc2l6ZV90 IGJveENvdW50LCBjb25zdCBGbG9hdFJlY3QmIGxpbmVCb3hSZWN0LCBmbG9hdCBlbmNsb3NpbmdD b250ZW50VG9wLCBmbG9hdCBlbmNsb3NpbmdDb250ZW50Qm90dG9tLCBjb25zdCBGbG9hdFJlY3Qm IHNjcm9sbGFibGVPdmVyZmxvdywgY29uc3QgRmxvYXRSZWN0JiBpbmtPdmVyZmxvdywgZmxvYXQg YmFzZWxpbmUsIGZsb2F0IGNvbnRlbnRMZWZ0LCBmbG9hdCBjb250ZW50V2lkdGgpCisgICAgTGlu ZShzaXplX3QgZmlyc3RCb3hJbmRleCwgc2l6ZV90IGJveENvdW50LCBjb25zdCBGbG9hdFJlY3Qm IGxpbmVCb3hSZWN0LCBmbG9hdCBlbmNsb3NpbmdDb250ZW50VG9wLCBmbG9hdCBlbmNsb3NpbmdD b250ZW50Qm90dG9tLCBjb25zdCBGbG9hdFJlY3QmIHNjcm9sbGFibGVPdmVyZmxvdywgY29uc3Qg RmxvYXRSZWN0JiBpbmtPdmVyZmxvdywgZmxvYXQgYmFzZWxpbmUsIGZsb2F0IGNvbnRlbnRMZWZ0 LCBmbG9hdCBjb250ZW50TG9naWNhbFdpZHRoKQogICAgICAgICA6IG1fZmlyc3RCb3hJbmRleChm aXJzdEJveEluZGV4KQogICAgICAgICAsIG1fYm94Q291bnQoYm94Q291bnQpCiAgICAgICAgICwg bV9saW5lQm94UmVjdChsaW5lQm94UmVjdCkKQEAgLTQ2LDcgKzQ2LDcgQEAgcHVibGljOgogICAg ICAgICAsIG1faW5rT3ZlcmZsb3coaW5rT3ZlcmZsb3cpCiAgICAgICAgICwgbV9iYXNlbGluZShi YXNlbGluZSkKICAgICAgICAgLCBtX2NvbnRlbnRMZWZ0KGNvbnRlbnRMZWZ0KQotICAgICAgICAs IG1fY29udGVudFdpZHRoKGNvbnRlbnRXaWR0aCkKKyAgICAgICAgLCBtX2NvbnRlbnRMb2dpY2Fs V2lkdGgoY29udGVudExvZ2ljYWxXaWR0aCkKICAgICB7CiAgICAgfQogCkBAIC02Nyw3ICs2Nyw3 IEBAIHB1YmxpYzoKICAgICBmbG9hdCBiYXNlbGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fYmFzZWxp bmU7IH0KIAogICAgIGZsb2F0IGNvbnRlbnRMZWZ0KCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50 TGVmdDsgfQotICAgIGZsb2F0IGNvbnRlbnRXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVu dFdpZHRoOyB9CisgICAgZmxvYXQgY29udGVudExvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJu IG1fY29udGVudExvZ2ljYWxXaWR0aDsgfQogCiBwcml2YXRlOgogICAgIHNpemVfdCBtX2ZpcnN0 Qm94SW5kZXggeyAwIH07CkBAIC04Myw3ICs4Myw3IEBAIHByaXZhdGU6CiAgICAgRmxvYXRSZWN0 IG1faW5rT3ZlcmZsb3c7CiAgICAgZmxvYXQgbV9iYXNlbGluZSB7IDAgfTsKICAgICBmbG9hdCBt X2NvbnRlbnRMZWZ0IHsgMCB9OwotICAgIGZsb2F0IG1fY29udGVudFdpZHRoIHsgMCB9OworICAg IGZsb2F0IG1fY29udGVudExvZ2ljYWxXaWR0aCB7IDAgfTsKIH07CiAKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblBhZ2lu YXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVn cmF0aW9uUGFnaW5hdGlvbi5jcHAKaW5kZXggNDMwNDA3ODFmM2E2MGZmYjhhYjE0OWUyNmFmZjI2 OTA0NWRjMjlmMC4uMzYwMTY4OTc0YmNkMWRjZDY0YmJkZWY2MTRjNDg0MzNiOTQ2YTA3ZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0 aW9uUGFnaW5hdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uUGFnaW5hdGlvbi5jcHAKQEAgLTEzNiw3ICsxMzYsNyBAQCBzdGF0 aWMgUmVmPElubGluZUNvbnRlbnQ+IG1ha2VBZGp1c3RlZENvbnRlbnQoY29uc3QgSW5saW5lQ29u dGVudCYgaW5saW5lQ29udGVudAogICAgICAgICAgICAgbW92ZVZlcnRpY2FsbHkobGluZS5pbmtP dmVyZmxvdygpLCBvZmZzZXQpLAogICAgICAgICAgICAgbGluZS5iYXNlbGluZSgpLAogICAgICAg ICAgICAgbGluZS5jb250ZW50TGVmdCgpLAotICAgICAgICAgICAgbGluZS5jb250ZW50V2lkdGgo KQorICAgICAgICAgICAgbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCkKICAgICAgICAgfTsKICAg ICB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9h dFJlY3QuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UmVjdC5oCmlu ZGV4IDE3YjdhY2QzMjUwYWQ1MjBiZGI4OTRjNGMzN2U2ZTlmNWNhYzIyNjAuLmU5YjczZGEwY2Yw YzIyYjY5NjdlYWYzNTQ1NmVjNGYzNGJiOGU4NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UmVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0Zsb2F0UmVjdC5oCkBAIC0xNTksNiArMTU5LDExIEBAIHB1YmxpYzoKICAg ICAgICAgc2V0SGVpZ2h0KHN0ZDo6bWF4KDAuMGYsIGhlaWdodCgpIC0gZGVsdGEpKTsKICAgICB9 CiAKKyAgICB2b2lkIHNoaWZ0TWF4WUVkZ2VCeShmbG9hdCBkZWx0YSkKKyAgICB7CisgICAgICAg IHNoaWZ0TWF4WUVkZ2VUbyhtYXhZKCkgKyBkZWx0YSk7CisgICAgfQorCiAgICAgRmxvYXRQb2lu dCBtaW5YTWluWUNvcm5lcigpIGNvbnN0IHsgcmV0dXJuIG1fbG9jYXRpb247IH0gLy8gdHlwaWNh bGx5IHRvcExlZnQKICAgICBGbG9hdFBvaW50IG1heFhNaW5ZQ29ybmVyKCkgY29uc3QgeyByZXR1 cm4gRmxvYXRQb2ludChtX2xvY2F0aW9uLngoKSArIG1fc2l6ZS53aWR0aCgpLCBtX2xvY2F0aW9u LnkoKSk7IH0gLy8gdHlwaWNhbGx5IHRvcFJpZ2h0CiAgICAgRmxvYXRQb2ludCBtaW5YTWF4WUNv cm5lcigpIGNvbnN0IHsgcmV0dXJuIEZsb2F0UG9pbnQobV9sb2NhdGlvbi54KCksIG1fbG9jYXRp b24ueSgpICsgbV9zaXplLmhlaWdodCgpKTsgfSAvLyB0eXBpY2FsbHkgYm90dG9tTGVmdAo=