220984 2021-01-26 08:52:02 -0800 Refactor computePreferredLogicalWidths 2021-01-26 21:23:17 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rbuis rbuis cdumez changseok darin esprehn+autocc ews-watchlist glenn kondapallykalyan mifenton mmaxfield pdr webkit-bug-importer oldest_to_newest 1722528 0 rbuis 2021-01-26 08:52:02 -0800 Refactor computePreferredLogicalWidths. 1722659 1 418462 rbuis 2021-01-26 12:32:12 -0800 Created attachment 418462 Patch 1722715 2 418462 rbuis 2021-01-26 13:58:19 -0800 Comment on attachment 418462 Patch I noticed https://bugs.webkit.org/show_bug.cgi?id=220873 did not cover all duplications, but by refactoring we can just concentrate that into one spot. 1722827 3 ews-feeder 2021-01-26 21:22:53 -0800 Committed r271934: <https://trac.webkit.org/changeset/271934> All reviewed patches have been landed. Closing bug and clearing flags on attachment 418462. 1722828 4 webkit-bug-importer 2021-01-26 21:23:17 -0800 <rdar://problem/73647113> 418462 2021-01-26 12:32:12 -0800 2021-01-26 21:22:55 -0800 Patch bug-220984-20210126213210.patch text/plain 16296 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxODkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2YxMzZjYWM0ODhmNDRl OGEwYTVjYjg3NzNhZDI2YjlmODIxNjkzYi4uZTRlNzE2OThjZDA4YTg0ZjUwYjg2NWFlNDIwZGE0 ZDQwNjY5NmZlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTAxLTI2ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVmYWN0b3IgY29tcHV0ZVByZWZl cnJlZExvZ2ljYWxXaWR0aHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyMDk4NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFJlZmFjdG9yIGNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzIHNvIHRoZSBj b21tb24KKyAgICAgICAgY29kZSBkZWFsaW5nIHdpdGggbWluL21heCBhbmQgYm9yZGVyL3BhZGRp bmcgaGFuZGxpbmcKKyAgICAgICAgaXMgY2VudHJhbGl6ZWQgaW4gUmVuZGVyQm94LgorCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJsb2NrOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVQ cmVmZXJyZWRMb2dpY2FsV2lkdGhzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OmNvbXB1dGVQcmVm ZXJyZWRMb2dpY2FsV2lkdGhzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmlsZVVwbG9h ZENvbnRyb2wuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmlsZVVwbG9hZENvbnRyb2w6 OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyRnJhZ21lbnRDb250YWluZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRnJhZ21l bnRDb250YWluZXI6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMaXN0 Qm94Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlck1lbnVMaXN0LmNwcDoKKyAgICAgICAgKFJlbmRlck1lbnVMaXN0Ojpjb21wdXRlUHJl ZmVycmVkTG9naWNhbFdpZHRocyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclNsaWRlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTbGlkZXI6OmNvbXB1dGVQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dENvbnRyb2w6OmNvbXB1dGVQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzKToKKwogMjAyMS0wMS0yNiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t PgogCiAgICAgICAgIFtMRkNdW0lGQ10gSW5jb3JyZWN0IGlubGluZSBib3ggd2lkdGggd2l0aCBo b3Jpem9udGFsIGFsaWdubWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5j cHAKaW5kZXggZDMzOGE3M2JlNGY0NDAwZThiMmQ5MjNkYjhkNjEyMWVlYjMyYTNiMy4uYjczNTMz MmQ0NzI5ZDU4NzllNmM1OWYzMjdmMDAzMzdhMjc1YzA5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwCkBAIC0yMjg1LDIxICsyMjg1LDcgQEAgdm9pZCBSZW5kZXJC bG9jazo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQogICAgIGVsc2UKICAgICAgICAg Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgs IG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKTsKIAotICAgIGlmIChzdHlsZVRvVXNlLmxvZ2lj YWxNYXhXaWR0aCgpLmlzRml4ZWQoKSkgewotICAgICAgICBhdXRvIGFkanVzdENvbnRlbnRCb3hM b2dpY2FsV2lkdGggPSBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHN0 eWxlVG9Vc2UubG9naWNhbE1heFdpZHRoKCkpOwotICAgICAgICBtX21heFByZWZlcnJlZExvZ2lj YWxXaWR0aCA9IHN0ZDo6bWluKG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoLCBhZGp1c3RDb250 ZW50Qm94TG9naWNhbFdpZHRoKTsKLSAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgg PSBzdGQ6Om1pbihtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRqdXN0Q29udGVudEJveExv Z2ljYWxXaWR0aCk7Ci0gICAgfQotICAgIAotICAgIGlmIChzdHlsZVRvVXNlLmxvZ2ljYWxNaW5X aWR0aCgpLmlzRml4ZWQoKSAmJiBzdHlsZVRvVXNlLmxvZ2ljYWxNaW5XaWR0aCgpLnZhbHVlKCkg PiAwKSB7Ci0gICAgICAgIGF1dG8gYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aCA9IGFkanVz dENvbnRlbnRCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcoc3R5bGVUb1VzZS5sb2dpY2FsTWlu V2lkdGgoKSk7Ci0gICAgICAgIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0gc3RkOjptYXgo bV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgsIGFkanVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGgp OwotICAgICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IHN0ZDo6bWF4KG1fbWluUHJl ZmVycmVkTG9naWNhbFdpZHRoLCBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoKTsKLSAgICB9 Ci0gICAgCi0gICAgTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nID0gYm9yZGVyQW5kUGFkZGlu Z0xvZ2ljYWxXaWR0aCgpOwotICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoICs9IGJvcmRl ckFuZFBhZGRpbmc7Ci0gICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggKz0gYm9yZGVyQW5k UGFkZGluZzsKKyAgICBSZW5kZXJCb3g6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKHN0 eWxlVG9Vc2UubG9naWNhbE1pbldpZHRoKCksIHN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRoKCks IGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgoKSk7CiAKICAgICBzZXRQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzRGlydHkoZmFsc2UpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94 LmNwcAppbmRleCAyYWYzOTIxMDU1MzFhMTRmZDRlZDhiYTVmMTkwZmQzNjVkMTI4MTEwLi45OGQy YzBhMjk5NWVlYjQzNWNkMTcyNjVmMWU3M2ZmMDRlZGY1MTEyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtMzIxOSw2ICszMjE5LDI0IEBAIHN0YXRpYyBib29sIGFs bG93TWluTWF4UGVyY2VudGFnZXNJbkF1dG9IZWlnaHRCbG9ja3NRdWlyaygpCiAgICAgcmV0dXJu IGZhbHNlOwogfQogCit2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0 aHMoY29uc3QgTGVuZ3RoJiBtaW5XaWR0aCwgY29uc3QgTGVuZ3RoJiBtYXhXaWR0aCwgTGF5b3V0 VW5pdCBib3JkZXJBbmRQYWRkaW5nKQoreworICAgIGlmIChtYXhXaWR0aC5pc0ZpeGVkKCkpIHsK KyAgICAgICAgYXV0byBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoID0gYWRqdXN0Q29udGVu dEJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyhtYXhXaWR0aCk7CisgICAgICAgIG1fbWF4UHJl ZmVycmVkTG9naWNhbFdpZHRoID0gc3RkOjptaW4obV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgs IGFkanVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGgpOworICAgICAgICBtX21pblByZWZlcnJlZExv Z2ljYWxXaWR0aCA9IHN0ZDo6bWluKG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBhZGp1c3RD b250ZW50Qm94TG9naWNhbFdpZHRoKTsKKyAgICB9CisKKyAgICBpZiAobWluV2lkdGguaXNGaXhl ZCgpICYmIG1pbldpZHRoLnZhbHVlKCkgPiAwKSB7CisgICAgICAgIGF1dG8gYWRqdXN0Q29udGVu dEJveExvZ2ljYWxXaWR0aCA9IGFkanVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXpp bmcobWluV2lkdGgpOworICAgICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IHN0ZDo6 bWF4KG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoLCBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdp ZHRoKTsKKyAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBzdGQ6Om1heChtX21p blByZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aCk7Cisg ICAgfQorCisgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggKz0gYm9yZGVyQW5kUGFkZGlu ZzsKKyAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCArPSBib3JkZXJBbmRQYWRkaW5nOwor fQorCiBib29sIFJlbmRlckJveDo6cmVwbGFjZWRNaW5NYXhMb2dpY2FsSGVpZ2h0Q29tcHV0ZXNB c05vbmUoU2l6ZVR5cGUgc2l6ZVR5cGUpIGNvbnN0CiB7CiAgICAgQVNTRVJUKHNpemVUeXBlID09 IE1pblNpemUgfHwgc2l6ZVR5cGUgPT0gTWF4U2l6ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmgKaW5kZXggNzY0YzFmYjU1YmFkZDhkYjZlMjMxMGEzNjliYTFkMWYzZTYyNWZkNS4u NDAzYjY4ZDFjNTJiNmY2ZWE0MWMwY2M5MDc3N2FmNjhhMzkwZWFiNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3guaApAQCAtNzEzLDYgKzcxMyw4IEBAIHByb3RlY3RlZDoKICAgICAg ICAgcmV0dXJuICgoaW5saW5lU2l6ZSAtIGJvcmRlclBhZGRpbmdJbmxpbmVTdW0pIC8gYXNwZWN0 UmF0aW8pICsgYm9yZGVyUGFkZGluZ0Jsb2NrU3VtOwogICAgIH0KIAorICAgIHZvaWQgY29tcHV0 ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoY29uc3QgTGVuZ3RoJiBtaW5XaWR0aCwgY29uc3QgTGVu Z3RoJiBtYXhXaWR0aCwgTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nKTsKKwogcHJpdmF0ZToK ICAgICBib29sIHJlcGxhY2VkTWluTWF4TG9naWNhbEhlaWdodENvbXB1dGVzQXNOb25lKFNpemVU eXBlKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcAppbmRleCAyODRhMGI2Njg2ZWQ2ZmM5ZjU2ZmE0 ODNhODRhYTQzMzcwYjBjMjViLi5lYjMxNDI3NDNkOTRiNzZkOWVhMGE5NmVkNGUxYzc3ZTdmZjQ1 NmU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRl ZEZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVw cmVjYXRlZEZsZXhpYmxlQm94LmNwcApAQCAtMjI3LDE5ICsyMjcsNyBAQCB2b2lkIFJlbmRlckRl cHJlY2F0ZWRGbGV4aWJsZUJveDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQogICAg IGVsc2UKICAgICAgICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobV9taW5QcmVmZXJy ZWRMb2dpY2FsV2lkdGgsIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKTsKIAotICAgIGlmIChz dHlsZSgpLm1pbldpZHRoKCkuaXNGaXhlZCgpICYmIHN0eWxlKCkubWluV2lkdGgoKS52YWx1ZSgp ID4gMCkgewotICAgICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IHN0ZDo6bWF4KG1f bWF4UHJlZmVycmVkTG9naWNhbFdpZHRoLCBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9y Qm94U2l6aW5nKHN0eWxlKCkubWluV2lkdGgoKSkpOwotICAgICAgICBtX21pblByZWZlcnJlZExv Z2ljYWxXaWR0aCA9IHN0ZDo6bWF4KG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBhZGp1c3RD b250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHN0eWxlKCkubWluV2lkdGgoKSkpOwot ICAgIH0KLQotICAgIGlmIChzdHlsZSgpLm1heFdpZHRoKCkuaXNGaXhlZCgpKSB7Ci0gICAgICAg IG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0gc3RkOjptaW4obV9tYXhQcmVmZXJyZWRMb2dp Y2FsV2lkdGgsIGFkanVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcoc3R5bGUo KS5tYXhXaWR0aCgpKSk7Ci0gICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gc3Rk OjptaW4obV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgsIGFkanVzdENvbnRlbnRCb3hMb2dpY2Fs V2lkdGhGb3JCb3hTaXppbmcoc3R5bGUoKS5tYXhXaWR0aCgpKSk7Ci0gICAgfQotCi0gICAgTGF5 b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nID0gYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCgp OwotICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoICs9IGJvcmRlckFuZFBhZGRpbmc7Ci0g ICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggKz0gYm9yZGVyQW5kUGFkZGluZzsKKyAgICBS ZW5kZXJCb3g6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKHN0eWxlKCkubWluV2lkdGgo KSwgc3R5bGUoKS5tYXhXaWR0aCgpLCBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCkpOwog CiAgICAgc2V0UHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5KGZhbHNlKTsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGaWxlVXBsb2FkQ29udHJvbC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmlsZVVwbG9hZENvbnRyb2wuY3BwCmlu ZGV4IDlkZjczZWY3NmNiNGFiNWZkMTk1MmQ3NzFiMzJmMTZmODczNTFlZTcuLjNkMTIzYzU0YjU2 NGRhNTA0MTdiNGMwNzg5NzI5ZjM5ZTMzYjE1ZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJGaWxlVXBsb2FkQ29udHJvbC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckZpbGVVcGxvYWRDb250cm9sLmNwcApAQCAtMjI4LDE5ICsyMjgs NyBAQCB2b2lkIFJlbmRlckZpbGVVcGxvYWRDb250cm9sOjpjb21wdXRlUHJlZmVycmVkTG9naWNh bFdpZHRocygpCiAgICAgZWxzZQogICAgICAgICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRo cyhtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCwgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgp OwogCi0gICAgaWYgKHN0eWxlKCkubWluV2lkdGgoKS5pc0ZpeGVkKCkgJiYgc3R5bGUoKS5taW5X aWR0aCgpLnZhbHVlKCkgPiAwKSB7Ci0gICAgICAgIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRo ID0gc3RkOjptYXgobV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgsIGFkanVzdENvbnRlbnRCb3hM b2dpY2FsV2lkdGhGb3JCb3hTaXppbmcoc3R5bGUoKS5taW5XaWR0aCgpKSk7Ci0gICAgICAgIG1f bWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gc3RkOjptYXgobV9taW5QcmVmZXJyZWRMb2dpY2Fs V2lkdGgsIGFkanVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcoc3R5bGUoKS5t aW5XaWR0aCgpKSk7Ci0gICAgfQotCi0gICAgaWYgKHN0eWxlKCkubWF4V2lkdGgoKS5pc0ZpeGVk KCkpIHsKLSAgICAgICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBzdGQ6Om1pbihtX21h eFByZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aEZvckJv eFNpemluZyhzdHlsZSgpLm1heFdpZHRoKCkpKTsKLSAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dp Y2FsV2lkdGggPSBzdGQ6Om1pbihtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRqdXN0Q29u dGVudEJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyhzdHlsZSgpLm1heFdpZHRoKCkpKTsKLSAg ICB9Ci0KLSAgICBpbnQgdG9BZGQgPSBob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgp OwotICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoICs9IHRvQWRkOwotICAgIG1fbWF4UHJl ZmVycmVkTG9naWNhbFdpZHRoICs9IHRvQWRkOworICAgIFJlbmRlckJveDo6Y29tcHV0ZVByZWZl cnJlZExvZ2ljYWxXaWR0aHMoc3R5bGUoKS5taW5XaWR0aCgpLCBzdHlsZSgpLm1heFdpZHRoKCks IGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkpOwogCiAgICAgc2V0UHJlZmVycmVk TG9naWNhbFdpZHRoc0RpcnR5KGZhbHNlKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJGcmFnbWVudENvbnRhaW5lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyRnJhZ21lbnRDb250YWluZXIuY3BwCmluZGV4IDgwNjI1Zjk0ZWM3N2Ux NWRhYzdhMGU2YzJmMTE0YzY4NDhjNjE3OTIuLjgzZjJmMWY2MzBiOGNlYTY3NDljMjNkMTkwMWUz MzM2YjhlMWM3ZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG cmFnbWVudENvbnRhaW5lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckZyYWdtZW50Q29udGFpbmVyLmNwcApAQCAtMzc4LDE5ICszNzgsOCBAQCB2b2lkIFJlbmRlckZy YWdtZW50Q29udGFpbmVyOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocygpCiAgICAgZWxz ZQogICAgICAgICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtX21pblByZWZlcnJlZExv Z2ljYWxXaWR0aCwgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgpOwogCi0gICAgaWYgKHN0eWxl VG9Vc2UubG9naWNhbE1pbldpZHRoKCkuaXNGaXhlZCgpICYmIHN0eWxlVG9Vc2UubG9naWNhbE1p bldpZHRoKCkudmFsdWUoKSA+IDApIHsKLSAgICAgICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lk dGggPSBzdGQ6Om1heChtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRqdXN0Q29udGVudEJv eExvZ2ljYWxXaWR0aEZvckJveFNpemluZyhzdHlsZVRvVXNlLmxvZ2ljYWxNaW5XaWR0aCgpKSk7 Ci0gICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gc3RkOjptYXgobV9taW5QcmVm ZXJyZWRMb2dpY2FsV2lkdGgsIGFkanVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXpp bmcoc3R5bGVUb1VzZS5sb2dpY2FsTWluV2lkdGgoKSkpOwotICAgIH0KLQotICAgIGlmIChzdHls ZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzRml4ZWQoKSkgewotICAgICAgICBtX21heFByZWZl cnJlZExvZ2ljYWxXaWR0aCA9IHN0ZDo6bWluKG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoLCBh ZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHN0eWxlVG9Vc2UubG9naWNh bE1heFdpZHRoKCkpKTsKLSAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBzdGQ6 Om1pbihtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRqdXN0Q29udGVudEJveExvZ2ljYWxX aWR0aEZvckJveFNpemluZyhzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpKSk7Ci0gICAgfQor ICAgIFJlbmRlckJveDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoc3R5bGUoKS5sb2dp Y2FsTWluV2lkdGgoKSwgc3R5bGUoKS5sb2dpY2FsTWF4V2lkdGgoKSwgYm9yZGVyQW5kUGFkZGlu Z0xvZ2ljYWxXaWR0aCgpKTsKIAotICAgIExheW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZyA9IGJv cmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgoKTsKLSAgICBtX21pblByZWZlcnJlZExvZ2ljYWxX aWR0aCArPSBib3JkZXJBbmRQYWRkaW5nOwotICAgIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRo ICs9IGJvcmRlckFuZFBhZGRpbmc7CiAgICAgc2V0UHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5 KGZhbHNlKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxpc3RCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3Bw CmluZGV4IDRjYzQyY2RlNGNmODNkZWJlMzc4OGJlNjBiZGY5ZjkyMTQ5NGQyZGMuLjA2NGY4MTQ4 ODlhNTQ3ZGZkZWJkMzZlZWYzYzg0M2ZlN2QzYWIzNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAKQEAgLTIzMSwyMCArMjMxLDggQEAgdm9pZCBSZW5kZXJM aXN0Qm94Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocygpCiAgICAgZWxzZQogICAgICAg ICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0 aCwgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgpOwogCi0gICAgaWYgKHN0eWxlKCkubWluV2lk dGgoKS5pc0ZpeGVkKCkgJiYgc3R5bGUoKS5taW5XaWR0aCgpLnZhbHVlKCkgPiAwKSB7Ci0gICAg ICAgIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0gc3RkOjptYXgobV9tYXhQcmVmZXJyZWRM b2dpY2FsV2lkdGgsIGFkanVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcoc3R5 bGUoKS5taW5XaWR0aCgpKSk7Ci0gICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0g c3RkOjptYXgobV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgsIGFkanVzdENvbnRlbnRCb3hMb2dp Y2FsV2lkdGhGb3JCb3hTaXppbmcoc3R5bGUoKS5taW5XaWR0aCgpKSk7Ci0gICAgfQotCi0gICAg aWYgKHN0eWxlKCkubWF4V2lkdGgoKS5pc0ZpeGVkKCkpIHsKLSAgICAgICAgbV9tYXhQcmVmZXJy ZWRMb2dpY2FsV2lkdGggPSBzdGQ6Om1pbihtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRq dXN0Q29udGVudEJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyhzdHlsZSgpLm1heFdpZHRoKCkp KTsKLSAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBzdGQ6Om1pbihtX21pblBy ZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aEZvckJveFNp emluZyhzdHlsZSgpLm1heFdpZHRoKCkpKTsKLSAgICB9CisgICAgUmVuZGVyQm94Ojpjb21wdXRl UHJlZmVycmVkTG9naWNhbFdpZHRocyhzdHlsZSgpLm1pbldpZHRoKCksIHN0eWxlKCkubWF4V2lk dGgoKSwgaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSk7CiAKLSAgICBMYXlvdXRV bml0IHRvQWRkID0gaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKTsKLSAgICBtX21p blByZWZlcnJlZExvZ2ljYWxXaWR0aCArPSB0b0FkZDsKLSAgICBtX21heFByZWZlcnJlZExvZ2lj YWxXaWR0aCArPSB0b0FkZDsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAg c2V0UHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5KGZhbHNlKTsKIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHAKaW5kZXggNWJkNDZkYzYyYWUxNzFkNTZh YTQxNDljMDU1NjM1MzVmMDhlZjc3NS4uN2E2ZTczOWY1ZTQ0Zjc1MWY1NWJmZTMwNDIxZTZjODll OGI2MmQyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lbnVM aXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3Bw CkBAIC0zMzAsMTkgKzMzMCw3IEBAIHZvaWQgUmVuZGVyTWVudUxpc3Q6OmNvbXB1dGVQcmVmZXJy ZWRMb2dpY2FsV2lkdGhzKCkKICAgICBlbHNlCiAgICAgICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dp Y2FsV2lkdGhzKG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBtX21heFByZWZlcnJlZExvZ2lj YWxXaWR0aCk7CiAKLSAgICBpZiAoc3R5bGUoKS5taW5XaWR0aCgpLmlzRml4ZWQoKSAmJiBzdHls ZSgpLm1pbldpZHRoKCkudmFsdWUoKSA+IDApIHsKLSAgICAgICAgbV9tYXhQcmVmZXJyZWRMb2dp Y2FsV2lkdGggPSBzdGQ6Om1heChtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRqdXN0Q29u dGVudEJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyhzdHlsZSgpLm1pbldpZHRoKCkpKTsKLSAg ICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBzdGQ6Om1heChtX21pblByZWZlcnJl ZExvZ2ljYWxXaWR0aCwgYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyhz dHlsZSgpLm1pbldpZHRoKCkpKTsKLSAgICB9Ci0KLSAgICBpZiAoc3R5bGUoKS5tYXhXaWR0aCgp LmlzRml4ZWQoKSkgewotICAgICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IHN0ZDo6 bWluKG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoLCBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdp ZHRoRm9yQm94U2l6aW5nKHN0eWxlKCkubWF4V2lkdGgoKSkpOwotICAgICAgICBtX21pblByZWZl cnJlZExvZ2ljYWxXaWR0aCA9IHN0ZDo6bWluKG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBh ZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHN0eWxlKCkubWF4V2lkdGgo KSkpOwotICAgIH0KLQotICAgIExheW91dFVuaXQgdG9BZGQgPSBob3Jpem9udGFsQm9yZGVyQW5k UGFkZGluZ0V4dGVudCgpOwotICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoICs9IHRvQWRk OwotICAgIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoICs9IHRvQWRkOworICAgIFJlbmRlckJv eDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoc3R5bGUoKS5taW5XaWR0aCgpLCBzdHls ZSgpLm1heFdpZHRoKCksIGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkpOwogCiAg ICAgc2V0UHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5KGZhbHNlKTsKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTbGlkZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclNsaWRlci5jcHAKaW5kZXggMjUzNDg5NzkwNmJiNDg1OTAzZDQx MjEwZGY1N2FjMDM4MTUwNTAwZS4uNGQyNzhkMTcyZmQzZTM3OGI3MDUwNGQxYTRiNDk0ZjkzN2Rm OWY5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNsaWRlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNsaWRlci5jcHAKQEAgLTg0 LDE5ICs4NCw3IEBAIHZvaWQgUmVuZGVyU2xpZGVyOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdp ZHRocygpCiAgICAgZWxzZQogICAgICAgICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyht X21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCwgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgpOwog Ci0gICAgaWYgKHN0eWxlKCkubWluV2lkdGgoKS5pc0ZpeGVkKCkgJiYgc3R5bGUoKS5taW5XaWR0 aCgpLnZhbHVlKCkgPiAwKSB7Ci0gICAgICAgIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0g c3RkOjptYXgobV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgsIGFkanVzdENvbnRlbnRCb3hMb2dp Y2FsV2lkdGhGb3JCb3hTaXppbmcoc3R5bGUoKS5taW5XaWR0aCgpKSk7Ci0gICAgICAgIG1fbWlu UHJlZmVycmVkTG9naWNhbFdpZHRoID0gc3RkOjptYXgobV9taW5QcmVmZXJyZWRMb2dpY2FsV2lk dGgsIGFkanVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcoc3R5bGUoKS5taW5X aWR0aCgpKSk7Ci0gICAgfQotCi0gICAgaWYgKHN0eWxlKCkubWF4V2lkdGgoKS5pc0ZpeGVkKCkp IHsKLSAgICAgICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBzdGQ6Om1pbihtX21heFBy ZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aEZvckJveFNp emluZyhzdHlsZSgpLm1heFdpZHRoKCkpKTsKLSAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2Fs V2lkdGggPSBzdGQ6Om1pbihtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRqdXN0Q29udGVu dEJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyhzdHlsZSgpLm1heFdpZHRoKCkpKTsKLSAgICB9 Ci0KLSAgICBMYXlvdXRVbml0IHRvQWRkID0gaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRl bnQoKTsKLSAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCArPSB0b0FkZDsKLSAgICBtX21h eFByZWZlcnJlZExvZ2ljYWxXaWR0aCArPSB0b0FkZDsKKyAgICBSZW5kZXJCb3g6OmNvbXB1dGVQ cmVmZXJyZWRMb2dpY2FsV2lkdGhzKHN0eWxlKCkubWluV2lkdGgoKSwgc3R5bGUoKS5tYXhXaWR0 aCgpLCBob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpKTsKIAogICAgIHNldFByZWZl cnJlZExvZ2ljYWxXaWR0aHNEaXJ0eShmYWxzZSk7IAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5jcHAKaW5kZXggNDBlYTFjY2I2Njc2MjlkNjM1N2E0 MGNkMTQ3YjMwZjMwNDcwZDk1ZS4uZGMwNThkNTM0NjdhYTNjZmFiZjg1MmYzMzFlZjAxZjMxNTUz MjFmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250 cm9sLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wu Y3BwCkBAIC0xNzYsMjAgKzE3Niw3IEBAIHZvaWQgUmVuZGVyVGV4dENvbnRyb2w6OmNvbXB1dGVQ cmVmZXJyZWRMb2dpY2FsV2lkdGhzKCkKICAgICBlbHNlCiAgICAgICAgIGNvbXB1dGVJbnRyaW5z aWNMb2dpY2FsV2lkdGhzKG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBtX21heFByZWZlcnJl ZExvZ2ljYWxXaWR0aCk7CiAKLSAgICBpZiAoc3R5bGUoKS5sb2dpY2FsTWluV2lkdGgoKS5pc0Zp eGVkKCkgJiYgc3R5bGUoKS5sb2dpY2FsTWluV2lkdGgoKS52YWx1ZSgpID4gMCkgewotICAgICAg ICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IHN0ZDo6bWF4KG1fbWF4UHJlZmVycmVkTG9n aWNhbFdpZHRoLCBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHN0eWxl KCkubG9naWNhbE1pbldpZHRoKCkpKTsKLSAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lk dGggPSBzdGQ6Om1heChtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRqdXN0Q29udGVudEJv eExvZ2ljYWxXaWR0aEZvckJveFNpemluZyhzdHlsZSgpLmxvZ2ljYWxNaW5XaWR0aCgpKSk7Ci0g ICAgfQotCi0gICAgaWYgKHN0eWxlKCkubG9naWNhbE1heFdpZHRoKCkuaXNGaXhlZCgpKSB7Ci0g ICAgICAgIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0gc3RkOjptaW4obV9tYXhQcmVmZXJy ZWRMb2dpY2FsV2lkdGgsIGFkanVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmco c3R5bGUoKS5sb2dpY2FsTWF4V2lkdGgoKSkpOwotICAgICAgICBtX21pblByZWZlcnJlZExvZ2lj YWxXaWR0aCA9IHN0ZDo6bWluKG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBhZGp1c3RDb250 ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHN0eWxlKCkubG9naWNhbE1heFdpZHRoKCkp KTsKLSAgICB9Ci0KLSAgICBMYXlvdXRVbml0IHRvQWRkID0gYm9yZGVyQW5kUGFkZGluZ0xvZ2lj YWxXaWR0aCgpOwotCi0gICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggKz0gdG9BZGQ7Ci0g ICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggKz0gdG9BZGQ7CisgICAgUmVuZGVyQm94Ojpj b21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyhzdHlsZSgpLmxvZ2ljYWxNaW5XaWR0aCgpLCBz dHlsZSgpLmxvZ2ljYWxNYXhXaWR0aCgpLCBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCkp OwogCiAgICAgc2V0UHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5KGZhbHNlKTsKIH0K