119658 2013-08-10 23:06:38 -0700 Remove didNewFirstVisuallyNonEmptyLayout from WebKit2 2013-08-12 13:55:01 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin bdakin andersca bdakin darin sam thorton oldest_to_newest 916085 0 bdakin 2013-08-10 23:06:38 -0700 We should remove or at least deprecate didNewFirstVisuallyNonEmptyLayout from WebKit2. We think it will be okay to remove it entirely, so I will try that first. 916086 1 208486 bdakin 2013-08-10 23:09:29 -0700 Created attachment 208486 Patch 916132 2 darin 2013-08-11 10:29:51 -0700 Won’t this create problems for someone using an older Safari with a newer WebKit? 916138 3 bdakin 2013-08-11 11:08:30 -0700 (In reply to comment #2) > Won’t this create problems for someone using an older Safari with a newer WebKit? Sam's opinion was that the lost functionality would be acceptable in nightly builds, and that if we did find it to be a bigger problem than anticipated, we could roll this patch out and deprecate the function instead. 916312 4 darin 2013-08-12 09:37:52 -0700 (In reply to comment #3) > (In reply to comment #2) > > Won’t this create problems for someone using an older Safari with a newer WebKit? > > Sam's opinion was that the lost functionality would be acceptable in nightly builds Got it. I couldn’t tell from anything in the patch that we’d considered this when deciding it was OK. Even if it was just your opinion, I’d be fine with it. From the patch it wasn’t clear it was an intentional decision. 916313 5 208486 darin 2013-08-12 09:39:54 -0700 Comment on attachment 208486 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=208486&action=review > Source/WebKit2/UIProcess/WebLoaderClient.h:66 > + // FIXME: We should consider removing didFirstVisuallyNonEmptyLayoutForFrame since its functionality is replaced by didLayout. I would like a shorter comment. I’m not sure the word “functionality” adds anything here. // FIXME: Remove didFirstVisuallyNonEmptyLayoutForFrame; clients should use didLayout instead. 916391 6 bdakin 2013-08-12 13:55:01 -0700 Thanks Darin! I shortened the comment and added some information to the Changelog about why we think this is okay to remove. I committed the change with http://trac.webkit.org/changeset/153956 208486 2013-08-10 23:09:29 -0700 2013-08-12 09:39:54 -0700 Patch deprecate.txt text/plain 18486 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzkyMSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDEzLTA4LTEwICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgZGlkTmV3Rmlyc3RWaXN1 YWxseU5vbkVtcHR5TGF5b3V0IGZyb20gV2ViS2l0MgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5NjU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmg6CisgICAg ICAgICogVUlQcm9jZXNzL1dlYkxvYWRlckNsaWVudC5jcHA6CisgICAgICAgICogVUlQcm9jZXNz L1dlYkxvYWRlckNsaWVudC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmluaXRpYWxpemVMb2FkZXJDbGllbnQp OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0 ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9Jbmpl Y3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAq IFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50 Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNs aWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRj aERpZExheW91dCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjppbml0aWFsaXplSW5qZWN0ZWRCdW5kbGVMb2FkZXJD bGllbnQpOgorCiAyMDEzLTA4LTA5ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KIAog ICAgICAgICBBWDogTm90IGFibGUgdG8gdXNlIGFycm93IGtleXMgdG8gcmVhZCB0ZXh0IGluIGEg V0syIGFwcApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkxvYWRlckNsaWVudC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkxvYWRlckNsaWVu dC5jcHAJKHJldmlzaW9uIDE1MzkwOCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJM b2FkZXJDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjYsMTQgKzEyNiw2IEBAIHZvaWQg V2ViTG9hZGVyQ2xpZW50OjpkaWRGaXJzdFZpc3VhbGx5Tm8KICAgICBtX2NsaWVudC5kaWRGaXJz dFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JGcmFtZSh0b0FQSShwYWdlKSwgdG9BUEkoZnJhbWUp LCB0b0FQSSh1c2VyRGF0YSksIG1fY2xpZW50LmNsaWVudEluZm8pOwogfQogCi12b2lkIFdlYkxv YWRlckNsaWVudDo6ZGlkTmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0KFdlYlBhZ2VQcm94 eSogcGFnZSwgQVBJT2JqZWN0KiB1c2VyRGF0YSkKLXsKLSAgICBpZiAoIW1fY2xpZW50LmRpZE5l d0ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgbV9j bGllbnQuZGlkTmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0KHRvQVBJKHBhZ2UpLCB0b0FQ SSh1c2VyRGF0YSksIG1fY2xpZW50LmNsaWVudEluZm8pOwotfQotCiB2b2lkIFdlYkxvYWRlckNs aWVudDo6ZGlkTGF5b3V0KFdlYlBhZ2VQcm94eSogcGFnZSwgTGF5b3V0TWlsZXN0b25lcyBtaWxl c3RvbmVzLCBBUElPYmplY3QqIHVzZXJEYXRhKQogewogICAgIGlmICghbV9jbGllbnQuZGlkTGF5 b3V0KQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkxvYWRlckNsaWVudC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJMb2FkZXJDbGllbnQuaAko cmV2aXNpb24gMTUzOTA4KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkxvYWRlckNs aWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC02MiwxNSArNjIsMTUgQEAgcHVibGljOgogICAgIHZv aWQgZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lKFdlYlBhZ2VQcm94eSosIFdlYkZy YW1lUHJveHkqLCBTYW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlwZSwgQVBJT2JqZWN0Kik7CiAgICAg dm9pZCBkaWRSZWNlaXZlVGl0bGVGb3JGcmFtZShXZWJQYWdlUHJveHkqLCBjb25zdCBTdHJpbmcm LCBXZWJGcmFtZVByb3h5KiwgQVBJT2JqZWN0Kik7CiAgICAgdm9pZCBkaWRGaXJzdExheW91dEZv ckZyYW1lKFdlYlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkqLCBBUElPYmplY3QqKTsKKworICAg IC8vIEZJWE1FOiBXZSBzaG91bGQgY29uc2lkZXIgcmVtb3ZpbmcgZGlkRmlyc3RWaXN1YWxseU5v bkVtcHR5TGF5b3V0Rm9yRnJhbWUgc2luY2UgaXRzIGZ1bmN0aW9uYWxpdHkgaXMgcmVwbGFjZWQg YnkgZGlkTGF5b3V0LgogICAgIHZvaWQgZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9y RnJhbWUoV2ViUGFnZVByb3h5KiwgV2ViRnJhbWVQcm94eSosIEFQSU9iamVjdCopOworCiAgICAg dm9pZCBkaWRSZW1vdmVGcmFtZUZyb21IaWVyYXJjaHkoV2ViUGFnZVByb3h5KiwgV2ViRnJhbWVQ cm94eSosIEFQSU9iamVjdCopOwogICAgIHZvaWQgZGlkRGlzcGxheUluc2VjdXJlQ29udGVudEZv ckZyYW1lKFdlYlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkqLCBBUElPYmplY3QqKTsKICAgICB2 b2lkIGRpZFJ1bkluc2VjdXJlQ29udGVudEZvckZyYW1lKFdlYlBhZ2VQcm94eSosIFdlYkZyYW1l UHJveHkqLCBBUElPYmplY3QqKTsKICAgICB2b2lkIGRpZERldGVjdFhTU0ZvckZyYW1lKFdlYlBh Z2VQcm94eSosIFdlYkZyYW1lUHJveHkqLCBBUElPYmplY3QqKTsKIAotICAgIC8vIEZJWE1FOiBk aWROZXdGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQgc2hvdWxkIGJlIHJlbW92ZWQuIFdlIHNo b3VsZCBjb25zaWRlciByZW1vdmluZyBkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JG cmFtZQotICAgIC8vIGFzIHdlbGwuIFRoZXkgYXJlIGJvdGggYmVpbmcgcmVwbGFjZWQgYnkgZGlk TGF5b3V0LgotICAgIHZvaWQgZGlkTmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0KFdlYlBh Z2VQcm94eSosIEFQSU9iamVjdCopOwogICAgIHZvaWQgZGlkTGF5b3V0KFdlYlBhZ2VQcm94eSos IFdlYkNvcmU6OkxheW91dE1pbGVzdG9uZXMsIEFQSU9iamVjdCopOwogICAgIAogICAgIGJvb2wg Y2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFjZUluRnJhbWUoV2ViUGFnZVByb3h5 KiwgV2ViRnJhbWVQcm94eSosIFdlYlByb3RlY3Rpb25TcGFjZSopOwpJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDE1MzkwOCkKKysrIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC00MjEsOCArNDIxLDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmluaXRpYWxpemVMb2FkZXJDbGll bgogICAgICAgICBtaWxlc3RvbmVzIHw9IFdlYkNvcmU6OkRpZEZpcnN0TGF5b3V0OwogICAgIGlm IChsb2FkQ2xpZW50LT5kaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JGcmFtZSkKICAg ICAgICAgbWlsZXN0b25lcyB8PSBXZWJDb3JlOjpEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlv dXQ7Ci0gICAgaWYgKGxvYWRDbGllbnQtPmRpZE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91 dCkKLSAgICAgICAgbWlsZXN0b25lcyB8PSBXZWJDb3JlOjpEaWRIaXRSZWxldmFudFJlcGFpbnRl ZE9iamVjdHNBcmVhVGhyZXNob2xkOwogCiAgICAgaWYgKG1pbGVzdG9uZXMpCiAgICAgICAgIG1f cHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6TGlzdGVuRm9yTGF5b3V0TWlsZXN0b25l cyhtaWxlc3RvbmVzKSwgbV9wYWdlSUQpOwpAQCAtMjM5NywxNiArMjM5NSw2IEBAIHZvaWQgV2Vi UGFnZVByb3h5OjpkaWRGaXJzdFZpc3VhbGx5Tm9uRW0KICAgICBtX2xvYWRlckNsaWVudC5kaWRG aXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JGcmFtZSh0aGlzLCBmcmFtZSwgdXNlckRhdGEu Z2V0KCkpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6ZGlkTmV3Rmlyc3RWaXN1YWxseU5vbkVt cHR5TGF5b3V0KENvcmVJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVyKQotewotICAgIFJlZlB0 cjxBUElPYmplY3Q+IHVzZXJEYXRhOwotICAgIFdlYkNvbnRleHRVc2VyTWVzc2FnZURlY29kZXIg bWVzc2FnZURlY29kZXIodXNlckRhdGEsIG1fcHJvY2Vzcy5nZXQoKSk7Ci0gICAgaWYgKCFkZWNv ZGVyLmRlY29kZShtZXNzYWdlRGVjb2RlcikpCi0gICAgICAgIHJldHVybjsKLQotICAgIG1fbG9h ZGVyQ2xpZW50LmRpZE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCh0aGlzLCB1c2VyRGF0 YS5nZXQoKSk7Ci19Ci0KIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRMYXlvdXQodWludDMyX3QgbGF5 b3V0TWlsZXN0b25lcywgQ29yZUlQQzo6TWVzc2FnZURlY29kZXImIGRlY29kZXIpCiB7CiAgICAg UmVmUHRyPEFQSU9iamVjdD4gdXNlckRhdGE7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiAxNTM5MDgpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTgxNiw3ICs4MTYsNiBAQCBw cml2YXRlOgogICAgIHZvaWQgZGlkUmVjZWl2ZVRpdGxlRm9yRnJhbWUodWludDY0X3QgZnJhbWVJ RCwgY29uc3QgU3RyaW5nJiwgQ29yZUlQQzo6TWVzc2FnZURlY29kZXImKTsKICAgICB2b2lkIGRp ZEZpcnN0TGF5b3V0Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgQ29yZUlQQzo6TWVzc2FnZURl Y29kZXImKTsKICAgICB2b2lkIGRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZvckZyYW1l KHVpbnQ2NF90IGZyYW1lSUQsIENvcmVJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7Ci0gICAgdm9pZCBk aWROZXdGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQoQ29yZUlQQzo6TWVzc2FnZURlY29kZXIm KTsKICAgICB2b2lkIGRpZExheW91dCh1aW50MzJfdCBsYXlvdXRNaWxlc3RvbmVzLCBDb3JlSVBD OjpNZXNzYWdlRGVjb2RlciYpOwogICAgIHZvaWQgZGlkUmVtb3ZlRnJhbWVGcm9tSGllcmFyY2h5 KHVpbnQ2NF90IGZyYW1lSUQsIENvcmVJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7CiAgICAgdm9pZCBk aWREaXNwbGF5SW5zZWN1cmVDb250ZW50Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgQ29yZUlQ Qzo6TWVzc2FnZURlY29kZXImKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgkocmV2aXNpb24gMTUzOTA4KQorKysgU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgkod29ya2luZyBjb3B5 KQpAQCAtMTIzLDcgKzEyMyw2IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2VQcm94eSB7CiAgICAgRGlk RmluaXNoTG9hZEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIFdlYktpdDo6SW5qZWN0ZWRCdW5k bGVVc2VyTWVzc2FnZUVuY29kZXIgdXNlckRhdGEpIFZhcmlhZGljCiAgICAgRGlkRmlyc3RMYXlv dXRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBXZWJLaXQ6OkluamVjdGVkQnVuZGxlVXNlck1l c3NhZ2VFbmNvZGVyIHVzZXJEYXRhKSBWYXJpYWRpYwogICAgIERpZEZpcnN0VmlzdWFsbHlOb25F bXB0eUxheW91dEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIFdlYktpdDo6SW5qZWN0ZWRCdW5k bGVVc2VyTWVzc2FnZUVuY29kZXIgdXNlckRhdGEpIFZhcmlhZGljCi0gICAgRGlkTmV3Rmlyc3RW aXN1YWxseU5vbkVtcHR5TGF5b3V0KFdlYktpdDo6SW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVu Y29kZXIgdXNlckRhdGEpIFZhcmlhZGljCiAgICAgRGlkTGF5b3V0KHVpbnQzMl90IHR5cGUsIFdl YktpdDo6SW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIgdXNlckRhdGEpIFZhcmlhZGlj CiAgICAgRGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUo dWludDY0X3QgZnJhbWVJRCwgV1RGOjpTdHJpbmcgdXJsLCBXZWJLaXQ6OkluamVjdGVkQnVuZGxl VXNlck1lc3NhZ2VFbmNvZGVyIHVzZXJEYXRhKSBWYXJpYWRpYwogICAgIERpZFJlbW92ZUZyYW1l RnJvbUhpZXJhcmNoeSh1aW50NjRfdCBmcmFtZUlELCBXZWJLaXQ6OkluamVjdGVkQnVuZGxlVXNl ck1lc3NhZ2VFbmNvZGVyIHVzZXJEYXRhKSBWYXJpYWRpYwpJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAkocmV2aXNpb24gMTUzOTA4KQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC03OSw3ICs3OSw2 IEBAIHR5cGVkZWYgYm9vbCAoKldLUGFnZUNhbkF1dGhlbnRpY2F0ZUFnYWkKIHR5cGVkZWYgdm9p ZCAoKldLUGFnZURpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZUluRnJhbWVDYWxsYmFj aykoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLQXV0aGVudGljYXRpb25DaGFs bGVuZ2VSZWYgYXV0aGVudGljYXRpb25DaGFsbGVuZ2UsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8p OwogdHlwZWRlZiB2b2lkICgqV0tQYWdlRGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0Q2FsbGJhY2sp KFdLUGFnZVJlZiBwYWdlLCBXS0JhY2tGb3J3YXJkTGlzdEl0ZW1SZWYgYWRkZWRJdGVtLCBXS0Fy cmF5UmVmIHJlbW92ZWRJdGVtcywgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CiB0eXBlZGVmIGJv b2wgKCpXS1BhZ2VTaG91bGRHb1RvQmFja0ZvcndhcmRMaXN0SXRlbUNhbGxiYWNrKShXS1BhZ2VS ZWYgcGFnZSwgV0tCYWNrRm9yd2FyZExpc3RJdGVtUmVmIGl0ZW0sIGNvbnN0IHZvaWQgKmNsaWVu dEluZm8pOwotdHlwZWRlZiB2b2lkICgqV0tQYWdlRGlkTmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5 TGF5b3V0Q2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS1R5cGVSZWYgdXNlckRhdGEsIGNvbnN0 IHZvaWQgKmNsaWVudEluZm8pOwogdHlwZWRlZiB2b2lkICgqV0tQYWdlV2lsbEdvVG9CYWNrRm9y d2FyZExpc3RJdGVtQ2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS0JhY2tGb3J3YXJkTGlzdEl0 ZW1SZWYgaXRlbSwgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsK IHR5cGVkZWYgdm9pZCAoKldLUGFnZURpZExheW91dENhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwg V0tMYXlvdXRNaWxlc3RvbmVzIG1pbGVzdG9uZXMsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qg dm9pZCAqY2xpZW50SW5mbyk7CiB0eXBlZGVmIFdLUGx1Z2luTG9hZFBvbGljeSAoKldLUGFnZVBs dWdpbkxvYWRQb2xpY3lDYWxsYmFjaykoV0tQYWdlUmVmIHBhZ2UsIFdLUGx1Z2luTG9hZFBvbGlj eSBjdXJyZW50UGx1Z2luTG9hZFBvbGljeSwgV0tEaWN0aW9uYXJ5UmVmIHBsdWdpbkluZm9EaWN0 aW9uYXJ5LCBXS1N0cmluZ1JlZiogdW5hdmFpbGFiaWxpdHlEZXNjcmlwdGlvbiwgY29uc3Qgdm9p ZCogY2xpZW50SW5mbyk7CkBAIC0xMjYsOSArMTI1LDcgQEAgc3RydWN0IFdLUGFnZUxvYWRlckNs aWVudCB7CiAgICAgLy8gVmVyc2lvbiAxCiAgICAgV0tQYWdlRGlkRGV0ZWN0WFNTRm9yRnJhbWVD YWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWREZXRlY3RYU1NGb3JG cmFtZTsKIAotICAgIC8vIEZJWE1FOiBkaWROZXdGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQg c2hvdWxkIGJlIHJlbW92ZWQuIFdlIHNob3VsZCBjb25zaWRlciByZW1vdmluZyBkaWRGaXJzdFZp c3VhbGx5Tm9uRW1wdHlMYXlvdXRGb3JGcmFtZQotICAgIC8vIGFzIHdlbGwuIFRoZWlyIGZ1bmN0 aW9uYWxpdHkgaXMgcmVwbGFjZWQgYnkgZGlkTGF5b3V0LgotICAgIFdLUGFnZURpZE5ld0ZpcnN0 VmlzdWFsbHlOb25FbXB0eUxheW91dENhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgZGlkTmV3 Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0OworICAgIHZvaWQqICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkTmV3Rmlyc3RW aXN1YWxseU5vbkVtcHR5TGF5b3V0X3VuYXZhaWxhYmxlOwogCiAgICAgV0tQYWdlV2lsbEdvVG9C YWNrRm9yd2FyZExpc3RJdGVtQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICB3aWxs R29Ub0JhY2tGb3J3YXJkTGlzdEl0ZW07CiAKQEAgLTE0MCw3ICsxMzcsNyBAQCBzdHJ1Y3QgV0tQ YWdlTG9hZGVyQ2xpZW50IHsKICAgICB2b2lkICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICgqcmVnaXN0ZXJJbnRlbnRTZXJ2aWNl Rm9yRnJhbWVfdW5hdmFpbGFibGUpKHZvaWQpOwogCiAgICAgV0tQYWdlRGlkTGF5b3V0Q2FsbGJh Y2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWRMYXlvdXQ7 Ci0gICAgV0tQYWdlUGx1Z2luTG9hZFBvbGljeUNhbGxiYWNrX2RlcHJlY2F0ZWRGb3JVc2VXaXRo VjIgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBsdWdpbkxvYWRQb2xpY3lf ZGVwcmVjYXRlZEZvclVzZVdpdGhWMjsKKyAgICBXS1BhZ2VQbHVnaW5Mb2FkUG9saWN5Q2FsbGJh Y2tfZGVwcmVjYXRlZEZvclVzZVdpdGhWMiAgICAgICAgICAgICAgIHBsdWdpbkxvYWRQb2xpY3lf ZGVwcmVjYXRlZEZvclVzZVdpdGhWMjsKICAgICBXS1BhZ2VQbHVnaW5EaWRGYWlsQ2FsbGJhY2sg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBsdWdpbkRpZEZhaWw7CiAK ICAgICAvLyBWZXJzaW9uIDMKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0 ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxl UGFnZUxvYWRlckNsaWVudC5jcHAJKHJldmlzaW9uIDE1MzkwOCkKKysrIFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjQ3LDE2ICsyNDcsNiBAQCB2b2lkIEluamVjdGVkQnVu ZGxlUGFnZUxvYWRlckNsaWVudDo6ZGlkCiAgICAgbV9jbGllbnQuZGlkTGF5b3V0Rm9yRnJhbWUo dG9BUEkocGFnZSksIHRvQVBJKGZyYW1lKSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CiB9CiAKLXZv aWQgSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50OjpkaWROZXdGaXJzdFZpc3VhbGx5Tm9u RW1wdHlMYXlvdXQoV2ViUGFnZSogcGFnZSwgUmVmUHRyPEFQSU9iamVjdD4mIHVzZXJEYXRhKQot ewotICAgIGlmICghbV9jbGllbnQuZGlkTmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0KQot ICAgICAgICByZXR1cm47Ci0gICAgCi0gICAgV0tUeXBlUmVmIHVzZXJEYXRhVG9QYXNzID0gMDsK LSAgICBtX2NsaWVudC5kaWROZXdGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQodG9BUEkocGFn ZSksICZ1c2VyRGF0YVRvUGFzcywgbV9jbGllbnQuY2xpZW50SW5mbyk7Ci0gICAgdXNlckRhdGEg PSBhZG9wdFJlZih0b0ltcGwodXNlckRhdGFUb1Bhc3MpKTsKLX0KLQogdm9pZCBJbmplY3RlZEJ1 bmRsZVBhZ2VMb2FkZXJDbGllbnQ6OmRpZExheW91dChXZWJQYWdlKiBwYWdlLCBMYXlvdXRNaWxl c3RvbmVzIG1pbGVzdG9uZXMsIFJlZlB0cjxBUElPYmplY3Q+JiB1c2VyRGF0YSkKIHsKICAgICBp ZiAoIW1fY2xpZW50LmRpZExheW91dCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv SW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1 bmRsZVBhZ2VMb2FkZXJDbGllbnQuaAkocmV2aXNpb24gMTUzOTA4KQorKysgU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGll bnQuaAkod29ya2luZyBjb3B5KQpAQCAtNzUsNyArNzUsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBk aWRGaXJzdExheW91dEZvckZyYW1lKFdlYlBhZ2UqLCBXZWJGcmFtZSosIFJlZlB0cjxBUElPYmpl Y3Q+JiB1c2VyRGF0YSk7CiAgICAgdm9pZCBkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRG b3JGcmFtZShXZWJQYWdlKiwgV2ViRnJhbWUqLCBSZWZQdHI8QVBJT2JqZWN0PiYgdXNlckRhdGEp OwogICAgIHZvaWQgZGlkTGF5b3V0Rm9yRnJhbWUoV2ViUGFnZSosIFdlYkZyYW1lKik7Ci0gICAg dm9pZCBkaWROZXdGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQoV2ViUGFnZSosIFdURjo6UmVm UHRyPEFQSU9iamVjdD4mIHVzZXJEYXRhKTsKICAgICB2b2lkIGRpZExheW91dChXZWJQYWdlKiwg V2ViQ29yZTo6TGF5b3V0TWlsZXN0b25lcywgUmVmUHRyPEFQSU9iamVjdD4mIHVzZXJEYXRhKTsK IAogICAgIHZvaWQgZGlkQ2xlYXJXaW5kb3dPYmplY3RGb3JGcmFtZShXZWJQYWdlKiwgV2ViRnJh bWUqLCBXZWJDb3JlOjpET01XcmFwcGVyV29ybGQqKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRs ZVBhZ2UuaAkocmV2aXNpb24gMTUzOTA4KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9J bmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtOTcs NyArOTcsNiBAQCB0eXBlZGVmIHZvaWQgKCpXS0J1bmRsZVBhZ2VEaWRSdW5JbnNlY3VyCiB0eXBl ZGVmIHZvaWQgKCpXS0J1bmRsZVBhZ2VEaWREZXRlY3RYU1NGb3JGcmFtZUNhbGxiYWNrKShXS0J1 bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwgV0tUeXBlUmVmKiB1c2Vy RGF0YSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS0J1bmRsZVBh Z2VEaWRGaXJzdExheW91dEZvckZyYW1lQ2FsbGJhY2spKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBX S0J1bmRsZUZyYW1lUmVmIGZyYW1lLCBXS1R5cGVSZWYqIHVzZXJEYXRhLCBjb25zdCB2b2lkICpj bGllbnRJbmZvKTsKIHR5cGVkZWYgdm9pZCAoKldLQnVuZGxlUGFnZURpZEZpcnN0VmlzdWFsbHlO b25FbXB0eUxheW91dEZvckZyYW1lQ2FsbGJhY2spKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBXS0J1 bmRsZUZyYW1lUmVmIGZyYW1lLCBXS1R5cGVSZWYqIHVzZXJEYXRhLCBjb25zdCB2b2lkICpjbGll bnRJbmZvKTsKLXR5cGVkZWYgdm9pZCAoKldLQnVuZGxlUGFnZURpZE5ld0ZpcnN0VmlzdWFsbHlO b25FbXB0eUxheW91dENhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tUeXBlUmVmKiB1 c2VyRGF0YSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS0J1bmRs ZVBhZ2VEaWRMYXlvdXRGb3JGcmFtZUNhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tC dW5kbGVGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7CiB0eXBlZGVmIHZv aWQgKCpXS0J1bmRsZVBhZ2VEaWRDbGVhcldpbmRvd09iamVjdEZvckZyYW1lQ2FsbGJhY2spKFdL QnVuZGxlUGFnZVJlZiBwYWdlLCBXS0J1bmRsZUZyYW1lUmVmIGZyYW1lLCBXS0J1bmRsZVNjcmlw dFdvcmxkUmVmIHdvcmxkLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKIHR5cGVkZWYgdm9pZCAo KldLQnVuZGxlUGFnZURpZENhbmNlbENsaWVudFJlZGlyZWN0Rm9yRnJhbWVDYWxsYmFjaykoV0tC dW5kbGVQYWdlUmVmIHBhZ2UsIFdLQnVuZGxlRnJhbWVSZWYgZnJhbWUsIGNvbnN0IHZvaWQgKmNs aWVudEluZm8pOwpAQCAtMTQwLDcgKzEzOSw3IEBAIHN0cnVjdCBXS0J1bmRsZVBhZ2VMb2FkZXJD bGllbnQgewogCiAgICAgLy8gVmVyc2lvbiAxLgogICAgIFdLQnVuZGxlUGFnZURpZExheW91dEZv ckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZExheW91 dEZvckZyYW1lOwotICAgIFdLQnVuZGxlUGFnZURpZE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0eUxh eW91dENhbGxiYWNrICAgICAgICAgICAgICAgICAgIGRpZE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0 eUxheW91dDsKKyAgICB2b2lkICogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWROZXdGaXJzdFZpc3VhbGx5Tm9uRW1wdHlM YXlvdXRfdW5hdmFpbGFibGU7CiAgICAgV0tCdW5kbGVQYWdlRGlkRGV0ZWN0WFNTRm9yRnJhbWVD YWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkRGV0ZWN0WFNTRm9yRnJh bWU7CiAgICAgV0tCdW5kbGVQYWdlU2hvdWxkR29Ub0JhY2tGb3J3YXJkTGlzdEl0ZW1DYWxsYmFj ayAgICAgICAgICAgICAgICAgICAgICAgc2hvdWxkR29Ub0JhY2tGb3J3YXJkTGlzdEl0ZW07CiAg ICAgV0tCdW5kbGVQYWdlR2xvYmFsT2JqZWN0SXNBdmFpbGFibGVGb3JGcmFtZUNhbGxiYWNrICAg ICAgICAgICAgICAgICAgICAgZ2xvYmFsT2JqZWN0SXNBdmFpbGFibGVGb3JGcmFtZTsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD bGllbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29y ZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCShyZXZpc2lvbiAxNTM5MDgpCisrKyBT b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xp ZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTY3LDEyICs1NjcsNiBAQCB2b2lkIFdlYkZyYW1l TG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZExhCiAgICAgICAgIHdlYlBhZ2UtPmluamVjdGVkQnVu ZGxlTG9hZGVyQ2xpZW50KCkuZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9yRnJhbWUo d2ViUGFnZSwgbV9mcmFtZSwgdXNlckRhdGEpOwogICAgICAgICB3ZWJQYWdlLT5zZW5kKE1lc3Nh Z2VzOjpXZWJQYWdlUHJveHk6OkRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZvckZyYW1l KG1fZnJhbWUtPmZyYW1lSUQoKSwgSW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIodXNl ckRhdGEuZ2V0KCkpKSk7CiAgICAgfQotCi0gICAgaWYgKG1pbGVzdG9uZXMgJiBEaWRIaXRSZWxl dmFudFJlcGFpbnRlZE9iamVjdHNBcmVhVGhyZXNob2xkKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBU aGlzIGNhbiBnbyBhd2F5IHdoZW4gd2UgcmVtb3ZlIGRpZE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0 eUxheW91dC4KLSAgICAgICAgd2ViUGFnZS0+aW5qZWN0ZWRCdW5kbGVMb2FkZXJDbGllbnQoKS5k aWROZXdGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQod2ViUGFnZSwgdXNlckRhdGEpOwotICAg ICAgICB3ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZE5ld0ZpcnN0Vmlz dWFsbHlOb25FbXB0eUxheW91dChJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2Rlcih1c2Vy RGF0YS5nZXQoKSkpKTsKLSAgICB9CiB9CiAKIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRp c3BhdGNoRGlkTGF5b3V0KCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHAJKHJldmlzaW9uIDE1MzkwOCkKKysrIFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDk0LDggKzQ5 NCw2IEBAIHZvaWQgV2ViUGFnZTo6aW5pdGlhbGl6ZUluamVjdGVkQnVuZGxlTG8KICAgICAgICAg ICAgIG1pbGVzdG9uZXMgfD0gV2ViQ29yZTo6RGlkRmlyc3RMYXlvdXQ7CiAgICAgICAgIGlmIChj bGllbnQtPmRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZvckZyYW1lKQogICAgICAgICAg ICAgbWlsZXN0b25lcyB8PSBXZWJDb3JlOjpEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQ7 Ci0gICAgICAgIGlmIChjbGllbnQtPmRpZE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCkK LSAgICAgICAgICAgIG1pbGVzdG9uZXMgfD0gV2ViQ29yZTo6RGlkSGl0UmVsZXZhbnRSZXBhaW50 ZWRPYmplY3RzQXJlYVRocmVzaG9sZDsKICAgICB9CiAKICAgICBpZiAobWlsZXN0b25lcykKSW5k ZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlz aW9uIDE1MzkyMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDE3IEBACisyMDEzLTA4LTEwICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAg ICAgICBSZW1vdmUgZGlkTmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0IGZyb20gV2ViS2l0 MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5NjU4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNaW5p QnJvd3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubToKKyAgICAgICAgKC1bV0sy QnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgYXdha2VGcm9tTmliXSk6CisgICAgICAgICogV2ViS2l0 VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuY3BwOgorICAgICAg ICAoV1RSOjpJbmplY3RlZEJ1bmRsZVBhZ2U6OkluamVjdGVkQnVuZGxlUGFnZSk6CisgICAgICAg ICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXVFI6OlRl c3RDb250cm9sbGVyOjpjcmVhdGVXZWJWaWV3V2l0aE9wdGlvbnMpOgorCiAyMDEzLTA4LTA5ICBH dXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxndXN0YXZvLm5vcm9uaGFAY29sbGFib3JhLmNvbT4KIAog ICAgICAgICBbR1RLXSBNaXNzZXMgbW9kX3NzbCBhbmQgcGhwIGluIHRoZSBsaXN0IG9mIHBhY2th Z2VzIHJlcXVpcmVkIGZvciB0ZXN0cyBmb3IgeXVtCkluZGV4OiBUb29scy9NaW5pQnJvd3Nlci9t YWMvV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9NaW5p QnJvd3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQkocmV2aXNpb24gMTUzOTA4 KQorKysgVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0J KHdvcmtpbmcgY29weSkKQEAgLTY1Myw3ICs2NTMsNyBAQCAtICh2b2lkKWF3YWtlRnJvbU5pYgog ICAgICAgICAwLCAvLyBzaG91bGRHb1RvQmFja0ZvcndhcmRJdGVtCiAgICAgICAgIDAsIC8vIGRp ZEZhaWxUb0luaXRpYWxpemVQbHVnaW4KICAgICAgICAgZGlkRGV0ZWN0WFNTRm9yRnJhbWUsCi0g ICAgICAgIDAsIC8vIGRpZE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dAorICAgICAgICAw LCAvLyBkaWROZXdGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRfdW5hdmFpbGFibGUKICAgICAg ICAgMCwgLy8gd2lsbEdvVG9CYWNrRm9yd2FyZExpc3RJdGVtCiAgICAgICAgIDAsIC8vIGludGVy YWN0aW9uT2NjdXJyZWRXaGlsZVByb2Nlc3NVbnJlc3BvbnNpdmUKICAgICAgICAgMCwgLy8gcGx1 Z2luRGlkRmFpbF9kZXByZWNhdGVkRm9yVXNlV2l0aFYxCkluZGV4OiBUb29scy9XZWJLaXRUZXN0 UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9XZWJLaXRUZXN0 UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAkocmV2aXNpb24gMTUzOTA4KQorKysgVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ4MCw3 ICs0ODAsNyBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpjcmVhdGVXZWJWaWV3V2l0aE9wCiAgICAg ICAgIDAsIC8vIHNob3VsZEdvVG9CYWNrRm9yd2FyZExpc3RJdGVtCiAgICAgICAgIDAsIC8vIGRp ZFJ1bkluc2VjdXJlQ29udGVudEZvckZyYW1lCiAgICAgICAgIDAsIC8vIGRpZERldGVjdFhTU0Zv ckZyYW1lCi0gICAgICAgIDAsIC8vIGRpZE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dAor ICAgICAgICAwLCAvLyBkaWROZXdGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRfdW5hdmFpbGFi bGUKICAgICAgICAgMCwgLy8gd2lsbEdvVG9CYWNrRm9yd2FyZExpc3RJdGVtCiAgICAgICAgIDAs IC8vIGludGVyYWN0aW9uT2NjdXJyZWRXaGlsZVByb2Nlc3NVbnJlc3BvbnNpdmUKICAgICAgICAg MCwgLy8gcGx1Z2luRGlkRmFpbF9kZXByZWNhdGVkRm9yVXNlV2l0aFYxCkluZGV4OiBUb29scy9X ZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3Rl ZEJ1bmRsZVBhZ2UuY3BwCShyZXZpc2lvbiAxNTM5MDgpCisrKyBUb29scy9XZWJLaXRUZXN0UnVu bmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI5NCw3ICsyOTQsNyBAQCBJbmplY3RlZEJ1bmRsZVBhZ2U6OkluamVjdGVkQnVuZGxlUGFn ZShXCiAgICAgICAgIHdpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3RGb3JGcmFtZSwKICAgICAgICAg ZGlkSGFuZGxlT25sb2FkRXZlbnRzRm9yRnJhbWUsCiAgICAgICAgIDAsIC8vIGRpZExheW91dEZv ckZyYW1lCi0gICAgICAgIDAsIC8vIGRpZE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZv ckZyYW1lCisgICAgICAgIDAsIC8vIGRpZE5ld0ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dF91 bmF2YWlsYWJsZQogICAgICAgICBkaWREZXRlY3RYU1NGb3JGcmFtZSwKICAgICAgICAgMCwgLy8g c2hvdWxkR29Ub0JhY2tGb3J3YXJkTGlzdEl0ZW0KICAgICAgICAgMCwgLy8gZGlkQ3JlYXRlR2xv YmFsT2JqZWN0Rm9yRnJhbWUK