236948 2022-02-20 20:54:26 -0800 [IFC][Integration] Take vertical-rl writing mode value into account when converting visual margin/border/padding value to logical 2022-02-21 06:14:16 -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 1844106 0 zalan 2022-02-20 20:54:26 -0800 ssia 1844107 1 452709 zalan 2022-02-20 20:58:18 -0800 Created attachment 452709 Patch 1844185 2 ews-feeder 2022-02-21 06:13:59 -0800 Committed r290240 (247565@main): <https://commits.webkit.org/247565@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452709. 1844186 3 webkit-bug-importer 2022-02-21 06:14:16 -0800 <rdar://problem/89231055> 452709 2022-02-20 20:58:18 -0800 2022-02-21 06:14:00 -0800 Patch bug-236948-20220220205817.patch text/plain 13094 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGYxZjJmZjJmMTU4MzFh M2E1NDVkNGEyNGEyNDk2YWYyZDkyMmY3MC4uNjM3YmJjNzU5ODBlZWJiNzgwOTA1OWYxMzc3Mzll ZTM5NjI2M2IzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAyLTIwICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0g VGFrZSB2ZXJ0aWNhbC1ybCB3cml0aW5nIG1vZGUgdmFsdWUgaW50byBhY2NvdW50IHdoZW4gY29u dmVydGluZyB2aXN1YWwgbWFyZ2luL2JvcmRlci9wYWRkaW5nIHZhbHVlIHRvIGxvZ2ljYWwKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjk0OAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgaW4g cHJlcGFyYXRpb24gZm9yIHN1cHBvcnRpbmcgdmVydGljYWwtcmwgY29udGVudC4KKyAgICAgICAg KE5vdGUgdGhhdCB0aGUgUlRMIGlubGluZSBkaXJlY3Rpb24gIT0gdGhlICJybCIgcGFydCBvZiB0 aGUgd3JpdGluZyBtb2RlLikKKworICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJ bnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdy YXRpb246Omhvcml6b250YWxMb2dpY2FsTWFyZ2luKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dEludGVncmF0aW9uOjp2ZXJ0aWNhbExvZ2ljYWxNYXJnaW4pOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0SW50ZWdyYXRpb246OmxvZ2ljYWxCb3JkZXIpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0SW50ZWdyYXRpb246OmxvZ2ljYWxQYWRkaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dEludGVncmF0aW9uOjpMaW5lTGF5b3V0Ojp1cGRhdGVMYXlvdXRCb3hEaW1lbnNpb25zKToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0Ojp1cGRhdGVJbmxp bmVCb3hEaW1lbnNpb25zKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpM aW5lTGF5b3V0Ojp1cGRhdGVGb3JtYXR0aW5nUm9vdEdlb21ldHJ5QW5kSW52YWxpZGF0ZSk6CisK IDIwMjItMDItMjAgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtM RkNdW0lGQ10gTm9uLW9ydGhvZ29uYWwgaW5saW5lIGJsb2NrIGJveGVzIGtlZXAgdGhlaXIgYmFz ZWxpbmUgb24gaWRlb2dyYXBoaWMgbGluZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5j cHAKaW5kZXggMTc2ZmQxZDQ1OTQ1MzBkZTMyNzdjZDIyN2EwYTA1M2M5MzNlMTU3MC4uMjRiYjE3 MzQ1Mjg4ZTYyYTNlNjQ4Y2E3YTRhYjBkNWNjNjMyYTI3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u TGluZUxheW91dC5jcHAKQEAgLTE1OCw2NCArMTU4LDczIEBAIHN0YXRpYyBpbmxpbmUgTGF5b3V0 VW5pdCBjb250ZW50TG9naWNhbEhlaWdodEZvclJlbmRlcmVyKGNvbnN0IFJlbmRlckJveCYgcmVu ZGVyCiAgICAgcmV0dXJuIHJlbmRlcmVyLnBhcmVudCgpLT5zdHlsZSgpLmlzSG9yaXpvbnRhbFdy aXRpbmdNb2RlKCkgPyByZW5kZXJlci5jb250ZW50SGVpZ2h0KCkgOiByZW5kZXJlci5jb250ZW50 V2lkdGgoKTsKIH0KIAotc3RhdGljIGlubGluZSBMYXlvdXQ6OkJveEdlb21ldHJ5OjpIb3Jpem9u dGFsTWFyZ2luIGhvcml6b250YWxMb2dpY2FsTWFyZ2luKGNvbnN0IFJlbmRlckJveE1vZGVsT2Jq ZWN0JiByZW5kZXJlciwgYm9vbCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uLCBib29sIGlzSG9yaXpv bnRhbFdyaXRpbmdNb2RlLCBib29sIHJldGFpbk1hcmdpblN0YXJ0ID0gdHJ1ZSwgYm9vbCByZXRh aW5NYXJnaW5FbmQgPSB0cnVlKQorc3RhdGljIGlubGluZSBMYXlvdXQ6OkJveEdlb21ldHJ5OjpI b3Jpem9udGFsTWFyZ2luIGhvcml6b250YWxMb2dpY2FsTWFyZ2luKGNvbnN0IFJlbmRlckJveE1v ZGVsT2JqZWN0JiByZW5kZXJlciwgYm9vbCBpc0xlZnRUb1JpZ2h0SW5saW5lRGlyZWN0aW9uLCBi b29sIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlLCBib29sIHJldGFpbk1hcmdpblN0YXJ0ID0gdHJ1 ZSwgYm9vbCByZXRhaW5NYXJnaW5FbmQgPSB0cnVlKQogewogICAgIGF1dG8gbWFyZ2luTGVmdCA9 IHJlbmRlcmVyLm1hcmdpbkxlZnQoKTsKICAgICBhdXRvIG1hcmdpblJpZ2h0ID0gcmVuZGVyZXIu bWFyZ2luUmlnaHQoKTsKICAgICBpZiAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUpIHsKLSAgICAg ICAgaWYgKGlzTGVmdFRvUmlnaHREaXJlY3Rpb24pCisgICAgICAgIGlmIChpc0xlZnRUb1JpZ2h0 SW5saW5lRGlyZWN0aW9uKQogICAgICAgICAgICAgcmV0dXJuIHsgcmV0YWluTWFyZ2luU3RhcnQg PyBtYXJnaW5MZWZ0IDogMF9sdSwgcmV0YWluTWFyZ2luRW5kID8gbWFyZ2luUmlnaHQgOiAwX2x1 IH07CiAgICAgICAgIHJldHVybiB7IHJldGFpbk1hcmdpblN0YXJ0ID8gbWFyZ2luUmlnaHQgOiAw X2x1LCByZXRhaW5NYXJnaW5FbmQgPyBtYXJnaW5MZWZ0IDogMF9sdSB9OwogICAgIH0KIAogICAg IGF1dG8gbWFyZ2luVG9wID0gcmVuZGVyZXIubWFyZ2luVG9wKCk7CiAgICAgYXV0byBtYXJnaW5C b3R0b20gPSByZW5kZXJlci5tYXJnaW5Cb3R0b20oKTsKLSAgICBpZiAoaXNMZWZ0VG9SaWdodERp cmVjdGlvbikKKyAgICBpZiAoaXNMZWZ0VG9SaWdodElubGluZURpcmVjdGlvbikKICAgICAgICAg cmV0dXJuIHsgcmV0YWluTWFyZ2luU3RhcnQgPyBtYXJnaW5Ub3AgOiAwX2x1LCByZXRhaW5NYXJn aW5FbmQgPyBtYXJnaW5Cb3R0b20gOiAwX2x1IH07CiAgICAgcmV0dXJuIHsgcmV0YWluTWFyZ2lu U3RhcnQgPyBtYXJnaW5Cb3R0b20gOiAwX2x1LCByZXRhaW5NYXJnaW5FbmQgPyBtYXJnaW5Ub3Ag OiAwX2x1IH07CiB9CiAKLXN0YXRpYyBpbmxpbmUgTGF5b3V0OjpCb3hHZW9tZXRyeTo6VmVydGlj YWxNYXJnaW4gdmVydGljYWxMb2dpY2FsTWFyZ2luKGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0 JiByZW5kZXJlciwgYm9vbCBpc0hvcml6b250YWxXcml0aW5nTW9kZSkKK3N0YXRpYyBpbmxpbmUg TGF5b3V0OjpCb3hHZW9tZXRyeTo6VmVydGljYWxNYXJnaW4gdmVydGljYWxMb2dpY2FsTWFyZ2lu KGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0JiByZW5kZXJlciwgV3JpdGluZ01vZGUgd3JpdGlu Z01vZGUpCiB7Ci0gICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKQorICAgIGlmICh3cml0 aW5nTW9kZSA9PSBXcml0aW5nTW9kZTo6VG9wVG9Cb3R0b20pCiAgICAgICAgIHJldHVybiB7IHJl bmRlcmVyLm1hcmdpblRvcCgpLCByZW5kZXJlci5tYXJnaW5Cb3R0b20oKSB9OwotICAgIHJldHVy biB7IHJlbmRlcmVyLm1hcmdpblJpZ2h0KCksIHJlbmRlcmVyLm1hcmdpbkxlZnQoKSB9OworICAg IGlmICh3cml0aW5nTW9kZSA9PSBXcml0aW5nTW9kZTo6TGVmdFRvUmlnaHQpCisgICAgICAgIHJl dHVybiB7IHJlbmRlcmVyLm1hcmdpblJpZ2h0KCksIHJlbmRlcmVyLm1hcmdpbkxlZnQoKSB9Owor ICAgIGlmICh3cml0aW5nTW9kZSA9PSBXcml0aW5nTW9kZTo6UmlnaHRUb0xlZnQpCisgICAgICAg IHJldHVybiB7IHJlbmRlcmVyLm1hcmdpbkxlZnQoKSwgcmVuZGVyZXIubWFyZ2luUmlnaHQoKSB9 OworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiAgeyB9OwogfQogCi1zdGF0 aWMgaW5saW5lIExheW91dDo6RWRnZXMgbG9naWNhbEJvcmRlcihjb25zdCBSZW5kZXJCb3hNb2Rl bE9iamVjdCYgcmVuZGVyZXIsIGJvb2wgaXNMZWZ0VG9SaWdodERpcmVjdGlvbiwgYm9vbCBpc0hv cml6b250YWxXcml0aW5nTW9kZSwgYm9vbCByZXRhaW5Cb3JkZXJTdGFydCA9IHRydWUsIGJvb2wg cmV0YWluQm9yZGVyRW5kID0gdHJ1ZSkKK3N0YXRpYyBpbmxpbmUgTGF5b3V0OjpFZGdlcyBsb2dp Y2FsQm9yZGVyKGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0JiByZW5kZXJlciwgYm9vbCBpc0xl ZnRUb1JpZ2h0SW5saW5lRGlyZWN0aW9uLCBXcml0aW5nTW9kZSB3cml0aW5nTW9kZSwgYm9vbCBy ZXRhaW5Cb3JkZXJTdGFydCA9IHRydWUsIGJvb2wgcmV0YWluQm9yZGVyRW5kID0gdHJ1ZSkKIHsK ICAgICBhdXRvIGJvcmRlckxlZnQgPSByZW5kZXJlci5ib3JkZXJMZWZ0KCk7CiAgICAgYXV0byBi b3JkZXJSaWdodCA9IHJlbmRlcmVyLmJvcmRlclJpZ2h0KCk7CiAgICAgYXV0byBib3JkZXJUb3Ag PSByZW5kZXJlci5ib3JkZXJUb3AoKTsKICAgICBhdXRvIGJvcmRlckJvdHRvbSA9IHJlbmRlcmVy LmJvcmRlckJvdHRvbSgpOwogCi0gICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKSB7Ci0g ICAgICAgIGlmIChpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKQorICAgIGlmICh3cml0aW5nTW9kZSA9 PSBXcml0aW5nTW9kZTo6VG9wVG9Cb3R0b20pIHsKKyAgICAgICAgaWYgKGlzTGVmdFRvUmlnaHRJ bmxpbmVEaXJlY3Rpb24pCiAgICAgICAgICAgICByZXR1cm4geyB7IHJldGFpbkJvcmRlclN0YXJ0 ID8gYm9yZGVyTGVmdCA6IDBfbHUsIHJldGFpbkJvcmRlckVuZCA/IGJvcmRlclJpZ2h0IDogMF9s dSB9LCB7IGJvcmRlclRvcCwgYm9yZGVyQm90dG9tIH0gfTsKICAgICAgICAgcmV0dXJuIHsgeyBy ZXRhaW5Cb3JkZXJTdGFydCA/IGJvcmRlclJpZ2h0IDogMF9sdSwgcmV0YWluQm9yZGVyRW5kID8g Ym9yZGVyTGVmdCA6IDBfbHUgfSwgeyBib3JkZXJUb3AsIGJvcmRlckJvdHRvbSB9IH07CiAgICAg fQogCi0gICAgaWYgKGlzTGVmdFRvUmlnaHREaXJlY3Rpb24pCi0gICAgICAgIHJldHVybiB7IHsg cmV0YWluQm9yZGVyU3RhcnQgPyBib3JkZXJUb3AgOiAwX2x1LCByZXRhaW5Cb3JkZXJFbmQgPyBi b3JkZXJCb3R0b20gOiAwX2x1IH0sIHsgYm9yZGVyTGVmdCwgYm9yZGVyUmlnaHQgfSB9OwotICAg IHJldHVybiB7IHsgcmV0YWluQm9yZGVyU3RhcnQgPyBib3JkZXJCb3R0b20gOiAwX2x1LCByZXRh aW5Cb3JkZXJFbmQgPyBib3JkZXJUb3AgOiAwX2x1IH0sIHsgYm9yZGVyTGVmdCwgYm9yZGVyUmln aHQgfSB9OworICAgIGF1dG8gYm9yZGVyTG9naWNhbExlZnQgPSByZXRhaW5Cb3JkZXJTdGFydCA/ IGlzTGVmdFRvUmlnaHRJbmxpbmVEaXJlY3Rpb24gPyBib3JkZXJUb3AgOiBib3JkZXJCb3R0b20g OiAwX2x1OworICAgIGF1dG8gYm9yZGVyTG9naWNhbFJpZ2h0ID0gcmV0YWluQm9yZGVyRW5kID8g aXNMZWZ0VG9SaWdodElubGluZURpcmVjdGlvbiA/IGJvcmRlckJvdHRvbSA6IGJvcmRlclRvcCA6 IDBfbHU7CisgICAgYXV0byBib3JkZXJMb2dpY2FsVG9wID0gd3JpdGluZ01vZGUgPT0gV3JpdGlu Z01vZGU6OkxlZnRUb1JpZ2h0ID8gYm9yZGVyTGVmdCA6IGJvcmRlclJpZ2h0OworICAgIGF1dG8g Ym9yZGVyTG9naWNhbEJvdHRvbSA9IHdyaXRpbmdNb2RlID09IFdyaXRpbmdNb2RlOjpMZWZ0VG9S aWdodCA/IGJvcmRlclJpZ2h0IDogYm9yZGVyTGVmdDsKKyAgICByZXR1cm4geyB7IGJvcmRlckxv Z2ljYWxMZWZ0LCBib3JkZXJMb2dpY2FsUmlnaHQgfSwgeyBib3JkZXJMb2dpY2FsVG9wLCBib3Jk ZXJMb2dpY2FsQm90dG9tIH0gfTsKIH0KIAotc3RhdGljIGlubGluZSBMYXlvdXQ6OkVkZ2VzIGxv Z2ljYWxQYWRkaW5nKGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0JiByZW5kZXJlciwgYm9vbCBp c0xlZnRUb1JpZ2h0RGlyZWN0aW9uLCBib29sIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlLCBib29s IHJldGFpblBhZGRpbmdTdGFydCA9IHRydWUsIGJvb2wgcmV0YWluUGFkZGluZ0VuZCA9IHRydWUp CitzdGF0aWMgaW5saW5lIExheW91dDo6RWRnZXMgbG9naWNhbFBhZGRpbmcoY29uc3QgUmVuZGVy Qm94TW9kZWxPYmplY3QmIHJlbmRlcmVyLCBib29sIGlzTGVmdFRvUmlnaHRJbmxpbmVEaXJlY3Rp b24sIFdyaXRpbmdNb2RlIHdyaXRpbmdNb2RlLCBib29sIHJldGFpblBhZGRpbmdTdGFydCA9IHRy dWUsIGJvb2wgcmV0YWluUGFkZGluZ0VuZCA9IHRydWUpCiB7CiAgICAgYXV0byBwYWRkaW5nTGVm dCA9IHJlbmRlcmVyLnBhZGRpbmdMZWZ0KCk7CiAgICAgYXV0byBwYWRkaW5nUmlnaHQgPSByZW5k ZXJlci5wYWRkaW5nUmlnaHQoKTsKICAgICBhdXRvIHBhZGRpbmdUb3AgPSByZW5kZXJlci5wYWRk aW5nVG9wKCk7CiAgICAgYXV0byBwYWRkaW5nQm90dG9tID0gcmVuZGVyZXIucGFkZGluZ0JvdHRv bSgpOwogCi0gICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKSB7Ci0gICAgICAgIGlmIChp c0xlZnRUb1JpZ2h0RGlyZWN0aW9uKQorICAgIGlmICh3cml0aW5nTW9kZSA9PSBXcml0aW5nTW9k ZTo6VG9wVG9Cb3R0b20pIHsKKyAgICAgICAgaWYgKGlzTGVmdFRvUmlnaHRJbmxpbmVEaXJlY3Rp b24pCiAgICAgICAgICAgICByZXR1cm4geyB7IHJldGFpblBhZGRpbmdTdGFydCA/IHBhZGRpbmdM ZWZ0IDogMF9sdSwgcmV0YWluUGFkZGluZ0VuZCA/IHBhZGRpbmdSaWdodCA6IDBfbHUgfSwgeyBw YWRkaW5nVG9wLCBwYWRkaW5nQm90dG9tIH0gfTsKICAgICAgICAgcmV0dXJuIHsgeyByZXRhaW5Q YWRkaW5nU3RhcnQgPyBwYWRkaW5nUmlnaHQgOiAwX2x1LCByZXRhaW5QYWRkaW5nRW5kID8gcGFk ZGluZ0xlZnQgOiAwX2x1IH0sIHsgcGFkZGluZ1RvcCwgcGFkZGluZ0JvdHRvbSB9IH07CiAgICAg fQogCi0gICAgaWYgKGlzTGVmdFRvUmlnaHREaXJlY3Rpb24pCi0gICAgICAgIHJldHVybiB7IHsg cmV0YWluUGFkZGluZ1N0YXJ0ID8gcGFkZGluZ1RvcCA6IDBfbHUsIHJldGFpblBhZGRpbmdFbmQg PyBwYWRkaW5nQm90dG9tIDogMF9sdSB9LCB7IHBhZGRpbmdMZWZ0LCBwYWRkaW5nUmlnaHQgfSB9 OwotICAgIHJldHVybiB7IHsgcmV0YWluUGFkZGluZ1N0YXJ0ID8gcGFkZGluZ0JvdHRvbSA6IDBf bHUsIHJldGFpblBhZGRpbmdFbmQgPyBwYWRkaW5nVG9wIDogMF9sdSB9LCB7IHBhZGRpbmdMZWZ0 LCBwYWRkaW5nUmlnaHQgfSB9OworICAgIGF1dG8gcGFkZGluZ0xvZ2ljYWxMZWZ0ID0gcmV0YWlu UGFkZGluZ1N0YXJ0ID8gaXNMZWZ0VG9SaWdodElubGluZURpcmVjdGlvbiA/IHBhZGRpbmdUb3Ag OiBwYWRkaW5nQm90dG9tIDogMF9sdTsKKyAgICBhdXRvIHBhZGRpbmdMb2dpY2FsUmlnaHQgPSBy ZXRhaW5QYWRkaW5nRW5kID8gaXNMZWZ0VG9SaWdodElubGluZURpcmVjdGlvbiA/IHBhZGRpbmdC b3R0b20gOiBwYWRkaW5nVG9wIDogMF9sdTsKKyAgICBhdXRvIHBhZGRpbmdMb2dpY2FsVG9wID0g d3JpdGluZ01vZGUgPT0gV3JpdGluZ01vZGU6OkxlZnRUb1JpZ2h0ID8gcGFkZGluZ0xlZnQgOiBw YWRkaW5nUmlnaHQ7CisgICAgYXV0byBwYWRkaW5nTG9naWNhbEJvdHRvbSA9IHdyaXRpbmdNb2Rl ID09IFdyaXRpbmdNb2RlOjpMZWZ0VG9SaWdodCA/IHBhZGRpbmdSaWdodCA6IHBhZGRpbmdMZWZ0 OworICAgIHJldHVybiB7IHsgcGFkZGluZ0xvZ2ljYWxMZWZ0LCBwYWRkaW5nTG9naWNhbFJpZ2h0 IH0sIHsgcGFkZGluZ0xvZ2ljYWxUb3AsIHBhZGRpbmdMb2dpY2FsQm90dG9tIH0gfTsKIH0KIAog dm9pZCBMaW5lTGF5b3V0Ojp1cGRhdGVMYXlvdXRCb3hEaW1lbnNpb25zKGNvbnN0IFJlbmRlckJv eCYgcmVwbGFjZWRPcklubGluZUJsb2NrKQpAQCAtMjM3LDE1ICsyNDYsMTUgQEAgdm9pZCBMaW5l TGF5b3V0Ojp1cGRhdGVMYXlvdXRCb3hEaW1lbnNpb25zKGNvbnN0IFJlbmRlckJveCYgcmVwbGFj ZWRPcklubGluZUJsb2MKICAgICByZXBsYWNlZEJveEdlb21ldHJ5LnNldENvbnRlbnRCb3hXaWR0 aChjb250ZW50TG9naWNhbFdpZHRoRm9yUmVuZGVyZXIocmVwbGFjZWRPcklubGluZUJsb2NrKSk7 CiAgICAgcmVwbGFjZWRCb3hHZW9tZXRyeS5zZXRDb250ZW50Qm94SGVpZ2h0KGNvbnRlbnRMb2dp Y2FsSGVpZ2h0Rm9yUmVuZGVyZXIocmVwbGFjZWRPcklubGluZUJsb2NrKSk7CiAKLSAgICBhdXRv IGlzTGVmdFRvUmlnaHREaXJlY3Rpb24gPSByZXBsYWNlZE9ySW5saW5lQmxvY2sucGFyZW50KCkt PnN0eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpOwotICAgIGF1dG8gaXNIb3Jpem9udGFs V3JpdGluZ01vZGUgPSByZXBsYWNlZE9ySW5saW5lQmxvY2sucGFyZW50KCktPnN0eWxlKCkuaXNI b3Jpem9udGFsV3JpdGluZ01vZGUoKTsKKyAgICBhdXRvIGlzTGVmdFRvUmlnaHRJbmxpbmVEaXJl Y3Rpb24gPSByZXBsYWNlZE9ySW5saW5lQmxvY2sucGFyZW50KCktPnN0eWxlKCkuaXNMZWZ0VG9S aWdodERpcmVjdGlvbigpOworICAgIGF1dG8gd3JpdGluZ01vZGUgPSByZXBsYWNlZE9ySW5saW5l QmxvY2sucGFyZW50KCktPnN0eWxlKCkud3JpdGluZ01vZGUoKTsKIAotICAgIHJlcGxhY2VkQm94 R2VvbWV0cnkuc2V0VmVydGljYWxNYXJnaW4odmVydGljYWxMb2dpY2FsTWFyZ2luKHJlcGxhY2Vk T3JJbmxpbmVCbG9jaywgaXNIb3Jpem9udGFsV3JpdGluZ01vZGUpKTsKLSAgICByZXBsYWNlZEJv eEdlb21ldHJ5LnNldEhvcml6b250YWxNYXJnaW4oaG9yaXpvbnRhbExvZ2ljYWxNYXJnaW4ocmVw bGFjZWRPcklubGluZUJsb2NrLCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uLCBpc0hvcml6b250YWxX cml0aW5nTW9kZSkpOwotICAgIHJlcGxhY2VkQm94R2VvbWV0cnkuc2V0Qm9yZGVyKGxvZ2ljYWxC b3JkZXIocmVwbGFjZWRPcklubGluZUJsb2NrLCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uLCBpc0hv cml6b250YWxXcml0aW5nTW9kZSkpOwotICAgIHJlcGxhY2VkQm94R2VvbWV0cnkuc2V0UGFkZGlu Zyhsb2dpY2FsUGFkZGluZyhyZXBsYWNlZE9ySW5saW5lQmxvY2ssIGlzTGVmdFRvUmlnaHREaXJl Y3Rpb24sIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKSk7CisgICAgcmVwbGFjZWRCb3hHZW9tZXRy eS5zZXRWZXJ0aWNhbE1hcmdpbih2ZXJ0aWNhbExvZ2ljYWxNYXJnaW4ocmVwbGFjZWRPcklubGlu ZUJsb2NrLCB3cml0aW5nTW9kZSkpOworICAgIHJlcGxhY2VkQm94R2VvbWV0cnkuc2V0SG9yaXpv bnRhbE1hcmdpbihob3Jpem9udGFsTG9naWNhbE1hcmdpbihyZXBsYWNlZE9ySW5saW5lQmxvY2ss IGlzTGVmdFRvUmlnaHRJbmxpbmVEaXJlY3Rpb24sIHdyaXRpbmdNb2RlID09IFdyaXRpbmdNb2Rl OjpUb3BUb0JvdHRvbSkpOworICAgIHJlcGxhY2VkQm94R2VvbWV0cnkuc2V0Qm9yZGVyKGxvZ2lj YWxCb3JkZXIocmVwbGFjZWRPcklubGluZUJsb2NrLCBpc0xlZnRUb1JpZ2h0SW5saW5lRGlyZWN0 aW9uLCB3cml0aW5nTW9kZSkpOworICAgIHJlcGxhY2VkQm94R2VvbWV0cnkuc2V0UGFkZGluZyhs b2dpY2FsUGFkZGluZyhyZXBsYWNlZE9ySW5saW5lQmxvY2ssIGlzTGVmdFRvUmlnaHRJbmxpbmVE aXJlY3Rpb24sIHdyaXRpbmdNb2RlKSk7CiAKLSAgICBhdXRvIGJhc2VsaW5lID0gcmVwbGFjZWRP cklubGluZUJsb2NrLmJhc2VsaW5lUG9zaXRpb24oQWxwaGFiZXRpY0Jhc2VsaW5lLCBmYWxzZSAv KiBmaXJzdExpbmUgKi8sIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlID8gSG9yaXpvbnRhbExpbmUg OiBWZXJ0aWNhbExpbmUsIFBvc2l0aW9uT25Db250YWluaW5nTGluZSk7CisgICAgYXV0byBiYXNl bGluZSA9IHJlcGxhY2VkT3JJbmxpbmVCbG9jay5iYXNlbGluZVBvc2l0aW9uKEFscGhhYmV0aWNC YXNlbGluZSwgZmFsc2UgLyogZmlyc3RMaW5lICovLCB3cml0aW5nTW9kZSA9PSBXcml0aW5nTW9k ZTo6VG9wVG9Cb3R0b20gPyBIb3Jpem9udGFsTGluZSA6IFZlcnRpY2FsTGluZSwgUG9zaXRpb25P bkNvbnRhaW5pbmdMaW5lKTsKICAgICByZXBsYWNlZEJveC5zZXRCYXNlbGluZShyb3VuZFRvSW50 KGJhc2VsaW5lKSk7CiB9CiAKQEAgLTI3MCwxMiArMjc5LDEyIEBAIHZvaWQgTGluZUxheW91dDo6 dXBkYXRlSW5saW5lQm94RGltZW5zaW9ucyhjb25zdCBSZW5kZXJJbmxpbmUmIHJlbmRlcklubGlu ZSkKICAgICBhdXRvIHNob3VsZE5vdFJldGFpbkJvcmRlclBhZGRpbmdBbmRNYXJnaW5FbmQgPSAh cmVuZGVySW5saW5lLmlzQ29udGludWF0aW9uKCkgJiYgcmVuZGVySW5saW5lLmlubGluZUNvbnRp bnVhdGlvbigpOwogCiAgICAgYm94R2VvbWV0cnkuc2V0VmVydGljYWxNYXJnaW4oeyB9KTsKLSAg ICBhdXRvIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24gPSByZW5kZXJJbmxpbmUuc3R5bGUoKS5pc0xl ZnRUb1JpZ2h0RGlyZWN0aW9uKCk7Ci0gICAgYXV0byBpc0hvcml6b250YWxXcml0aW5nTW9kZSA9 IHJlbmRlcklubGluZS5zdHlsZSgpLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCk7CisgICAgYXV0 byBpc0xlZnRUb1JpZ2h0SW5saW5lRGlyZWN0aW9uID0gcmVuZGVySW5saW5lLnN0eWxlKCkuaXNM ZWZ0VG9SaWdodERpcmVjdGlvbigpOworICAgIGF1dG8gd3JpdGluZ01vZGUgPSByZW5kZXJJbmxp bmUuc3R5bGUoKS53cml0aW5nTW9kZSgpOwogCi0gICAgYm94R2VvbWV0cnkuc2V0SG9yaXpvbnRh bE1hcmdpbihob3Jpem9udGFsTG9naWNhbE1hcmdpbihyZW5kZXJJbmxpbmUsIGlzTGVmdFRvUmln aHREaXJlY3Rpb24sIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlLCAhc2hvdWxkTm90UmV0YWluQm9y ZGVyUGFkZGluZ0FuZE1hcmdpblN0YXJ0LCAhc2hvdWxkTm90UmV0YWluQm9yZGVyUGFkZGluZ0Fu ZE1hcmdpbkVuZCkpOwotICAgIGJveEdlb21ldHJ5LnNldEJvcmRlcihsb2dpY2FsQm9yZGVyKHJl bmRlcklubGluZSwgaXNMZWZ0VG9SaWdodERpcmVjdGlvbiwgaXNIb3Jpem9udGFsV3JpdGluZ01v ZGUsICFzaG91bGROb3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luU3RhcnQsICFzaG91bGRO b3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luRW5kKSk7Ci0gICAgYm94R2VvbWV0cnkuc2V0 UGFkZGluZyhsb2dpY2FsUGFkZGluZyhyZW5kZXJJbmxpbmUsIGlzTGVmdFRvUmlnaHREaXJlY3Rp b24sIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlLCAhc2hvdWxkTm90UmV0YWluQm9yZGVyUGFkZGlu Z0FuZE1hcmdpblN0YXJ0LCAhc2hvdWxkTm90UmV0YWluQm9yZGVyUGFkZGluZ0FuZE1hcmdpbkVu ZCkpOworICAgIGJveEdlb21ldHJ5LnNldEhvcml6b250YWxNYXJnaW4oaG9yaXpvbnRhbExvZ2lj YWxNYXJnaW4ocmVuZGVySW5saW5lLCBpc0xlZnRUb1JpZ2h0SW5saW5lRGlyZWN0aW9uLCB3cml0 aW5nTW9kZSA9PSBXcml0aW5nTW9kZTo6VG9wVG9Cb3R0b20sICFzaG91bGROb3RSZXRhaW5Cb3Jk ZXJQYWRkaW5nQW5kTWFyZ2luU3RhcnQsICFzaG91bGROb3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5k TWFyZ2luRW5kKSk7CisgICAgYm94R2VvbWV0cnkuc2V0Qm9yZGVyKGxvZ2ljYWxCb3JkZXIocmVu ZGVySW5saW5lLCBpc0xlZnRUb1JpZ2h0SW5saW5lRGlyZWN0aW9uLCB3cml0aW5nTW9kZSwgIXNo b3VsZE5vdFJldGFpbkJvcmRlclBhZGRpbmdBbmRNYXJnaW5TdGFydCwgIXNob3VsZE5vdFJldGFp bkJvcmRlclBhZGRpbmdBbmRNYXJnaW5FbmQpKTsKKyAgICBib3hHZW9tZXRyeS5zZXRQYWRkaW5n KGxvZ2ljYWxQYWRkaW5nKHJlbmRlcklubGluZSwgaXNMZWZ0VG9SaWdodElubGluZURpcmVjdGlv biwgd3JpdGluZ01vZGUsICFzaG91bGROb3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luU3Rh cnQsICFzaG91bGROb3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luRW5kKSk7CiB9CiAKIHZv aWQgTGluZUxheW91dDo6dXBkYXRlU3R5bGUoY29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3QmIHJl bmRlcmVyLCBjb25zdCBSZW5kZXJTdHlsZSYgb2xkU3R5bGUpCkBAIC0zNDUsMTIgKzM1NCwxMiBA QCB2b2lkIExpbmVMYXlvdXQ6OnVwZGF0ZUZvcm1hdHRpbmdSb290R2VvbWV0cnlBbmRJbnZhbGlk YXRlKCkKICAgICBhdXRvJiBmbG93ID0gdGhpcy0+ZmxvdygpOwogCiAgICAgYXV0byB1cGRhdGVH ZW9tZXRyeSA9IFsmXShhdXRvJiByb290KSB7Ci0gICAgICAgIGF1dG8gaXNMZWZ0VG9SaWdodERp cmVjdGlvbiA9IGZsb3cuc3R5bGUoKS5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCk7Ci0gICAgICAg IGF1dG8gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUgPSBmbG93LnN0eWxlKCkuaXNIb3Jpem9udGFs V3JpdGluZ01vZGUoKTsKKyAgICAgICAgYXV0byBpc0xlZnRUb1JpZ2h0SW5saW5lRGlyZWN0aW9u ID0gZmxvdy5zdHlsZSgpLmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKTsKKyAgICAgICAgYXV0byB3 cml0aW5nTW9kZSA9IGZsb3cuc3R5bGUoKS53cml0aW5nTW9kZSgpOwogCi0gICAgICAgIHJvb3Qu c2V0Q29udGVudEJveFdpZHRoKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlID8gZmxvdy5jb250ZW50 V2lkdGgoKSA6IGZsb3cuY29udGVudEhlaWdodCgpKTsKLSAgICAgICAgcm9vdC5zZXRQYWRkaW5n KGxvZ2ljYWxQYWRkaW5nKGZsb3csIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24sIGlzSG9yaXpvbnRh bFdyaXRpbmdNb2RlKSk7Ci0gICAgICAgIHJvb3Quc2V0Qm9yZGVyKGxvZ2ljYWxCb3JkZXIoZmxv dywgaXNMZWZ0VG9SaWdodERpcmVjdGlvbiwgaXNIb3Jpem9udGFsV3JpdGluZ01vZGUpKTsKKyAg ICAgICAgcm9vdC5zZXRDb250ZW50Qm94V2lkdGgod3JpdGluZ01vZGUgPT0gV3JpdGluZ01vZGU6 OlRvcFRvQm90dG9tID8gZmxvdy5jb250ZW50V2lkdGgoKSA6IGZsb3cuY29udGVudEhlaWdodCgp KTsKKyAgICAgICAgcm9vdC5zZXRQYWRkaW5nKGxvZ2ljYWxQYWRkaW5nKGZsb3csIGlzTGVmdFRv UmlnaHRJbmxpbmVEaXJlY3Rpb24sIHdyaXRpbmdNb2RlKSk7CisgICAgICAgIHJvb3Quc2V0Qm9y ZGVyKGxvZ2ljYWxCb3JkZXIoZmxvdywgaXNMZWZ0VG9SaWdodElubGluZURpcmVjdGlvbiwgd3Jp dGluZ01vZGUpKTsKICAgICAgICAgcm9vdC5zZXRIb3Jpem9udGFsTWFyZ2luKHsgfSk7CiAgICAg ICAgIHJvb3Quc2V0VmVydGljYWxNYXJnaW4oeyB9KTsKICAgICB9Owo=