234305 2021-12-14 12:20:36 -0800 [IFC][Integration] Use logical margin/border/padding values in layout 2021-12-14 21:47: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 1824073 0 zalan 2021-12-14 12:20:36 -0800 ssia 1824074 1 447146 zalan 2021-12-14 12:24:21 -0800 Created attachment 447146 Patch 1824230 2 447196 zalan 2021-12-14 20:11:29 -0800 Created attachment 447196 Patch 1824242 3 ews-feeder 2021-12-14 21:46:07 -0800 Committed r287062 (245257@main): <https://commits.webkit.org/245257@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447196. 1824243 4 webkit-bug-importer 2021-12-14 21:47:16 -0800 <rdar://problem/86505557> 447146 2021-12-14 12:24:21 -0800 2021-12-14 20:11:27 -0800 Patch bug-234305-20211214122420.patch text/plain 5280 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWUwODMyZTg2Y2RhNDYy NGRkODgxM2Q0OTY2NThjNTRhZWY5MjM3My4uNjgzODJhZjljNTg3MWFmNTIyYjM3MDEyMGI0MDE0 YjQ5Nzk0ZDIxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTEyLTE0ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0g VXNlIGxvZ2ljYWwgbWFyZ2luL2JvcmRlci9wYWRkaW5nIHZhbHVlcyBpbiBsYXlvdXQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDMwNQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbGF5b3V0L2ludGVn cmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6dXBkYXRlTGF5b3V0Qm94RGltZW5zaW9u cyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6dXBk YXRlSW5saW5lQm94RGltZW5zaW9ucyk6CisKIDIwMjEtMTItMTQgIEFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdIExldCBCb3hHZW9tZXRyeSBoYXZlIGxvZ2lj YWwgdmFsdWVzIG9ubHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3Jh dGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAKaW5kZXggZTdi ZDEzZmEzYTBlMjc0OTk2MGIyZGYxNDY4OWMwOGI4NDcxZmQwMC4uYTI3ZDM3MWFlZGI4YTg1NTU3 OTdlN2Q0M2VkZjJhNTdkYTI3NThmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5j cHAKQEAgLTE2OSwxMSArMTY5LDExIEBAIHZvaWQgTGluZUxheW91dDo6dXBkYXRlTGF5b3V0Qm94 RGltZW5zaW9ucyhjb25zdCBSZW5kZXJCb3gmIHJlcGxhY2VkT3JJbmxpbmVCbG9jCiAgICAgcmVw bGFjZWRCb3hHZW9tZXRyeS5zZXRDb250ZW50Qm94V2lkdGgocmVwbGFjZWRPcklubGluZUJsb2Nr LmNvbnRlbnRXaWR0aCgpKTsKICAgICByZXBsYWNlZEJveEdlb21ldHJ5LnNldENvbnRlbnRCb3hI ZWlnaHQocmVwbGFjZWRPcklubGluZUJsb2NrLmNvbnRlbnRIZWlnaHQoKSk7CiAKLSAgICByZXBs YWNlZEJveEdlb21ldHJ5LnNldEJvcmRlcih7IHsgcmVwbGFjZWRPcklubGluZUJsb2NrLmJvcmRl ckxlZnQoKSwgcmVwbGFjZWRPcklubGluZUJsb2NrLmJvcmRlclJpZ2h0KCkgfSwgeyByZXBsYWNl ZE9ySW5saW5lQmxvY2suYm9yZGVyVG9wKCksIHJlcGxhY2VkT3JJbmxpbmVCbG9jay5ib3JkZXJC b3R0b20oKSB9IH0pOwotICAgIHJlcGxhY2VkQm94R2VvbWV0cnkuc2V0UGFkZGluZyhMYXlvdXQ6 OkVkZ2VzIHsgeyByZXBsYWNlZE9ySW5saW5lQmxvY2sucGFkZGluZ0xlZnQoKSwgcmVwbGFjZWRP cklubGluZUJsb2NrLnBhZGRpbmdSaWdodCgpIH0sIHsgcmVwbGFjZWRPcklubGluZUJsb2NrLnBh ZGRpbmdUb3AoKSwgcmVwbGFjZWRPcklubGluZUJsb2NrLnBhZGRpbmdCb3R0b20oKSB9IH0pOwor ICAgIHJlcGxhY2VkQm94R2VvbWV0cnkuc2V0Qm9yZGVyKHsgeyByZXBsYWNlZE9ySW5saW5lQmxv Y2suYm9yZGVyU3RhcnQoKSwgcmVwbGFjZWRPcklubGluZUJsb2NrLmJvcmRlckVuZCgpIH0sIHsg cmVwbGFjZWRPcklubGluZUJsb2NrLmJvcmRlckJlZm9yZSgpLCByZXBsYWNlZE9ySW5saW5lQmxv Y2suYm9yZGVyQWZ0ZXIoKSB9IH0pOworICAgIHJlcGxhY2VkQm94R2VvbWV0cnkuc2V0UGFkZGlu ZyhMYXlvdXQ6OkVkZ2VzIHsgeyByZXBsYWNlZE9ySW5saW5lQmxvY2sucGFkZGluZ1N0YXJ0KCks IHJlcGxhY2VkT3JJbmxpbmVCbG9jay5wYWRkaW5nRW5kKCkgfSwgeyByZXBsYWNlZE9ySW5saW5l QmxvY2sucGFkZGluZ0JlZm9yZSgpLCByZXBsYWNlZE9ySW5saW5lQmxvY2sucGFkZGluZ0FmdGVy KCkgfSB9KTsKIAotICAgIHJlcGxhY2VkQm94R2VvbWV0cnkuc2V0SG9yaXpvbnRhbE1hcmdpbih7 IHJlcGxhY2VkT3JJbmxpbmVCbG9jay5tYXJnaW5MZWZ0KCksIHJlcGxhY2VkT3JJbmxpbmVCbG9j ay5tYXJnaW5SaWdodCgpIH0pOwotICAgIHJlcGxhY2VkQm94R2VvbWV0cnkuc2V0VmVydGljYWxN YXJnaW4oeyByZXBsYWNlZE9ySW5saW5lQmxvY2subWFyZ2luVG9wKCksIHJlcGxhY2VkT3JJbmxp bmVCbG9jay5tYXJnaW5Cb3R0b20oKSB9KTsKKyAgICByZXBsYWNlZEJveEdlb21ldHJ5LnNldEhv cml6b250YWxNYXJnaW4oeyByZXBsYWNlZE9ySW5saW5lQmxvY2subWFyZ2luU3RhcnQoKSwgcmVw bGFjZWRPcklubGluZUJsb2NrLm1hcmdpbkVuZCgpIH0pOworICAgIHJlcGxhY2VkQm94R2VvbWV0 cnkuc2V0VmVydGljYWxNYXJnaW4oeyByZXBsYWNlZE9ySW5saW5lQmxvY2subWFyZ2luQmVmb3Jl KCksIHJlcGxhY2VkT3JJbmxpbmVCbG9jay5tYXJnaW5BZnRlcigpIH0pOwogCiAgICAgYXV0byBi YXNlbGluZSA9IHJlcGxhY2VkT3JJbmxpbmVCbG9jay5iYXNlbGluZVBvc2l0aW9uKEFscGhhYmV0 aWNCYXNlbGluZSwgZmFsc2UgLyogZmlyc3RMaW5lICovLCBIb3Jpem9udGFsTGluZSwgUG9zaXRp b25PbkNvbnRhaW5pbmdMaW5lKTsKICAgICByZXBsYWNlZEJveC5zZXRCYXNlbGluZShyb3VuZFRv SW50KGJhc2VsaW5lKSk7CkBAIC0xOTksMTIgKzE5OSwxMiBAQCB2b2lkIExpbmVMYXlvdXQ6OnVw ZGF0ZUlubGluZUJveERpbWVuc2lvbnMoY29uc3QgUmVuZGVySW5saW5lJiByZW5kZXJJbmxpbmUp CiAgICAgYXV0byBzaG91bGROb3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luU3RhcnQgPSBy ZW5kZXJJbmxpbmUucGFyZW50KCktPmlzQW5vbnltb3VzQmxvY2soKSAmJiByZW5kZXJJbmxpbmUu aXNDb250aW51YXRpb24oKTsKICAgICBhdXRvIHNob3VsZE5vdFJldGFpbkJvcmRlclBhZGRpbmdB bmRNYXJnaW5FbmQgPSByZW5kZXJJbmxpbmUucGFyZW50KCktPmlzQW5vbnltb3VzQmxvY2soKSAm JiAhcmVuZGVySW5saW5lLmlzQ29udGludWF0aW9uKCkgJiYgcmVuZGVySW5saW5lLmlubGluZUNv bnRpbnVhdGlvbigpOwogICAgIAotICAgIGF1dG8gaG9yaXpvbnRhbE1hcmdpbiA9IExheW91dDo6 Qm94R2VvbWV0cnk6Okhvcml6b250YWxNYXJnaW4geyBzaG91bGROb3RSZXRhaW5Cb3JkZXJQYWRk aW5nQW5kTWFyZ2luU3RhcnQgPyAwX2x1IDogcmVuZGVySW5saW5lLm1hcmdpbkxlZnQoKSwgc2hv dWxkTm90UmV0YWluQm9yZGVyUGFkZGluZ0FuZE1hcmdpbkVuZCA/IDBfbHUgOiByZW5kZXJJbmxp bmUubWFyZ2luUmlnaHQoKSB9OwotICAgIGF1dG8gaG9yaXpvbnRhbEJvcmRlciA9IExheW91dDo6 SG9yaXpvbnRhbEVkZ2VzIHsgc2hvdWxkTm90UmV0YWluQm9yZGVyUGFkZGluZ0FuZE1hcmdpblN0 YXJ0ID8gMF9sdSA6IHJlbmRlcklubGluZS5ib3JkZXJMZWZ0KCksIHNob3VsZE5vdFJldGFpbkJv cmRlclBhZGRpbmdBbmRNYXJnaW5FbmQgPyAwX2x1IDogcmVuZGVySW5saW5lLmJvcmRlclJpZ2h0 KCkgfTsKLSAgICBhdXRvIGhvcml6b250YWxQYWRkaW5nID0gTGF5b3V0OjpIb3Jpem9udGFsRWRn ZXMgeyBzaG91bGROb3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luU3RhcnQgPyAwX2x1IDog cmVuZGVySW5saW5lLnBhZGRpbmdMZWZ0KCksIHNob3VsZE5vdFJldGFpbkJvcmRlclBhZGRpbmdB bmRNYXJnaW5FbmQgPyAwX2x1IDogcmVuZGVySW5saW5lLnBhZGRpbmdSaWdodCgpIH07CisgICAg YXV0byBob3Jpem9udGFsTWFyZ2luID0gTGF5b3V0OjpCb3hHZW9tZXRyeTo6SG9yaXpvbnRhbE1h cmdpbiB7IHNob3VsZE5vdFJldGFpbkJvcmRlclBhZGRpbmdBbmRNYXJnaW5TdGFydCA/IDBfbHUg OiByZW5kZXJJbmxpbmUubWFyZ2luU3RhcnQoKSwgc2hvdWxkTm90UmV0YWluQm9yZGVyUGFkZGlu Z0FuZE1hcmdpbkVuZCA/IDBfbHUgOiByZW5kZXJJbmxpbmUubWFyZ2luRW5kKCkgfTsKKyAgICBh dXRvIGhvcml6b250YWxCb3JkZXIgPSBMYXlvdXQ6Okhvcml6b250YWxFZGdlcyB7IHNob3VsZE5v dFJldGFpbkJvcmRlclBhZGRpbmdBbmRNYXJnaW5TdGFydCA/IDBfbHUgOiByZW5kZXJJbmxpbmUu Ym9yZGVyU3RhcnQoKSwgc2hvdWxkTm90UmV0YWluQm9yZGVyUGFkZGluZ0FuZE1hcmdpbkVuZCA/ IDBfbHUgOiByZW5kZXJJbmxpbmUuYm9yZGVyRW5kKCkgfTsKKyAgICBhdXRvIGhvcml6b250YWxQ YWRkaW5nID0gTGF5b3V0OjpIb3Jpem9udGFsRWRnZXMgeyBzaG91bGROb3RSZXRhaW5Cb3JkZXJQ YWRkaW5nQW5kTWFyZ2luU3RhcnQgPyAwX2x1IDogcmVuZGVySW5saW5lLnBhZGRpbmdTdGFydCgp LCBzaG91bGROb3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luRW5kID8gMF9sdSA6IHJlbmRl cklubGluZS5wYWRkaW5nRW5kKCkgfTsKICAgICAKLSAgICBib3hHZW9tZXRyeS5zZXRQYWRkaW5n KExheW91dDo6RWRnZXMgeyBob3Jpem9udGFsUGFkZGluZywgeyByZW5kZXJJbmxpbmUucGFkZGlu Z1RvcCgpLCByZW5kZXJJbmxpbmUucGFkZGluZ0JvdHRvbSgpIH0gfSk7Ci0gICAgYm94R2VvbWV0 cnkuc2V0Qm9yZGVyKHsgaG9yaXpvbnRhbEJvcmRlciwgeyByZW5kZXJJbmxpbmUuYm9yZGVyVG9w KCksIHJlbmRlcklubGluZS5ib3JkZXJCb3R0b20oKSB9IH0pOworICAgIGJveEdlb21ldHJ5LnNl dFBhZGRpbmcoTGF5b3V0OjpFZGdlcyB7IGhvcml6b250YWxQYWRkaW5nLCB7IHJlbmRlcklubGlu ZS5wYWRkaW5nQmVmb3JlKCksIHJlbmRlcklubGluZS5wYWRkaW5nQWZ0ZXIoKSB9IH0pOworICAg IGJveEdlb21ldHJ5LnNldEJvcmRlcih7IGhvcml6b250YWxCb3JkZXIsIHsgcmVuZGVySW5saW5l LmJvcmRlckJlZm9yZSgpLCByZW5kZXJJbmxpbmUuYm9yZGVyQWZ0ZXIoKSB9IH0pOwogICAgIGJv eEdlb21ldHJ5LnNldEhvcml6b250YWxNYXJnaW4oaG9yaXpvbnRhbE1hcmdpbik7CiAgICAgYm94 R2VvbWV0cnkuc2V0VmVydGljYWxNYXJnaW4oeyB9KTsKIH0K 447196 2021-12-14 20:11:29 -0800 2021-12-14 21:46:09 -0800 Patch bug-234305-20211214201129.patch text/plain 7261 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI3OTRhOGMwYTUzMGVh MGUwNWJkODU0ZTk5ZmNhODQwNmYyMWYzYi4uMmYxYmRkYWUxYmVlZDI4ZGZmY2IzYTFiZTk0YTEx OTEyNGVkNTM3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTEyLTE0ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0g VXNlIGxvZ2ljYWwgbWFyZ2luL2JvcmRlci9wYWRkaW5nIHZhbHVlcyBpbiBsYXlvdXQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDMwNQorCisgICAg ICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIENhbid0IHVzZSBSZW5k ZXJCb3hNb2RlbE9iamVjdDo6Ym9yZGVyU3RhcnQvRW5kIGxvZ2ljYWwgdmFsdWVzIGFzIHRoZXkg cmV0dXJuIHZhbHVlcyBiYXNlZCBvbiB0aGUgX3JlbmRlcmVyXydzCisgICAgICAgIGRpcmVjdGlv biBhbmQgbm90IHRoZSBkaXJlY3Rpb24gdGhlIHJlbmRlcmVyIGlzIGFsaWduZWQgd2l0aGluLgor CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91 dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6 dXBkYXRlTGF5b3V0Qm94RGltZW5zaW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRl Z3JhdGlvbjo6TGluZUxheW91dDo6dXBkYXRlSW5saW5lQm94RGltZW5zaW9ucyk6CisKIDIwMjEt MTItMTQgIEplYW4tWXZlcyBBdmVuYXJkICA8anlhQGFwcGxlLmNvbT4KIAogICAgICAgICBTb3Vy Y2VCdWZmZXJQYXJzZXIgc2hvdWxkIGJlIHVzaW5nIGNvbnRpZ3VvdXMgU2hhcmVkQnVmZmVyCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25MaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9M YXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCmluZGV4IGU3YmQxM2ZhM2EwZTI3NDk5NjBi MmRmMTQ2ODljMDhiODQ3MWZkMDAuLjY5ZDdhZWY1OGMyODA2MWI5MWUyYWM0MWQ4NmUyMDJiMDZm YWFhMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlv dXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCkBAIC0xNDgsNiArMTQ4 LDM5IEBAIHZvaWQgTGluZUxheW91dDo6dXBkYXRlSW5saW5lQmxvY2tEaW1lbnNpb25zKGNvbnN0 IFJlbmRlckJsb2NrJiBpbmxpbmVCbG9jaykKICAgICB1cGRhdGVMYXlvdXRCb3hEaW1lbnNpb25z KGlubGluZUJsb2NrKTsKIH0KIAorc3RhdGljIGlubGluZSBMYXlvdXQ6OkJveEdlb21ldHJ5OjpI b3Jpem9udGFsTWFyZ2luIGxvZ2ljYWxNYXJnaW4oY29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3Qm IHJlbmRlcmVyLCBib29sIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24sIGJvb2wgcmV0YWluTWFyZ2lu U3RhcnQgPSB0cnVlLCBib29sIHJldGFpbk1hcmdpbkVuZCA9IHRydWUpCit7CisgICAgYXV0byBt YXJnaW5TdGFydCA9IExheW91dFVuaXQgeyAwX2x1IH07CisgICAgYXV0byBtYXJnaW5FbmQgPSBM YXlvdXRVbml0IHsgMF9sdSB9OworICAgIGlmIChyZXRhaW5NYXJnaW5TdGFydCkKKyAgICAgICAg bWFyZ2luU3RhcnQgPSBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uID8gcmVuZGVyZXIubWFyZ2luTGVm dCgpIDogcmVuZGVyZXIubWFyZ2luUmlnaHQoKTsKKyAgICBpZiAocmV0YWluTWFyZ2luRW5kKQor ICAgICAgICBtYXJnaW5FbmQgPSBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uID8gcmVuZGVyZXIubWFy Z2luUmlnaHQoKSA6IHJlbmRlcmVyLm1hcmdpbkxlZnQoKTsKKyAgICByZXR1cm4geyBtYXJnaW5T dGFydCwgbWFyZ2luRW5kIH07Cit9CisKK3N0YXRpYyBpbmxpbmUgTGF5b3V0OjpFZGdlcyBsb2dp Y2FsQm9yZGVyKGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0JiByZW5kZXJlciwgYm9vbCBpc0xl ZnRUb1JpZ2h0RGlyZWN0aW9uLCBib29sIHJldGFpbkJvcmRlclN0YXJ0ID0gdHJ1ZSwgYm9vbCBy ZXRhaW5Cb3JkZXJFbmQgPSB0cnVlKQoreworICAgIGF1dG8gYm9yZGVyU3RhcnQgPSBMYXlvdXRV bml0IHsgMF9sdSB9OworICAgIGF1dG8gYm9yZGVyRW5kID0gTGF5b3V0VW5pdCB7IDBfbHUgfTsK KyAgICBpZiAocmV0YWluQm9yZGVyU3RhcnQpCisgICAgICAgIGJvcmRlclN0YXJ0ID0gaXNMZWZ0 VG9SaWdodERpcmVjdGlvbiA/IHJlbmRlcmVyLmJvcmRlckxlZnQoKSA6IHJlbmRlcmVyLmJvcmRl clJpZ2h0KCk7CisgICAgaWYgKHJldGFpbkJvcmRlckVuZCkKKyAgICAgICAgYm9yZGVyRW5kID0g aXNMZWZ0VG9SaWdodERpcmVjdGlvbiA/IHJlbmRlcmVyLmJvcmRlclJpZ2h0KCkgOiByZW5kZXJl ci5ib3JkZXJMZWZ0KCk7CisgICAgcmV0dXJuIHsgeyBib3JkZXJTdGFydCwgYm9yZGVyRW5kIH0s IHsgcmVuZGVyZXIuYm9yZGVyVG9wKCksIHJlbmRlcmVyLmJvcmRlckJvdHRvbSgpIH0gfTsKK30K Kworc3RhdGljIGlubGluZSBMYXlvdXQ6OkVkZ2VzIGxvZ2ljYWxQYWRkaW5nKGNvbnN0IFJlbmRl ckJveE1vZGVsT2JqZWN0JiByZW5kZXJlciwgYm9vbCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uLCBi b29sIHJldGFpblBhZGRpbmdTdGFydCA9IHRydWUsIGJvb2wgcmV0YWluUGFkZGluZ0VuZCA9IHRy dWUpCit7CisgICAgYXV0byBwYWRkaW5nU3RhcnQgPSBMYXlvdXRVbml0IHsgMF9sdSB9OworICAg IGF1dG8gcGFkZGluZ0VuZCA9IExheW91dFVuaXQgeyAwX2x1IH07CisgICAgaWYgKHJldGFpblBh ZGRpbmdTdGFydCkKKyAgICAgICAgcGFkZGluZ1N0YXJ0ID0gaXNMZWZ0VG9SaWdodERpcmVjdGlv biA/IHJlbmRlcmVyLnBhZGRpbmdMZWZ0KCkgOiByZW5kZXJlci5wYWRkaW5nUmlnaHQoKTsKKyAg ICBpZiAocmV0YWluUGFkZGluZ0VuZCkKKyAgICAgICAgcGFkZGluZ0VuZCA9IGlzTGVmdFRvUmln aHREaXJlY3Rpb24gPyByZW5kZXJlci5wYWRkaW5nUmlnaHQoKSA6IHJlbmRlcmVyLnBhZGRpbmdM ZWZ0KCk7CisgICAgcmV0dXJuIExheW91dDo6RWRnZXMgeyB7IHBhZGRpbmdTdGFydCwgcGFkZGlu Z0VuZCB9LCB7IHJlbmRlcmVyLnBhZGRpbmdUb3AoKSwgcmVuZGVyZXIucGFkZGluZ0JvdHRvbSgp IH0gfTsKK30KKwogdm9pZCBMaW5lTGF5b3V0Ojp1cGRhdGVMYXlvdXRCb3hEaW1lbnNpb25zKGNv bnN0IFJlbmRlckJveCYgcmVwbGFjZWRPcklubGluZUJsb2NrKQogewogICAgIGF1dG8mIGxheW91 dEJveCA9IG1fYm94VHJlZS5sYXlvdXRCb3hGb3JSZW5kZXJlcihyZXBsYWNlZE9ySW5saW5lQmxv Y2spOwpAQCAtMTY5LDExICsyMDIsMTEgQEAgdm9pZCBMaW5lTGF5b3V0Ojp1cGRhdGVMYXlvdXRC b3hEaW1lbnNpb25zKGNvbnN0IFJlbmRlckJveCYgcmVwbGFjZWRPcklubGluZUJsb2MKICAgICBy ZXBsYWNlZEJveEdlb21ldHJ5LnNldENvbnRlbnRCb3hXaWR0aChyZXBsYWNlZE9ySW5saW5lQmxv Y2suY29udGVudFdpZHRoKCkpOwogICAgIHJlcGxhY2VkQm94R2VvbWV0cnkuc2V0Q29udGVudEJv eEhlaWdodChyZXBsYWNlZE9ySW5saW5lQmxvY2suY29udGVudEhlaWdodCgpKTsKIAotICAgIHJl cGxhY2VkQm94R2VvbWV0cnkuc2V0Qm9yZGVyKHsgeyByZXBsYWNlZE9ySW5saW5lQmxvY2suYm9y ZGVyTGVmdCgpLCByZXBsYWNlZE9ySW5saW5lQmxvY2suYm9yZGVyUmlnaHQoKSB9LCB7IHJlcGxh Y2VkT3JJbmxpbmVCbG9jay5ib3JkZXJUb3AoKSwgcmVwbGFjZWRPcklubGluZUJsb2NrLmJvcmRl ckJvdHRvbSgpIH0gfSk7Ci0gICAgcmVwbGFjZWRCb3hHZW9tZXRyeS5zZXRQYWRkaW5nKExheW91 dDo6RWRnZXMgeyB7IHJlcGxhY2VkT3JJbmxpbmVCbG9jay5wYWRkaW5nTGVmdCgpLCByZXBsYWNl ZE9ySW5saW5lQmxvY2sucGFkZGluZ1JpZ2h0KCkgfSwgeyByZXBsYWNlZE9ySW5saW5lQmxvY2su cGFkZGluZ1RvcCgpLCByZXBsYWNlZE9ySW5saW5lQmxvY2sucGFkZGluZ0JvdHRvbSgpIH0gfSk7 Ci0KLSAgICByZXBsYWNlZEJveEdlb21ldHJ5LnNldEhvcml6b250YWxNYXJnaW4oeyByZXBsYWNl ZE9ySW5saW5lQmxvY2subWFyZ2luTGVmdCgpLCByZXBsYWNlZE9ySW5saW5lQmxvY2subWFyZ2lu UmlnaHQoKSB9KTsKICAgICByZXBsYWNlZEJveEdlb21ldHJ5LnNldFZlcnRpY2FsTWFyZ2luKHsg cmVwbGFjZWRPcklubGluZUJsb2NrLm1hcmdpblRvcCgpLCByZXBsYWNlZE9ySW5saW5lQmxvY2su bWFyZ2luQm90dG9tKCkgfSk7CisgICAgYXV0byBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uID0gZmxv dygpLnN0eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpOworICAgIHJlcGxhY2VkQm94R2Vv bWV0cnkuc2V0SG9yaXpvbnRhbE1hcmdpbihsb2dpY2FsTWFyZ2luKHJlcGxhY2VkT3JJbmxpbmVC bG9jaywgaXNMZWZ0VG9SaWdodERpcmVjdGlvbikpOworICAgIHJlcGxhY2VkQm94R2VvbWV0cnku c2V0Qm9yZGVyKGxvZ2ljYWxCb3JkZXIocmVwbGFjZWRPcklubGluZUJsb2NrLCBpc0xlZnRUb1Jp Z2h0RGlyZWN0aW9uKSk7CisgICAgcmVwbGFjZWRCb3hHZW9tZXRyeS5zZXRQYWRkaW5nKGxvZ2lj YWxQYWRkaW5nKHJlcGxhY2VkT3JJbmxpbmVCbG9jaywgaXNMZWZ0VG9SaWdodERpcmVjdGlvbikp OwogCiAgICAgYXV0byBiYXNlbGluZSA9IHJlcGxhY2VkT3JJbmxpbmVCbG9jay5iYXNlbGluZVBv c2l0aW9uKEFscGhhYmV0aWNCYXNlbGluZSwgZmFsc2UgLyogZmlyc3RMaW5lICovLCBIb3Jpem9u dGFsTGluZSwgUG9zaXRpb25PbkNvbnRhaW5pbmdMaW5lKTsKICAgICByZXBsYWNlZEJveC5zZXRC YXNlbGluZShyb3VuZFRvSW50KGJhc2VsaW5lKSk7CkBAIC0xOTgsMTUgKzIzMSwxMiBAQCB2b2lk IExpbmVMYXlvdXQ6OnVwZGF0ZUlubGluZUJveERpbWVuc2lvbnMoY29uc3QgUmVuZGVySW5saW5l JiByZW5kZXJJbmxpbmUpCiAgICAgLy8gQ2hlY2sgaWYgdGhpcyByZW5kZXJlciBpcyBwYXJ0IG9m IGEgY29udGludWF0aW9uIGFuZCBhZGp1c3QgaG9yaXpvbnRhbCBtYXJnaW4vYm9yZGVyL3BhZGRp bmcgYWNjb3JkaW5nbHkuCiAgICAgYXV0byBzaG91bGROb3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5k TWFyZ2luU3RhcnQgPSByZW5kZXJJbmxpbmUucGFyZW50KCktPmlzQW5vbnltb3VzQmxvY2soKSAm JiByZW5kZXJJbmxpbmUuaXNDb250aW51YXRpb24oKTsKICAgICBhdXRvIHNob3VsZE5vdFJldGFp bkJvcmRlclBhZGRpbmdBbmRNYXJnaW5FbmQgPSByZW5kZXJJbmxpbmUucGFyZW50KCktPmlzQW5v bnltb3VzQmxvY2soKSAmJiAhcmVuZGVySW5saW5lLmlzQ29udGludWF0aW9uKCkgJiYgcmVuZGVy SW5saW5lLmlubGluZUNvbnRpbnVhdGlvbigpOwotICAgIAotICAgIGF1dG8gaG9yaXpvbnRhbE1h cmdpbiA9IExheW91dDo6Qm94R2VvbWV0cnk6Okhvcml6b250YWxNYXJnaW4geyBzaG91bGROb3RS ZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luU3RhcnQgPyAwX2x1IDogcmVuZGVySW5saW5lLm1h cmdpbkxlZnQoKSwgc2hvdWxkTm90UmV0YWluQm9yZGVyUGFkZGluZ0FuZE1hcmdpbkVuZCA/IDBf bHUgOiByZW5kZXJJbmxpbmUubWFyZ2luUmlnaHQoKSB9OwotICAgIGF1dG8gaG9yaXpvbnRhbEJv cmRlciA9IExheW91dDo6SG9yaXpvbnRhbEVkZ2VzIHsgc2hvdWxkTm90UmV0YWluQm9yZGVyUGFk ZGluZ0FuZE1hcmdpblN0YXJ0ID8gMF9sdSA6IHJlbmRlcklubGluZS5ib3JkZXJMZWZ0KCksIHNo b3VsZE5vdFJldGFpbkJvcmRlclBhZGRpbmdBbmRNYXJnaW5FbmQgPyAwX2x1IDogcmVuZGVySW5s aW5lLmJvcmRlclJpZ2h0KCkgfTsKLSAgICBhdXRvIGhvcml6b250YWxQYWRkaW5nID0gTGF5b3V0 OjpIb3Jpem9udGFsRWRnZXMgeyBzaG91bGROb3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2lu U3RhcnQgPyAwX2x1IDogcmVuZGVySW5saW5lLnBhZGRpbmdMZWZ0KCksIHNob3VsZE5vdFJldGFp bkJvcmRlclBhZGRpbmdBbmRNYXJnaW5FbmQgPyAwX2x1IDogcmVuZGVySW5saW5lLnBhZGRpbmdS aWdodCgpIH07Ci0gICAgCi0gICAgYm94R2VvbWV0cnkuc2V0UGFkZGluZyhMYXlvdXQ6OkVkZ2Vz IHsgaG9yaXpvbnRhbFBhZGRpbmcsIHsgcmVuZGVySW5saW5lLnBhZGRpbmdUb3AoKSwgcmVuZGVy SW5saW5lLnBhZGRpbmdCb3R0b20oKSB9IH0pOwotICAgIGJveEdlb21ldHJ5LnNldEJvcmRlcih7 IGhvcml6b250YWxCb3JkZXIsIHsgcmVuZGVySW5saW5lLmJvcmRlclRvcCgpLCByZW5kZXJJbmxp bmUuYm9yZGVyQm90dG9tKCkgfSB9KTsKLSAgICBib3hHZW9tZXRyeS5zZXRIb3Jpem9udGFsTWFy Z2luKGhvcml6b250YWxNYXJnaW4pOworCiAgICAgYm94R2VvbWV0cnkuc2V0VmVydGljYWxNYXJn aW4oeyB9KTsKKyAgICBhdXRvIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24gPSBmbG93KCkuc3R5bGUo KS5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCk7CisgICAgYm94R2VvbWV0cnkuc2V0SG9yaXpvbnRh bE1hcmdpbihsb2dpY2FsTWFyZ2luKHJlbmRlcklubGluZSwgaXNMZWZ0VG9SaWdodERpcmVjdGlv biwgIXNob3VsZE5vdFJldGFpbkJvcmRlclBhZGRpbmdBbmRNYXJnaW5TdGFydCwgIXNob3VsZE5v dFJldGFpbkJvcmRlclBhZGRpbmdBbmRNYXJnaW5FbmQpKTsKKyAgICBib3hHZW9tZXRyeS5zZXRC b3JkZXIobG9naWNhbEJvcmRlcihyZW5kZXJJbmxpbmUsIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24s ICFzaG91bGROb3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luU3RhcnQsICFzaG91bGROb3RS ZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luRW5kKSk7CisgICAgYm94R2VvbWV0cnkuc2V0UGFk ZGluZyhsb2dpY2FsUGFkZGluZyhyZW5kZXJJbmxpbmUsIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24s ICFzaG91bGROb3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luU3RhcnQsICFzaG91bGROb3RS ZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luRW5kKSk7CiB9CiAKIHZvaWQgTGluZUxheW91dDo6 dXBkYXRlU3R5bGUoY29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3QmIHJlbmRlcmVyLCBjb25zdCBS ZW5kZXJTdHlsZSYgb2xkU3R5bGUpCg==