208529 2020-03-03 12:29:55 -0800 Rename urlSelected to changeLocation 2020-03-09 10:02:52 -0700 1 1 1 Unclassified WebKit New Bugs Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rbuis rbuis cdumez commit-queue darin dbarton dino esprehn+autocc ews-watchlist fmalita fred.wang gyuyoung.kim japhet pdr sabouhallawa schenney sergio webkit-bug-importer oldest_to_newest 1625182 0 rbuis 2020-03-03 12:29:55 -0800 Rename urlSelected to changeLocation and remove the existing changeLocation. The name changeLocation is more intuitive than urlSelected. 1625184 1 392310 rbuis 2020-03-03 12:32:54 -0800 Created attachment 392310 Patch 1627678 2 392310 darin 2020-03-09 00:14:59 -0700 Comment on attachment 392310 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=392310&action=review > Source/WebCore/loader/FrameLoader.h:-132 > - void changeLocation(FrameLoadRequest&&); Was this just unused? I don’t see any cases of this in the patch. 1627691 3 392310 rbuis 2020-03-09 01:29:43 -0700 Comment on attachment 392310 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=392310&action=review >> Source/WebCore/loader/FrameLoader.h:-132 >> - void changeLocation(FrameLoadRequest&&); > > Was this just unused? I don’t see any cases of this in the patch. It was used in a few places but those places can just use one of the old urlSelected overloads (now renamed to changeLocation), since I made the second parameter gain a default value. The old changeLocation was just filling in the second parameter and was not so useful. 1627692 4 rbuis 2020-03-09 01:32:13 -0700 Darin, I just noticed Source/WebCore/WebCore.order still mentions urlSelected. How important is it to keep this file in sync and is this done regularly? Willing to make a follow up patch if needed. 1627760 5 392310 commit-queue 2020-03-09 08:10:08 -0700 Comment on attachment 392310 Patch Clearing flags on attachment: 392310 Committed r258140: <https://trac.webkit.org/changeset/258140> 1627761 6 commit-queue 2020-03-09 08:10:10 -0700 All reviewed patches have been landed. Closing bug. 1627763 7 webkit-bug-importer 2020-03-09 08:11:15 -0700 <rdar://problem/60223618> 1627821 8 darin 2020-03-09 10:02:52 -0700 (In reply to Rob Buis from comment #4) > Darin, I just noticed Source/WebCore/WebCore.order still mentions > urlSelected. How important is it to keep this file in sync and is this done > regularly? Willing to make a follow up patch if needed. Not important at all. I don’t know why those order files are still checked in; there may be a good reason. But no matter what that reason is, they definitely can’t be correctly updated by editing the files by hand. 392310 2020-03-03 12:32:54 -0800 2020-03-09 08:10:08 -0700 Patch bug-208529-20200303213251.patch text/plain 17132 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3NzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjA1ZGRlMDMxNTAwYmU5 MGIwM2FkOGNhNTYwNmI4NDIzNWUwNmFhMi4uMDk5Njc4MTVkNDA1ODYyMjJkYmFmMGViNzFiNWI4 MmYxYWFjZGZjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTAzLTAzICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVuYW1lIHVybFNlbGVjdGVkIHRv IGNoYW5nZUxvY2F0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMDg1MjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBSZW5hbWUgdXJsU2VsZWN0ZWQgdG8gY2hhbmdlTG9jYXRpb24gYW5kIHJlbW92ZSB0 aGUgZXhpc3RpbmcKKyAgICAgICAgY2hhbmdlTG9jYXRpb24uIFRoZSBuYW1lIGNoYW5nZUxvY2F0 aW9uIGlzIG1vcmUgaW50dWl0aXZlCisgICAgICAgIHRoYW4gdXJsU2VsZWN0ZWQuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzIC0tIG5vIG5ldyBvciBjaGFuZ2VkIGZ1bmN0aW9uYWxpdHkuCisKKyAg ICAgICAgKiBodG1sL0hUTUxBbmNob3JFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxBbmNob3JFbGVtZW50OjpoYW5kbGVDbGljayk6CisgICAgICAgICogaHRtbC9IVE1MTGlua0Vs ZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTExpbmtFbGVtZW50OjpoYW5kbGVDbGlj ayk6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkZyYW1lTG9hZGVyOjpjaGFuZ2VMb2NhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxv YWRlcjo6dXJsU2VsZWN0ZWQpOiBEZWxldGVkLgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRl ci5oOgorICAgICAgICAqIGxvYWRlci9OYXZpZ2F0aW9uU2NoZWR1bGVyLmNwcDoKKyAgICAgICAg KiBtYXRobWwvTWF0aE1MRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNYXRoTUxFbGVt ZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKToKKyAgICAgICAgKiBzdmcvU1ZHQUVsZW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6U1ZHQUVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIpOgor CiAyMDIwLTAzLTAzICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4K IAogICAgICAgICBbR1RLXVtXUEVdIEZpeCBKYXZhU2NyaXB0IGV4Y2VwdGlvbiB3aGVuIHJlbW92 aW5nIG1lZGlhIGNvbnRyb2xzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBi L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDcyMzk1NGYyYzUzZTYxNjA0MDNiMGY0NjI4 MzNiOTE1NGY5NjE4MWQuLjUwZWI2NjIzNTU1ZGY4NzhiZDE1NDVjMmZkN2MyYmZiN2MxNTQyMTkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjAtMDMtMDMgIFJvYiBCdWlzICA8cmJ1aXNA aWdhbGlhLmNvbT4KKworICAgICAgICBSZW5hbWUgdXJsU2VsZWN0ZWQgdG8gY2hhbmdlTG9jYXRp b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODUy OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkYXB0 IHRvIEFQSSBjaGFuZ2UuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBs dWdpbi5tbToKKyAgICAgICAgKFdlYktpdDo6UERGUGx1Z2luOjpjbGlja2VkTGluayk6CisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51Q2xpZW50OjpzZWFyY2hXaXRoR29vZ2xl KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2U6Om5hdmlnYXRlVG9QREZMaW5rV2l0aFNpbXVsYXRlZENsaWNrKToKKwog MjAyMC0wMy0wMiAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg0NDcKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2lu L0NoYW5nZUxvZwppbmRleCBhOWQxY2NlZjQ0OTQwZmM3OTAwOGIzZjg4OTdkZjhmNjE4YTBjNDI3 Li42OWI3ZWI0YmQxNjYzMDFkZjBhZTc3MjQwZGYwMGUzN2Q4NTMwNWQwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdExlZ2Fj eS93aW4vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDMtMDMgIFJvYiBCdWlzICA8 cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBSZW5hbWUgdXJsU2VsZWN0ZWQgdG8gY2hhbmdl TG9jYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwODUyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkYXB0IHRvIEFQSSBjaGFuZ2UuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJDb250 ZXh0TWVudUNsaWVudC5jcHA6CisgICAgICAgIChXZWJDb250ZXh0TWVudUNsaWVudDo6c2VhcmNo V2l0aEdvb2dsZSk6CisKIDIwMjAtMDMtMDIgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4K IAogICAgICAgICBBZGQgcmVmZXJyZXJwb2xpY3kgYXR0cmlidXRlIHN1cHBvcnQgZm9yIGFuY2hv cnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEFuY2hvckVsZW1lbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQW5jaG9yRWxlbWVudC5jcHAKaW5kZXggYmI0ZmQz ODE3NDM0ZThjYjVlNDQwMzMyODBmZjNmZjVmYzUyOWJhOS4uZWVkZTQ0ZmY3NzY0Y2U5YTE5NjFh ODZhMjQ3OTFmYzRhMDE3YWUwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M QW5jaG9yRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQW5jaG9yRWxl bWVudC5jcHAKQEAgLTUwOCw3ICs1MDgsNyBAQCB2b2lkIEhUTUxBbmNob3JFbGVtZW50OjpoYW5k bGVDbGljayhFdmVudCYgZXZlbnQpCiAgICAgLy8gY3JlYXRlZC4gVGh1cywgaXQgc2hvdWxkIGJl IGVtcHR5IGZvciBub3cuCiAgICAgQVNTRVJUKCFhZENsaWNrQXR0cmlidXRpb24gfHwgYWRDbGlj a0F0dHJpYnV0aW9uLT51cmwoKS5pc051bGwoKSk7CiAgICAgCi0gICAgZnJhbWUtPmxvYWRlcigp LnVybFNlbGVjdGVkKGNvbXBsZXRlZFVSTCwgZWZmZWN0aXZlVGFyZ2V0LCAmZXZlbnQsIExvY2tI aXN0b3J5OjpObywgTG9ja0JhY2tGb3J3YXJkTGlzdDo6Tm8sIHJlZmVycmVyUG9saWN5LCBkb2N1 bWVudCgpLnNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3lUb1Byb3BhZ2F0ZSgpLCBuZXdGcmFt ZU9wZW5lclBvbGljeSwgZG93bmxvYWRBdHRyaWJ1dGUsIHN5c3RlbVByZXZpZXdJbmZvLCBXVEZN b3ZlKGFkQ2xpY2tBdHRyaWJ1dGlvbikpOworICAgIGZyYW1lLT5sb2FkZXIoKS5jaGFuZ2VMb2Nh dGlvbihjb21wbGV0ZWRVUkwsIGVmZmVjdGl2ZVRhcmdldCwgJmV2ZW50LCBMb2NrSGlzdG9yeTo6 Tm8sIExvY2tCYWNrRm9yd2FyZExpc3Q6Ok5vLCByZWZlcnJlclBvbGljeSwgZG9jdW1lbnQoKS5z aG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5VG9Qcm9wYWdhdGUoKSwgbmV3RnJhbWVPcGVuZXJQ b2xpY3ksIGRvd25sb2FkQXR0cmlidXRlLCBzeXN0ZW1QcmV2aWV3SW5mbywgV1RGTW92ZShhZENs aWNrQXR0cmlidXRpb24pKTsKIAogICAgIHNlbmRQaW5ncyhjb21wbGV0ZWRVUkwpOwogfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTGlua0VsZW1lbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MTGlua0VsZW1lbnQuY3BwCmluZGV4IGUwN2JhMWUwMTFiZjQxMzhm Y2VhYmYxYzY5MTRmMWMxMTcxMzI4ODkuLmY2ODBhMmVmYmZmOWVhOGYzMDczMjAxOTc3NmI1ZTRm NGExYzRiYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTExpbmtFbGVtZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxMaW5rRWxlbWVudC5jcHAKQEAgLTU4 Niw3ICs1ODYsNyBAQCB2b2lkIEhUTUxMaW5rRWxlbWVudDo6aGFuZGxlQ2xpY2soRXZlbnQmIGV2 ZW50KQogICAgIFJlZlB0cjxGcmFtZT4gZnJhbWUgPSBkb2N1bWVudCgpLmZyYW1lKCk7CiAgICAg aWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJuOwotICAgIGZyYW1lLT5sb2FkZXIoKS51cmxTZWxl Y3RlZCh1cmwsIHRhcmdldCgpLCAmZXZlbnQsIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3 YXJkTGlzdDo6Tm8sIFJlZmVycmVyUG9saWN5OjpFbXB0eVN0cmluZywgZG9jdW1lbnQoKS5zaG91 bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5VG9Qcm9wYWdhdGUoKSk7CisgICAgZnJhbWUtPmxvYWRl cigpLmNoYW5nZUxvY2F0aW9uKHVybCwgdGFyZ2V0KCksICZldmVudCwgTG9ja0hpc3Rvcnk6Ok5v LCBMb2NrQmFja0ZvcndhcmRMaXN0OjpObywgUmVmZXJyZXJQb2xpY3k6OkVtcHR5U3RyaW5nLCBk b2N1bWVudCgpLnNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3lUb1Byb3BhZ2F0ZSgpKTsKIH0K IAogVVJMIEhUTUxMaW5rRWxlbWVudDo6aHJlZigpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyLmNwcAppbmRleCA5YzE4ZDc2OGE5NTk3MWQ2MWMzY2Y2M2UwYzI1NDg4OThiMDcz NjdkLi5kODI5MmJkYTNhMzBjMjhjYzM3ODZjMTQ5N2Q3MTgxNGMzMzk4N2E1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTQxNiwyMyArNDE2LDE4IEBAIHZvaWQgRnJh bWVMb2FkZXI6OmNoZWNrQ29udGVudFBvbGljeShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNw b25zZSwgUG9saWN5Q2hlCiAgICAgY2xpZW50KCkuZGlzcGF0Y2hEZWNpZGVQb2xpY3lGb3JSZXNw b25zZShyZXNwb25zZSwgYWN0aXZlRG9jdW1lbnRMb2FkZXIoKS0+cmVxdWVzdCgpLCBpZGVudGlm aWVyLCBhY3RpdmVEb2N1bWVudExvYWRlcigpLT5kb3dubG9hZEF0dHJpYnV0ZSgpLCBXVEZNb3Zl KGZ1bmN0aW9uKSk7CiB9CiAKLXZvaWQgRnJhbWVMb2FkZXI6OmNoYW5nZUxvY2F0aW9uKEZyYW1l TG9hZFJlcXVlc3QmJiByZXF1ZXN0KQotewotICAgIHVybFNlbGVjdGVkKFdURk1vdmUocmVxdWVz dCksIG51bGxwdHIpOwotfQotCi12b2lkIEZyYW1lTG9hZGVyOjp1cmxTZWxlY3RlZChjb25zdCBV UkwmIHVybCwgY29uc3QgU3RyaW5nJiBwYXNzZWRUYXJnZXQsIEV2ZW50KiB0cmlnZ2VyaW5nRXZl bnQsIExvY2tIaXN0b3J5IGxvY2tIaXN0b3J5LCBMb2NrQmFja0ZvcndhcmRMaXN0IGxvY2tCYWNr Rm9yd2FyZExpc3QsIGNvbnN0IFJlZmVycmVyUG9saWN5JiByZWZlcnJlclBvbGljeSwgU2hvdWxk T3BlbkV4dGVybmFsVVJMc1BvbGljeSBzaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBPcHRp b25hbDxOZXdGcmFtZU9wZW5lclBvbGljeT4gb3BlbmVyUG9saWN5LCBjb25zdCBBdG9tU3RyaW5n JiBkb3dubG9hZEF0dHJpYnV0ZSwgY29uc3QgU3lzdGVtUHJldmlld0luZm8mIHN5c3RlbVByZXZp ZXdJbmZvLCBPcHRpb25hbDxBZENsaWNrQXR0cmlidXRpb24+JiYgYWRDbGlja0F0dHJpYnV0aW9u KQordm9pZCBGcmFtZUxvYWRlcjo6Y2hhbmdlTG9jYXRpb24oY29uc3QgVVJMJiB1cmwsIGNvbnN0 IFN0cmluZyYgcGFzc2VkVGFyZ2V0LCBFdmVudCogdHJpZ2dlcmluZ0V2ZW50LCBMb2NrSGlzdG9y eSBsb2NrSGlzdG9yeSwgTG9ja0JhY2tGb3J3YXJkTGlzdCBsb2NrQmFja0ZvcndhcmRMaXN0LCBj b25zdCBSZWZlcnJlclBvbGljeSYgcmVmZXJyZXJQb2xpY3ksIFNob3VsZE9wZW5FeHRlcm5hbFVS THNQb2xpY3kgc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgT3B0aW9uYWw8TmV3RnJhbWVP cGVuZXJQb2xpY3k+IG9wZW5lclBvbGljeSwgY29uc3QgQXRvbVN0cmluZyYgZG93bmxvYWRBdHRy aWJ1dGUsIGNvbnN0IFN5c3RlbVByZXZpZXdJbmZvJiBzeXN0ZW1QcmV2aWV3SW5mbywgT3B0aW9u YWw8QWRDbGlja0F0dHJpYnV0aW9uPiYmIGFkQ2xpY2tBdHRyaWJ1dGlvbikKIHsKICAgICBhdXRv KiBmcmFtZSA9IGxleGljYWxGcmFtZUZyb21Db21tb25WTSgpOwogICAgIGF1dG8gaW5pdGlhdGVk QnlNYWluRnJhbWUgPSBmcmFtZSAmJiBmcmFtZS0+aXNNYWluRnJhbWUoKSA/IEluaXRpYXRlZEJ5 TWFpbkZyYW1lOjpZZXMgOiBJbml0aWF0ZWRCeU1haW5GcmFtZTo6VW5rbm93bjsKIAogICAgIE5l d0ZyYW1lT3BlbmVyUG9saWN5IG5ld0ZyYW1lT3BlbmVyUG9saWN5ID0gb3BlbmVyUG9saWN5LnZh bHVlT3IocmVmZXJyZXJQb2xpY3kgPT0gUmVmZXJyZXJQb2xpY3k6Ok5vUmVmZXJyZXIgPyBOZXdG cmFtZU9wZW5lclBvbGljeTo6U3VwcHJlc3MgOiBOZXdGcmFtZU9wZW5lclBvbGljeTo6QWxsb3cp OwotICAgIHVybFNlbGVjdGVkKEZyYW1lTG9hZFJlcXVlc3QoKm1fZnJhbWUuZG9jdW1lbnQoKSwg bV9mcmFtZS5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLCB7IHVybCB9LCBwYXNzZWRUYXJn ZXQsIGxvY2tIaXN0b3J5LCBsb2NrQmFja0ZvcndhcmRMaXN0LCByZWZlcnJlclBvbGljeSwgQWxs b3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMOjpZZXMsIG5ld0ZyYW1lT3BlbmVyUG9saWN5LCBzaG91 bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBpbml0aWF0ZWRCeU1haW5GcmFtZSwgRG9Ob3RSZXBs YWNlRG9jdW1lbnRJZkphdmFTY3JpcHRVUkwsIGRvd25sb2FkQXR0cmlidXRlLCBzeXN0ZW1QcmV2 aWV3SW5mbyksIHRyaWdnZXJpbmdFdmVudCwgV1RGTW92ZShhZENsaWNrQXR0cmlidXRpb24pKTsK KyAgICBjaGFuZ2VMb2NhdGlvbihGcmFtZUxvYWRSZXF1ZXN0KCptX2ZyYW1lLmRvY3VtZW50KCks IG1fZnJhbWUuZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKSwgeyB1cmwgfSwgcGFzc2VkVGFy Z2V0LCBsb2NrSGlzdG9yeSwgbG9ja0JhY2tGb3J3YXJkTGlzdCwgcmVmZXJyZXJQb2xpY3ksIEFs bG93TmF2aWdhdGlvblRvSW52YWxpZFVSTDo6WWVzLCBuZXdGcmFtZU9wZW5lclBvbGljeSwgc2hv dWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgaW5pdGlhdGVkQnlNYWluRnJhbWUsIERvTm90UmVw bGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMLCBkb3dubG9hZEF0dHJpYnV0ZSwgc3lzdGVtUHJl dmlld0luZm8pLCB0cmlnZ2VyaW5nRXZlbnQsIFdURk1vdmUoYWRDbGlja0F0dHJpYnV0aW9uKSk7 CiB9CiAKLXZvaWQgRnJhbWVMb2FkZXI6OnVybFNlbGVjdGVkKEZyYW1lTG9hZFJlcXVlc3QmJiBm cmFtZVJlcXVlc3QsIEV2ZW50KiB0cmlnZ2VyaW5nRXZlbnQsIE9wdGlvbmFsPEFkQ2xpY2tBdHRy aWJ1dGlvbj4mJiBhZENsaWNrQXR0cmlidXRpb24pCit2b2lkIEZyYW1lTG9hZGVyOjpjaGFuZ2VM b2NhdGlvbihGcmFtZUxvYWRSZXF1ZXN0JiYgZnJhbWVSZXF1ZXN0LCBFdmVudCogdHJpZ2dlcmlu Z0V2ZW50LCBPcHRpb25hbDxBZENsaWNrQXR0cmlidXRpb24+JiYgYWRDbGlja0F0dHJpYnV0aW9u KQogewotICAgIEZSQU1FTE9BREVSX1JFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUmVzb3VyY2VMb2Fk aW5nLCAidXJsU2VsZWN0ZWQ6IGZyYW1lIGxvYWQgc3RhcnRlZCIpOworICAgIEZSQU1FTE9BREVS X1JFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUmVzb3VyY2VMb2FkaW5nLCAiY2hhbmdlTG9jYXRpb246 IGZyYW1lIGxvYWQgc3RhcnRlZCIpOwogCiAgICAgUmVmPEZyYW1lPiBwcm90ZWN0KG1fZnJhbWUp OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaCBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCmluZGV4IDdhZjQyYjVjZjAxOTdjNDFm YzMyY2YyMzQ0ZGVhODBiMTNlMjQ4YzkuLjk5ZjEyMmFhNTZlZTBkMjNlMTAzOGRhNTY3ZmZjMDcy YjVlOTFlNWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCkBAIC0xMjksOCArMTI5 LDggQEAgcHVibGljOgogI2VuZGlmCiAgICAgdW5zaWduZWQgbG9uZyBsb2FkUmVzb3VyY2VTeW5j aHJvbm91c2x5KGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIENsaWVudENyZWRlbnRpYWxQb2xpY3ks IGNvbnN0IEZldGNoT3B0aW9ucyYsIGNvbnN0IEhUVFBIZWFkZXJNYXAmLCBSZXNvdXJjZUVycm9y JiwgUmVzb3VyY2VSZXNwb25zZSYsIFJlZlB0cjxTaGFyZWRCdWZmZXI+JiBkYXRhKTsKIAotICAg IHZvaWQgY2hhbmdlTG9jYXRpb24oRnJhbWVMb2FkUmVxdWVzdCYmKTsKLSAgICBXRUJDT1JFX0VY UE9SVCB2b2lkIHVybFNlbGVjdGVkKGNvbnN0IFVSTCYsIGNvbnN0IFN0cmluZyYgdGFyZ2V0LCBF dmVudCosIExvY2tIaXN0b3J5LCBMb2NrQmFja0ZvcndhcmRMaXN0LCBjb25zdCBSZWZlcnJlclBv bGljeSYsIFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3ksIE9wdGlvbmFsPE5ld0ZyYW1lT3Bl bmVyUG9saWN5PiA9IFdURjo6bnVsbG9wdCwgY29uc3QgQXRvbVN0cmluZyYgZG93bmxvYWRBdHRy aWJ1dGUgPSBudWxsQXRvbSgpLCBjb25zdCBTeXN0ZW1QcmV2aWV3SW5mbyYgPSB7IH0sIE9wdGlv bmFsPEFkQ2xpY2tBdHRyaWJ1dGlvbj4mJiA9IFdURjo6bnVsbG9wdCk7CisgICAgV0VCQ09SRV9F WFBPUlQgdm9pZCBjaGFuZ2VMb2NhdGlvbihjb25zdCBVUkwmLCBjb25zdCBTdHJpbmcmIHRhcmdl dCwgRXZlbnQqLCBMb2NrSGlzdG9yeSwgTG9ja0JhY2tGb3J3YXJkTGlzdCwgY29uc3QgUmVmZXJy ZXJQb2xpY3kmLCBTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5LCBPcHRpb25hbDxOZXdGcmFt ZU9wZW5lclBvbGljeT4gPSBXVEY6Om51bGxvcHQsIGNvbnN0IEF0b21TdHJpbmcmIGRvd25sb2Fk QXR0cmlidXRlID0gbnVsbEF0b20oKSwgY29uc3QgU3lzdGVtUHJldmlld0luZm8mID0geyB9LCBP cHRpb25hbDxBZENsaWNrQXR0cmlidXRpb24+JiYgPSBXVEY6Om51bGxvcHQpOworICAgIHZvaWQg Y2hhbmdlTG9jYXRpb24oRnJhbWVMb2FkUmVxdWVzdCYmLCBFdmVudCogPSBudWxscHRyLCBPcHRp b25hbDxBZENsaWNrQXR0cmlidXRpb24+JiYgPSBXVEY6Om51bGxvcHQpOwogICAgIHZvaWQgc3Vi bWl0Rm9ybShSZWY8Rm9ybVN1Ym1pc3Npb24+JiYpOwogCiAgICAgV0VCQ09SRV9FWFBPUlQgdm9p ZCByZWxvYWQoT3B0aW9uU2V0PFJlbG9hZE9wdGlvbj4gPSB7IH0pOwpAQCAtMzg1LDggKzM4NSw2 IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGRpc3BhdGNoRGlkQ29tbWl0TG9hZChPcHRpb25hbDxI YXNJbnNlY3VyZUNvbnRlbnQ+IGluaXRpYWxIYXNJbnNlY3VyZUNvbnRlbnQsIE9wdGlvbmFsPFVz ZWRMZWdhY3lUTFM+IGluaXRpYWxVc2VkTGVnYWN5VExTKTsKIAotICAgIHZvaWQgdXJsU2VsZWN0 ZWQoRnJhbWVMb2FkUmVxdWVzdCYmLCBFdmVudCosIE9wdGlvbmFsPEFkQ2xpY2tBdHRyaWJ1dGlv bj4mJiA9IFdURjo6bnVsbG9wdCk7Ci0KICAgICB2b2lkIGxvYWRXaXRoRG9jdW1lbnRMb2FkZXIo RG9jdW1lbnRMb2FkZXIqLCBGcmFtZUxvYWRUeXBlLCBSZWZQdHI8Rm9ybVN0YXRlPiYmLCBBbGxv d05hdmlnYXRpb25Ub0ludmFsaWRVUkwsIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZCwgQ29t cGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmID0gW10geyB9KTsgLy8gQ2FsbHMgY29udGludWVMb2Fk QWZ0ZXJOYXZpZ2F0aW9uUG9saWN5CiAgICAgdm9pZCBsb2FkKERvY3VtZW50TG9hZGVyJik7IC8v IENhbGxzIGxvYWRXaXRoRG9jdW1lbnRMb2FkZXIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL05hdmlnYXRpb25TY2hlZHVsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L05hdmlnYXRpb25TY2hlZHVsZXIuY3BwCmluZGV4IDJjNTBmNDM3NzI3N2ZiYTM1NzM5ZmZmZmFi MDk5NmJiYjczZThmMmMuLjg5MzllMmZhMzM2NzVmZjRlZjQxMDYwMDA3NjMzODVlY2EyNDkwZmIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9uU2NoZWR1bGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmF2aWdhdGlvblNjaGVkdWxlci5jcHAKQEAg LTI1NCw3ICsyNTQsNyBAQCBwdWJsaWM6CiAgICAgICAgIGlmICghbV9oaXN0b3J5U3RlcHMpIHsK ICAgICAgICAgICAgIC8vIFNwZWNpYWwgY2FzZSBmb3IgZ28oMCkgZnJvbSBhIGZyYW1lIC0+IHJl bG9hZCBvbmx5IHRoZSBmcmFtZQogICAgICAgICAgICAgLy8gVG8gZm9sbG93IEZpcmVmb3ggYW5k IElFJ3MgYmVoYXZpb3IsIGhpc3RvcnkgcmVsb2FkIGNhbiBvbmx5IG5hdmlnYXRlIHRoZSBzZWxm IGZyYW1lLgotICAgICAgICAgICAgZnJhbWUubG9hZGVyKCkudXJsU2VsZWN0ZWQoZnJhbWUuZG9j dW1lbnQoKS0+dXJsKCksICJfc2VsZiIsIDAsIGxvY2tIaXN0b3J5KCksIGxvY2tCYWNrRm9yd2Fy ZExpc3QoKSwgUmVmZXJyZXJQb2xpY3k6OkVtcHR5U3RyaW5nLCBzaG91bGRPcGVuRXh0ZXJuYWxV UkxzKCkpOworICAgICAgICAgICAgZnJhbWUubG9hZGVyKCkuY2hhbmdlTG9jYXRpb24oZnJhbWUu ZG9jdW1lbnQoKS0+dXJsKCksICJfc2VsZiIsIDAsIGxvY2tIaXN0b3J5KCksIGxvY2tCYWNrRm9y d2FyZExpc3QoKSwgUmVmZXJyZXJQb2xpY3k6OkVtcHR5U3RyaW5nLCBzaG91bGRPcGVuRXh0ZXJu YWxVUkxzKCkpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbWF0aG1sL01hdGhNTEVsZW1lbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvbWF0aG1sL01hdGhNTEVsZW1lbnQuY3BwCmluZGV4IGViNjFhODM3Mzg2ZWExMWI5 ZDZkMTdjY2NiNzY0YTM5NmJiNzRiZWEuLjE5Y2MwZTczMGVkOGU3MmE1MTRmNTE1ODE5ZWNiM2M0 NTg3MTZhMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL21hdGhtbC9NYXRoTUxFbGVtZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9tYXRobWwvTWF0aE1MRWxlbWVudC5jcHAKQEAgLTE5 Miw3ICsxOTIsNyBAQCB2b2lkIE1hdGhNTEVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoRXZl bnQmIGV2ZW50KQogICAgICAgICAgICAgY29uc3QgYXV0byYgdXJsID0gc3RyaXBMZWFkaW5nQW5k VHJhaWxpbmdIVE1MU3BhY2VzKGhyZWYpOwogICAgICAgICAgICAgZXZlbnQuc2V0RGVmYXVsdEhh bmRsZWQoKTsKICAgICAgICAgICAgIGlmIChhdXRvKiBmcmFtZSA9IGRvY3VtZW50KCkuZnJhbWUo KSkKLSAgICAgICAgICAgICAgICBmcmFtZS0+bG9hZGVyKCkudXJsU2VsZWN0ZWQoZG9jdW1lbnQo KS5jb21wbGV0ZVVSTCh1cmwpLCAiX3NlbGYiLCAmZXZlbnQsIExvY2tIaXN0b3J5OjpObywgTG9j a0JhY2tGb3J3YXJkTGlzdDo6Tm8sIFJlZmVycmVyUG9saWN5OjpFbXB0eVN0cmluZywgZG9jdW1l bnQoKS5zaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5VG9Qcm9wYWdhdGUoKSk7CisgICAgICAg ICAgICAgICAgZnJhbWUtPmxvYWRlcigpLmNoYW5nZUxvY2F0aW9uKGRvY3VtZW50KCkuY29tcGxl dGVVUkwodXJsKSwgIl9zZWxmIiwgJmV2ZW50LCBMb2NrSGlzdG9yeTo6Tm8sIExvY2tCYWNrRm9y d2FyZExpc3Q6Ok5vLCBSZWZlcnJlclBvbGljeTo6RW1wdHlTdHJpbmcsIGRvY3VtZW50KCkuc2hv dWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeVRvUHJvcGFnYXRlKCkpOwogICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NW R0FFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdBRWxlbWVudC5jcHAKaW5kZXgg OTZjYTkxOTU5Y2U4ZGRlYmIzYTI3OWM2ZjZmZjZjNmY1NGU3OGQxMS4uYzFjMDUwM2MwNzJmNzA2 MDM4Njk2YWNhZDg2NWVmMmRkZTQ3OTY2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3Zn L1NWR0FFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHQUVsZW1lbnQuY3Bw CkBAIC0xMzksNyArMTM5LDcgQEAgdm9pZCBTVkdBRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxl cihFdmVudCYgZXZlbnQpCiAgICAgICAgICAgICBhdXRvIGZyYW1lID0gbWFrZVJlZlB0cihkb2N1 bWVudCgpLmZyYW1lKCkpOwogICAgICAgICAgICAgaWYgKCFmcmFtZSkKICAgICAgICAgICAgICAg ICByZXR1cm47Ci0gICAgICAgICAgICBmcmFtZS0+bG9hZGVyKCkudXJsU2VsZWN0ZWQoZG9jdW1l bnQoKS5jb21wbGV0ZVVSTCh1cmwpLCB0YXJnZXQsICZldmVudCwgTG9ja0hpc3Rvcnk6Ok5vLCBM b2NrQmFja0ZvcndhcmRMaXN0OjpObywgUmVmZXJyZXJQb2xpY3k6OkVtcHR5U3RyaW5nLCBkb2N1 bWVudCgpLnNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3lUb1Byb3BhZ2F0ZSgpKTsKKyAgICAg ICAgICAgIGZyYW1lLT5sb2FkZXIoKS5jaGFuZ2VMb2NhdGlvbihkb2N1bWVudCgpLmNvbXBsZXRl VVJMKHVybCksIHRhcmdldCwgJmV2ZW50LCBMb2NrSGlzdG9yeTo6Tm8sIExvY2tCYWNrRm9yd2Fy ZExpc3Q6Ok5vLCBSZWZlcnJlclBvbGljeTo6RW1wdHlTdHJpbmcsIGRvY3VtZW50KCkuc2hvdWxk T3BlbkV4dGVybmFsVVJMc1BvbGljeVRvUHJvcGFnYXRlKCkpOwogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1BsdWdpbnMvUERGL1BERlBsdWdpbi5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9QbHVn aW5zL1BERi9QREZQbHVnaW4ubW0KaW5kZXggNjc4MzlmNTM3MmJjZjkzNjBkY2FjZjAwNmM4ZTI0 ODkxYTY0YmZiYS4uMzY5Njg5ZTIzOTc0YWYyMTQwMTZmMTg3MzQ4MmU1NzM5ODkwYTg5YyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1t CkBAIC0xNjQ2LDcgKzE2NDYsNyBAQCB2b2lkIFBERlBsdWdpbjo6Y2xpY2tlZExpbmsoTlNVUkwg KnVybCkKICAgICBpZiAobV9sYXN0TW91c2VFdmVudC50eXBlKCkgIT0gV2ViRXZlbnQ6Ok5vVHlw ZSkKICAgICAgICAgY29yZUV2ZW50ID0gTW91c2VFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5j bGlja0V2ZW50LCAmZnJhbWUtPndpbmRvd1Byb3h5KCksIHBsYXRmb3JtKG1fbGFzdE1vdXNlRXZl bnQpLCAwLCAwKTsKIAotICAgIGZyYW1lLT5sb2FkZXIoKS51cmxTZWxlY3RlZChjb3JlVVJMLCBl bXB0eVN0cmluZygpLCBjb3JlRXZlbnQuZ2V0KCksIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tG b3J3YXJkTGlzdDo6Tm8sIFJlZmVycmVyUG9saWN5OjpOb1JlZmVycmVyLCBTaG91bGRPcGVuRXh0 ZXJuYWxVUkxzUG9saWN5OjpTaG91bGRBbGxvdyk7CisgICAgZnJhbWUtPmxvYWRlcigpLmNoYW5n ZUxvY2F0aW9uKGNvcmVVUkwsIGVtcHR5U3RyaW5nKCksIGNvcmVFdmVudC5nZXQoKSwgTG9ja0hp c3Rvcnk6Ok5vLCBMb2NrQmFja0ZvcndhcmRMaXN0OjpObywgUmVmZXJyZXJQb2xpY3k6Ok5vUmVm ZXJyZXIsIFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNob3VsZEFsbG93KTsKIH0KIAog dm9pZCBQREZQbHVnaW46OnNldEFjdGl2ZUFubm90YXRpb24oUERGQW5ub3RhdGlvbiAqYW5ub3Rh dGlvbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9y dC9XZWJDb250ZXh0TWVudUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQuY3BwCmluZGV4IGE5OTJlNWZkZTQ0ZTNl ZWVkY2ZiMDJiY2JiYzM2NmEyYzQwMmJhNWEuLjc2OGJhMmQ3YzQ2ODZjMDZlZTk3NGFiYmQ2NTI1 NDExZjNiYmNjOTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50LmNwcApAQCAtNjcsNyAr NjcsNyBAQCB2b2lkIFdlYkNvbnRleHRNZW51Q2xpZW50OjpzZWFyY2hXaXRoR29vZ2xlKGNvbnN0 IEZyYW1lKiBmcmFtZSkKIAogICAgIGlmIChQYWdlKiBwYWdlID0gZnJhbWUtPnBhZ2UoKSkgewog ICAgICAgICBVc2VyR2VzdHVyZUluZGljYXRvciBpbmRpY2F0b3IoUHJvY2Vzc2luZ1VzZXJHZXN0 dXJlKTsKLSAgICAgICAgcGFnZS0+bWFpbkZyYW1lKCkubG9hZGVyKCkudXJsU2VsZWN0ZWQoVVJM IHsgVVJMIHsgfSwgdXJsIH0sIHsgfSwgbnVsbHB0ciwgTG9ja0hpc3Rvcnk6Ok5vLCBMb2NrQmFj a0ZvcndhcmRMaXN0OjpObywgUmVmZXJyZXJQb2xpY3k6OkVtcHR5U3RyaW5nLCBTaG91bGRPcGVu RXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGROb3RBbGxvdyk7CisgICAgICAgIHBhZ2UtPm1haW5G cmFtZSgpLmxvYWRlcigpLmNoYW5nZUxvY2F0aW9uKFVSTCB7IFVSTCB7IH0sIHVybCB9LCB7IH0s IG51bGxwdHIsIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3YXJkTGlzdDo6Tm8sIFJlZmVy cmVyUG9saWN5OjpFbXB0eVN0cmluZywgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hv dWxkTm90QWxsb3cpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmNwcAppbmRleCA5ZDk1ZGUyYTIwMmE4N2M2YzZhY2ZiNGJiOGM0ZDk4YTA1 YmNiODA5Li4yNzM2ODdjMzdiZWY0NzAwYTFiNjY2ZmE0YmE5MTA3NjE4YTEzZTk3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMTY3MCw3ICsx NjcwLDcgQEAgdm9pZCBXZWJQYWdlOjpuYXZpZ2F0ZVRvUERGTGlua1dpdGhTaW11bGF0ZWRDbGlj ayhjb25zdCBTdHJpbmcmIHVybCwgSW50UG9pbnQgZG8KICAgICBhdXRvIG1vdXNlRXZlbnQgPSBN b3VzZUV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLmNsaWNrRXZlbnQsIEV2ZW50OjpDYW5CdWJi bGU6OlllcywgRXZlbnQ6OklzQ2FuY2VsYWJsZTo6WWVzLCBFdmVudDo6SXNDb21wb3NlZDo6WWVz LAogICAgICAgICBNb25vdG9uaWNUaW1lOjpub3coKSwgbnVsbHB0ciwgc2luZ2xlQ2xpY2ssIHNj cmVlblBvaW50LCBkb2N1bWVudFBvaW50LCB7IH0sIHsgfSwgMCwgMCwgbnVsbHB0ciwgMCwgV2Vi Q29yZTo6Tm9UYXApOwogCi0gICAgbWFpbkZyYW1lLT5sb2FkZXIoKS51cmxTZWxlY3RlZChtYWlu RnJhbWVEb2N1bWVudC0+Y29tcGxldGVVUkwodXJsKSwgZW1wdHlTdHJpbmcoKSwgbW91c2VFdmVu dC5wdHIoKSwgTG9ja0hpc3Rvcnk6Ok5vLCBMb2NrQmFja0ZvcndhcmRMaXN0OjpObywgUmVmZXJy ZXJQb2xpY3k6Ok5vUmVmZXJyZXIsIFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNob3Vs ZE5vdEFsbG93KTsKKyAgICBtYWluRnJhbWUtPmxvYWRlcigpLmNoYW5nZUxvY2F0aW9uKG1haW5G cmFtZURvY3VtZW50LT5jb21wbGV0ZVVSTCh1cmwpLCBlbXB0eVN0cmluZygpLCBtb3VzZUV2ZW50 LnB0cigpLCBMb2NrSGlzdG9yeTo6Tm8sIExvY2tCYWNrRm9yd2FyZExpc3Q6Ok5vLCBSZWZlcnJl clBvbGljeTo6Tm9SZWZlcnJlciwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeTo6U2hvdWxk Tm90QWxsb3cpOwogfQogCiB2b2lkIFdlYlBhZ2U6OnN0b3BMb2FkaW5nRnJhbWUoRnJhbWVJZGVu dGlmaWVyIGZyYW1lSUQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJD b3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5 L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5jcHAKaW5kZXggZGQ4ZWJi NTFhYWEzMTM1YmYwNDY4ZDYxNTJkOWZlOWRjNjQzMmQyMS4uYzI2NWUwODNlMWY3YzlhZmM4M2Jj OGUwMWU4ZjQ0ZWVmN2FiNTNiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4v V2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXRMZWdhY3kvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50LmNwcApAQCAt NjYsNyArNjYsNyBAQCB2b2lkIFdlYkNvbnRleHRNZW51Q2xpZW50OjpzZWFyY2hXaXRoR29vZ2xl KGNvbnN0IEZyYW1lKiBmcmFtZSkKIAogICAgIGlmIChQYWdlKiBwYWdlID0gZnJhbWUtPnBhZ2Uo KSkgewogICAgICAgICBVc2VyR2VzdHVyZUluZGljYXRvciBpbmRpY2F0b3IoUHJvY2Vzc2luZ1Vz ZXJHZXN0dXJlKTsKLSAgICAgICAgcGFnZS0+bWFpbkZyYW1lKCkubG9hZGVyKCkudXJsU2VsZWN0 ZWQoVVJMIHsgVVJMIHsgfSwgdXJsIH0sIHsgfSwgbnVsbHB0ciwgTG9ja0hpc3Rvcnk6Ok5vLCBM b2NrQmFja0ZvcndhcmRMaXN0OjpObywgUmVmZXJyZXJQb2xpY3k6OkVtcHR5U3RyaW5nLCBTaG91 bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGROb3RBbGxvdyk7CisgICAgICAgIHBhZ2Ut Pm1haW5GcmFtZSgpLmxvYWRlcigpLmNoYW5nZUxvY2F0aW9uKFVSTCB7IFVSTCB7IH0sIHVybCB9 LCB7IH0sIG51bGxwdHIsIExvY2tIaXN0b3J5OjpObywgTG9ja0JhY2tGb3J3YXJkTGlzdDo6Tm8s IFJlZmVycmVyUG9saWN5OjpFbXB0eVN0cmluZywgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGlj eTo6U2hvdWxkTm90QWxsb3cpOwogICAgIH0KIH0KIAo=