149074 2015-09-11 14:41:39 -0700 Web Inspector: add some logging for frontend lifecycle events 2016-12-13 15:34:34 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All NEW https://bugs.webkit.org/show_bug.cgi?id=InspectorHydra InRadar P2 Normal --- 148802 148481 1 bburg bburg inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1125258 0 bburg 2015-09-11 14:41:39 -0700 Useful for debugging InspectorHydra. 1125259 1 webkit-bug-importer 2015-09-11 14:41:57 -0700 <rdar://problem/22668368> 1125260 2 261017 bburg 2015-09-11 14:44:06 -0700 Created attachment 261017 WIP Dumping this diff on here, need to move to other stuff for now. 1125267 3 261017 bburg 2015-09-11 14:57:57 -0700 Comment on attachment 261017 WIP This patch depends on 148802 and 149071 to apply. I might clean it up later. 261017 2015-09-11 14:44:06 -0700 2015-09-11 14:57:57 -0700 WIP bug-149074-20150911144358.patch text/plain 21832 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5NTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj MDE2ZmNhZDE0ZjBiOTAxNGY3YzEwMmI3MzQ1OWNmNjE4MDBkYWY0Li5mYTIzZmIzYzcwMDJmODY3 ZjIzMmM1ZGU4MzZjN2JkN2JlNDNiMjY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAxNS0wOS0xMSAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBhZGQgc29tZSBsb2dnaW5nIGZvciBmcm9udGVuZCBsaWZl Y3ljbGUgZXZlbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDkwNzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZFJvdXRlci5jcHA6CisgICAgICAgIChJ bnNwZWN0b3I6OkZyb250ZW5kUm91dGVyOjpjb25uZWN0RnJvbnRlbmQpOgorICAgICAgICAoSW5z cGVjdG9yOjpGcm9udGVuZFJvdXRlcjo6ZGlzY29ubmVjdEZyb250ZW5kKToKKyAgICAgICAgKElu c3BlY3Rvcjo6RnJvbnRlbmRSb3V0ZXI6OmRpc2Nvbm5lY3RBbGxGcm9udGVuZHMpOgorICAgICAg ICAoSW5zcGVjdG9yOjpGcm9udGVuZFJvdXRlcjo6c2VuZEV2ZW50KToKKyAgICAgICAgKEluc3Bl Y3Rvcjo6RnJvbnRlbmRSb3V0ZXI6OnNlbmRSZXNwb25zZSk6CisKIDIwMTUtMDktMDkgIEJyaWFu IEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIHN1cHBvcnQgZm9yIExPRyhs ZXZlbCwgLi4uKSBpbiBKYXZhU2NyaXB0Q29yZSBwYXJ0cyBvZiBXZWIgSW5zcGVjdG9yIGNvZGUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyMzBhZTMyNzc0ZjgwNzg0OWJlZjU5YTllOWE5ZTNmMmI3NDAxNTAxLi41 ZTEyNGNiYTU1ZjYyMDNiNzI3YWZhMGNmZDIxY2MzYjVkYmMzODkzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMzEgQEAKKzIwMTUtMDktMTEgIEJyaWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CisK KyAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIHNvbWUgbG9nZ2luZyBmb3IgZnJvbnRlbmQgbGlm ZWN5Y2xlIGV2ZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQ5MDc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpJbnNwZWN0b3JDb250cm9sbGVyKToKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6On5JbnNwZWN0b3JDb250cm9sbGVyKToKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6Omluc3BlY3RlZFBhZ2VEZXN0cm95 ZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6c2V0SW5zcGVjdG9y RnJvbnRlbmRDbGllbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6 Y29ubmVjdEZyb250ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6 OmRpc2Nvbm5lY3RGcm9udGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9s bGVyOjpkaXNjb25uZWN0QWxsRnJvbnRlbmRzKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv ckNvbnRyb2xsZXI6OnNob3cpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxl cjo6Y2xvc2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZnJvbnRl bmRJbml0aWFsaXplZCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kQ2xp ZW50TG9jYWwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRnJvbnRlbmRDbGllbnRM b2NhbDo6SW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbCk6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsOjp+SW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2Nh bCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsOjp3aW5k b3dPYmplY3RDbGVhcmVkKToKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZENsaWVudER1bW15OjpJbnNwZWN0b3JGcm9u dGVuZENsaWVudER1bW15KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckZyb250ZW5kQ2xp ZW50RHVtbXk6On5JbnNwZWN0b3JGcm9udGVuZENsaWVudER1bW15KToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckZyb250ZW5kQ2hhbm5lbER1bW15OjpJbnNwZWN0b3JGcm9udGVuZENoYW5u ZWxEdW1teSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZENoYW5uZWxEdW1t eTo6fkluc3BlY3RvckZyb250ZW5kQ2hhbm5lbER1bW15KToKKwogMjAxNS0wOS0wOSAgQnJpYW4g QnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgc3VwcG9ydCBmb3IgTE9HKGxl dmVsLCAuLi4pIGluIEphdmFTY3JpcHRDb3JlIHBhcnRzIG9mIFdlYiBJbnNwZWN0b3IgY29kZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9t YWMvQ2hhbmdlTG9nCmluZGV4IDYwYWRmNzMyYWM4N2FiZTA0MTIyNzEzY2YzNTkxNzA4MzFkYzll MTUuLmFmZDRmNGE1YjFjMDBjZDI2YjY1NGRiNzZkODMzM2E0MWEzMDJkNzkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxNS0wOS0xMSAgQnJpYW4gQnVyZyAgPGJidXJnQGFw cGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBhZGQgc29tZSBsb2dnaW5nIGZvciBm cm9udGVuZCBsaWZlY3ljbGUgZXZlbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNDkwNzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5tbToK KyAgICAgICAgKFdlYkluc3BlY3RvckNsaWVudDo6V2ViSW5zcGVjdG9yQ2xpZW50KToKKyAgICAg ICAgKFdlYkluc3BlY3RvckNsaWVudDo6aW5zcGVjdG9yRGVzdHJveWVkKToKKyAgICAgICAgKFdl Ykluc3BlY3RvckNsaWVudDo6b3Blbkluc3BlY3RvckZyb250ZW5kKToKKyAgICAgICAgKFdlYklu c3BlY3RvckNsaWVudDo6Y2xvc2VJbnNwZWN0b3JGcm9udGVuZCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3JDbGllbnQ6OnJlbGVhc2VGcm9udGVuZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3JGcm9u dGVuZENsaWVudDo6V2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yRnJvbnRlbmRDbGllbnQ6OmRpc2Nvbm5lY3RGcm9tQmFja2VuZCk6CisgICAgICAgICgt W1dlYkluc3BlY3RvcldpbmRvd0NvbnRyb2xsZXIgaW5pdFdpdGhJbnNwZWN0ZWRXZWJWaWV3Omlz VW5kZXJUZXN0Ol0pOgorICAgICAgICAoLVtXZWJJbnNwZWN0b3JXaW5kb3dDb250cm9sbGVyIGRl c3Ryb3lJbnNwZWN0b3JWaWV3XSk6CisgICAgICAgICogV2ViSW5zcGVjdG9yL1dlYkluc3BlY3Rv ci5tbToKKyAgICAgICAgKC1bV2ViSW5zcGVjdG9yIGluaXRXaXRoV2ViVmlldzpdKToKKyAgICAg ICAgKC1bV2ViSW5zcGVjdG9yIGRlYWxsb2NdKToKKyAgICAgICAgKC1bV2ViSW5zcGVjdG9yIHdl YlZpZXdDbG9zZWRdKToKKyAgICAgICAgKC1bV2ViSW5zcGVjdG9yIGNsb3NlOl0pOgorICAgICAg ICAoLVtXZWJJbnNwZWN0b3Igc2V0RnJvbnRlbmQ6XSk6CisgICAgICAgICgtW1dlYkluc3BlY3Rv ciByZWxlYXNlRnJvbnRlbmRdKToKKwogMjAxNS0wOS0wNyAgQW5keSBFc3RlcyAgPGFlc3Rlc0Bh cHBsZS5jb20+CiAKICAgICAgICAgW01hY10gRGVidWdSZWxlYXNlIGJ1aWxkcyBzaG91bGQgbGlu ayBhZ2FpbnN0IGxpYldlYktpdFN5c3RlbUludGVyZmFjZUVsQ2FwaXRhbi5hIG9uIDEwLjExCmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250 ZW5kUm91dGVyLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RnJvbnRlbmRSb3V0ZXIuY3BwCmluZGV4IDg2ZGZjOWMzY2QwNWM0OTU4Nzc0ZDJlMzVmYzg1MzRk YzMxZTFmZjYuLjc5OTY5NDEwNmUzMGViMzNiZDFkMmMzNTkwOTYzOTllMDg0NmY3MjMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRS b3V0ZXIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RnJvbnRlbmRSb3V0ZXIuY3BwCkBAIC0yNyw2ICsyNyw3IEBACiAjaW5jbHVkZSAiSW5zcGVjdG9y RnJvbnRlbmRSb3V0ZXIuaCIKIAogI2luY2x1ZGUgIkluc3BlY3RvckZyb250ZW5kQ2hhbm5lbC5o IgorI2luY2x1ZGUgPHRvb2xzL0xvZ2dpbmcuaD4KICNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5o PgogCiBuYW1lc3BhY2UgSW5zcGVjdG9yIHsKQEAgLTQzLDYgKzQ0LDkgQEAgRnJvbnRlbmRUb2tl biBGcm9udGVuZFJvdXRlcjo6Y29ubmVjdEZyb250ZW5kKEZyb250ZW5kQ2hhbm5lbCogY29ubmVj dGlvbikKIAogICAgIEZyb250ZW5kVG9rZW4gdG9rZW4gPSBzX25leHRGcm9udGVuZFRva2VuKys7 CiAgICAgbV9jb25uZWN0aW9ucy5hcHBlbmQoc3RkOjptYWtlX3R1cGxlKGNvbm5lY3Rpb24sIHRv a2VuKSk7CisKKyAgICBMT0coSW5zcGVjdG9yLCAiRnJvbnRlbmRSb3V0ZXIgJXAgY29ubmVjdGVk IEZyb250ZW5kQ2hhbm5lbCAlcCAodG9rZW46ICV1KSIsIHRoaXMsIGNvbm5lY3Rpb24sIHRva2Vu KTsKKwogICAgIHJldHVybiB0b2tlbjsKIH0KIApAQCAtNTQsMTIgKzU4LDE3IEBAIEZyb250ZW5k VG9rZW4gRnJvbnRlbmRSb3V0ZXI6OmRpc2Nvbm5lY3RGcm9udGVuZChGcm9udGVuZENoYW5uZWwq IGNvbm5lY3Rpb24pCiAgICAgQVNTRVJUX1dJVEhfTUVTU0FHRSh0b2tlbiwgIkNhbm5vdCBkaXNj b25uZWN0IGEgZnJvbnRlbmQgdGhhdCBpcyBub3QgY29ubmVjdGVkLiIpOwogCiAgICAgbV9jb25u ZWN0aW9ucy5yZW1vdmVBbGxNYXRjaGluZyhbdG9rZW5dIChjb25zdCBzdGQ6OnR1cGxlPEZyb250 ZW5kQ2hhbm5lbCosIEZyb250ZW5kVG9rZW4+JiByZWNvcmQpIHsgcmV0dXJuIHN0ZDo6Z2V0PDE+ KHJlY29yZCkgPT0gdG9rZW47IH0pOworCisgICAgTE9HKEluc3BlY3RvciwgIkZyb250ZW5kUm91 dGVyICVwIGRpc2Nvbm5lY3RlZCBGcm9udGVuZENoYW5uZWwgJXAgKHRva2VuOiAldSkiLCB0aGlz LCBjb25uZWN0aW9uLCB0b2tlbik7CisKICAgICByZXR1cm4gdG9rZW47CiB9CiAKIHZvaWQgRnJv bnRlbmRSb3V0ZXI6OmRpc2Nvbm5lY3RBbGxGcm9udGVuZHMoKQogewogICAgIG1fY29ubmVjdGlv bnMuY2xlYXIoKTsKKworICAgIExPRyhJbnNwZWN0b3IsICJGcm9udGVuZFJvdXRlciAlcCBkaXNj b25uZWN0ZWQgYWxsIEZyb250ZW5kQ2hhbm5lbHMiLCB0aGlzKTsKIH0KIAogYm9vbCBGcm9udGVu ZFJvdXRlcjo6aGFzTG9jYWxGcm9udGVuZCgpIGNvbnN0CkBAIC05Miw2ICsxMDEsOCBAQCB2b2lk IEZyb250ZW5kUm91dGVyOjpzZW5kRXZlbnQoY29uc3QgU3RyaW5nJiBtZXNzYWdlKSBjb25zdAog ICAgICAgICBGcm9udGVuZENoYW5uZWwqIGNvbm5lY3Rpb24gPSBzdGQ6OmdldDwwPihyZWNvcmQp OwogICAgICAgICBjb25uZWN0aW9uLT5zZW5kTWVzc2FnZVRvRnJvbnRlbmQobWVzc2FnZSk7CiAg ICAgfQorCisgICAgTE9HKEluc3BlY3RvciwgIkZyb250ZW5kUm91dGVyICVwIHNlbmRFdmVudDog JXMiLCB0aGlzLCBtZXNzYWdlLnV0ZjgoKS5kYXRhKCkpOwogfQogCiB2b2lkIEZyb250ZW5kUm91 dGVyOjpzZW5kUmVzcG9uc2UoRnJvbnRlbmRUb2tlbiB0b2tlbiwgY29uc3QgU3RyaW5nJiBtZXNz YWdlKSBjb25zdApAQCAtMTAwLDggKzExMSwxMCBAQCB2b2lkIEZyb250ZW5kUm91dGVyOjpzZW5k UmVzcG9uc2UoRnJvbnRlbmRUb2tlbiB0b2tlbiwgY29uc3QgU3RyaW5nJiBtZXNzYWdlKSBjbwog ICAgIEFTU0VSVF9BUkcobWVzc2FnZSwgIW1lc3NhZ2UuaXNFbXB0eSgpKTsKIAogICAgIC8vIFRo aXMgY291bGQgbGVnaXRpbWF0ZWx5IGZhaWwgaWYgdGhlIG1lc3NhZ2UgY2F1c2VkIHRoZSBmcm9u dGVuZCB0byBjbG9zZS4KLSAgICBpZiAoRnJvbnRlbmRDaGFubmVsKiBjb25uZWN0aW9uID0gY29u bmVjdGlvbkZvclRva2VuKHRva2VuKSkKKyAgICBpZiAoRnJvbnRlbmRDaGFubmVsKiBjb25uZWN0 aW9uID0gY29ubmVjdGlvbkZvclRva2VuKHRva2VuKSkgeworICAgICAgICBMT0coSW5zcGVjdG9y LCAiRnJvbnRlbmRSb3V0ZXIgJXAgc2VuZFJlc3BvbnNlW3Rva2VuPSV1XTogJXMiLCB0aGlzLCB0 b2tlbiwgbWVzc2FnZS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgY29ubmVjdGlvbi0+c2VuZE1l c3NhZ2VUb0Zyb250ZW5kKG1lc3NhZ2UpOworICAgIH0KIH0KIAogRnJvbnRlbmRUb2tlbiBGcm9u dGVuZFJvdXRlcjo6dG9rZW5Gb3JDb25uZWN0aW9uKEZyb250ZW5kQ2hhbm5lbCogY29ubmVjdGlv bikgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JD b250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9s bGVyLmNwcAppbmRleCA1YTRmZWU3MGJlZjU0MGE2YmVkYjlhOTIzMDY2NmFjOTMzYjk4YzIzLi5l NjU4NmUzNjU2N2Y1N2IwY2JlNTU0ZjZkYmE3Nzk3NTM1N2YyNGNhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCkBAIC03Miw2ICs3Miw3 IEBACiAjaW5jbHVkZSA8aW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JBZ2VudC5oPgogI2luY2x1 ZGUgPHByb2ZpbGVyL0xlZ2FjeVByb2ZpbGVyLmg+CiAjaW5jbHVkZSA8cnVudGltZS9KU0xvY2su aD4KKyNpbmNsdWRlIDx0b29scy9Mb2dnaW5nLmg+CiAjaW5jbHVkZSA8d3RmL1N0b3B3YXRjaC5o PgogCiAjaWYgRU5BQkxFKFJFTU9URV9JTlNQRUNUT1IpCkBAIC0xODYsMTYgKzE4NywyMSBAQCBJ bnNwZWN0b3JDb250cm9sbGVyOjpJbnNwZWN0b3JDb250cm9sbGVyKFBhZ2UmIHBhZ2UsIEluc3Bl Y3RvckNsaWVudCogaW5zcGVjdG9yQwogCiAgICAgcnVudGltZUFnZW50LT5zZXRTY3JpcHREZWJ1 Z1NlcnZlcigmbV9kZWJ1Z2dlckFnZW50LT5zY3JpcHREZWJ1Z1NlcnZlcigpKTsKICAgICBtX3Rp bWVsaW5lQWdlbnQtPnNldFBhZ2VTY3JpcHREZWJ1Z1NlcnZlcigmbV9kZWJ1Z2dlckFnZW50LT5z Y3JpcHREZWJ1Z1NlcnZlcigpKTsKKworICAgIExPRyhJbnNwZWN0b3IsICJJbnNwZWN0b3JDb250 cm9sbGVyICVwIGluaXRpYWxpemVkLiIsIHRoaXMpOwogfQogCiBJbnNwZWN0b3JDb250cm9sbGVy Ojp+SW5zcGVjdG9yQ29udHJvbGxlcigpCiB7CisgICAgTE9HKEluc3BlY3RvciwgIkluc3BlY3Rv ckNvbnRyb2xsZXIgJXAgZGVzdHJveWVkLiIsIHRoaXMpOwogICAgIG1faW5zdHJ1bWVudGluZ0Fn ZW50cy0+cmVzZXQoKTsKICAgICBBU1NFUlQoIW1faW5zcGVjdG9yQ2xpZW50KTsKIH0KIAogdm9p ZCBJbnNwZWN0b3JDb250cm9sbGVyOjppbnNwZWN0ZWRQYWdlRGVzdHJveWVkKCkKIHsKKyAgICBM T0coSW5zcGVjdG9yLCAiSW5zcGVjdG9yQ29udHJvbGxlciAlcCBpbnNwZWN0ZWQgcGFnZSB3YXMg ZGVzdHJveWVkLiIsIHRoaXMpOworCiAgICAgZGlzY29ubmVjdEFsbEZyb250ZW5kcygpOwogCiAg ICAgbV9pbmplY3RlZFNjcmlwdE1hbmFnZXItPmRpc2Nvbm5lY3QoKTsKQEAgLTIwNSw2ICsyMTEs OCBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6Omluc3BlY3RlZFBhZ2VEZXN0cm95ZWQoKQog CiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnNldEluc3BlY3RvckZyb250ZW5kQ2xpZW50KElu c3BlY3RvckZyb250ZW5kQ2xpZW50KiBpbnNwZWN0b3JGcm9udGVuZENsaWVudCkKIHsKKyAgICBM T0coSW5zcGVjdG9yLCAiSW5zcGVjdG9yQ29udHJvbGxlciAlcCBzZXQgZnJvbnRlbmQgY2xpZW50 IHRvICVwLiIsIHRoaXMsIGluc3BlY3RvckZyb250ZW5kQ2xpZW50KTsKKwogICAgIG1faW5zcGVj dG9yRnJvbnRlbmRDbGllbnQgPSBpbnNwZWN0b3JGcm9udGVuZENsaWVudDsKIH0KIApAQCAtMjQy LDYgKzI1MCw4IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6Y29ubmVjdEZyb250ZW5kKElu c3BlY3Rvcjo6RnJvbnRlbmRDaGFubmVsKiBjb25uZWN0aW9uCiAgICAgQVNTRVJUX0FSRyhjb25u ZWN0aW9uLCBjb25uZWN0aW9uKTsKICAgICBBU1NFUlQobV9pbnNwZWN0b3JDbGllbnQpOwogCisg ICAgTE9HKEluc3BlY3RvciwgIkluc3BlY3RvckNvbnRyb2xsZXIgJXAgY29ubmVjdGluZyBGcm9u dGVuZENoYW5uZWw6ICVwLiIsIHRoaXMsIGNvbm5lY3Rpb24pOworCiAgICAgbV9pc0F1dG9tYXRp Y0luc3BlY3Rpb24gPSBpc0F1dG9tYXRpY0luc3BlY3Rpb247CiAKICAgICBhdXRvIGlzRmlyc3RG cm9udGVuZCA9IG1fZnJvbnRlbmRSb3V0ZXItPmhhc0Zyb250ZW5kcygpID8gQXR0YWNoZWRGaXJz dEZyb250ZW5kOjpObyA6IEF0dGFjaGVkRmlyc3RGcm9udGVuZDo6WWVzOwpAQCAtMjY4LDYgKzI3 OCw4IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlzY29ubmVjdEZyb250ZW5kKEZyb250 ZW5kQ2hhbm5lbCogY29ubmVjdGlvbikKICAgICAvLyBUaGUgbG9jYWwgZnJvbnRlbmQgY2xpZW50 IHNob3VsZCBiZSBkaXNjb25uZWN0ZWQgZmlyc3Qgc28gaXQgc3RvcHMgc2VuZGluZyBtZXNzYWdl cy4KICAgICBBU1NFUlQoIW1fZnJvbnRlbmRSb3V0ZXItPmhhc0xvY2FsRnJvbnRlbmQoKSB8fCAh bV9pbnNwZWN0b3JGcm9udGVuZENsaWVudCk7CiAKKyAgICBMT0coSW5zcGVjdG9yLCAiSW5zcGVj dG9yQ29udHJvbGxlciAlcCBkaXNjb25uZWN0aW5nIEZyb250ZW5kQ2hhbm5lbDogJXAuIiwgdGhp cywgY29ubmVjdGlvbik7CisKICAgICBGcm9udGVuZFRva2VuIHRva2VuID0gbV9mcm9udGVuZFJv dXRlci0+ZGlzY29ubmVjdEZyb250ZW5kKGNvbm5lY3Rpb24pOwogICAgIEFTU0VSVCh0b2tlbik7 CiAgICAgbV9pc0F1dG9tYXRpY0luc3BlY3Rpb24gPSBmYWxzZTsKQEAgLTI4MCw2ICsyOTIsOCBA QCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRpc2Nvbm5lY3RGcm9udGVuZChGcm9udGVuZENo YW5uZWwqIGNvbm5lY3Rpb24pCiAgICAgaWYgKHdhc0xhc3RGcm9udGVuZCA9PSBEZXRhY2hlZExh c3RGcm9udGVuZDo6Tm8pCiAgICAgICAgIHJldHVybjsKIAorICAgIExPRyhJbnNwZWN0b3IsICJJ bnNwZWN0b3JDb250cm9sbGVyICVwIG5vdyBoYXMgbm8gY29ubmVjdGVkIGZyb250ZW5kcy4iLCB0 aGlzKTsKKwogICAgIC8vIFJlbGVhc2Ugb3ZlcmxheSBwYWdlIHJlc291cmNlcy4KICAgICBtX292 ZXJsYXktPmZyZWVQYWdlKCk7CiAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp1bnJlZ2lz dGVySW5zdHJ1bWVudGluZ0FnZW50cyhtX2luc3RydW1lbnRpbmdBZ2VudHMuZ2V0KCkpOwpAQCAt Mjk0LDYgKzMwOCw4IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlzY29ubmVjdEFsbEZy b250ZW5kcygpCiAgICAgLy8gVGhlIGxvY2FsIGZyb250ZW5kIGNsaWVudCBzaG91bGQgYmUgZGlz Y29ubmVjdGVkIGZpcnN0IHNvIGl0IHN0b3BzIHNlbmRpbmcgbWVzc2FnZXMuCiAgICAgQVNTRVJU KCFtX2Zyb250ZW5kUm91dGVyLT5oYXNMb2NhbEZyb250ZW5kKCkgfHwgIW1faW5zcGVjdG9yRnJv bnRlbmRDbGllbnQpOwogCisgICAgTE9HKEluc3BlY3RvciwgIkluc3BlY3RvckNvbnRyb2xsZXIg JXAgZGlzY29ubmVjdGluZyBhbGwgZnJvbnRlbmRzIiwgdGhpcyk7CisKICAgICBtX2Zyb250ZW5k Um91dGVyLT5kaXNjb25uZWN0QWxsRnJvbnRlbmRzKCk7CiAgICAgbV9pc0F1dG9tYXRpY0luc3Bl Y3Rpb24gPSBmYWxzZTsKIApAQCAtMzAyLDYgKzMxOCw4IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJv bGxlcjo6ZGlzY29ubmVjdEFsbEZyb250ZW5kcygpCiAKICAgICBtX2FnZW50cy5mcm9udGVuZERl dGFjaGVkKDAsIERldGFjaGVkTGFzdEZyb250ZW5kOjpZZXMsIERpc2Nvbm5lY3RSZWFzb246Oklu c3BlY3RlZFRhcmdldERlc3Ryb3llZCk7CiAKKyAgICBMT0coSW5zcGVjdG9yLCAiSW5zcGVjdG9y Q29udHJvbGxlciAlcCBub3cgaGFzIG5vIGNvbm5lY3RlZCBmcm9udGVuZHMuIiwgdGhpcyk7CisK ICAgICAvLyBSZWxlYXNlIG92ZXJsYXkgcGFnZSByZXNvdXJjZXMuCiAgICAgbV9vdmVybGF5LT5m cmVlUGFnZSgpOwogICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6dW5yZWdpc3Rlckluc3Ry dW1lbnRpbmdBZ2VudHMobV9pbnN0cnVtZW50aW5nQWdlbnRzLmdldCgpKTsKQEAgLTMyMSwxNCAr MzM5LDIwIEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6c2hvdygpCiAgICAgaWYgKCFlbmFi bGVkKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChtX2Zyb250ZW5kUm91dGVyLT5oYXNM b2NhbEZyb250ZW5kKCkpCisgICAgaWYgKG1fZnJvbnRlbmRSb3V0ZXItPmhhc0xvY2FsRnJvbnRl bmQoKSkgeworICAgICAgICBMT0coSW5zcGVjdG9yLCAiSW5zcGVjdG9yQ29udHJvbGxlciAlcCBy ZXF1ZXN0aW5nIGxvY2FsIGZyb250ZW5kIHRvIHNob3cgaXRzZWxmLiIsIHRoaXMpOwogICAgICAg ICBtX2luc3BlY3RvckNsaWVudC0+YnJpbmdGcm9udGVuZFRvRnJvbnQoKTsKLSAgICBlbHNlIGlm IChJbnNwZWN0b3I6OkZyb250ZW5kQ2hhbm5lbCogZnJvbnRlbmRDaGFubmVsID0gbV9pbnNwZWN0 b3JDbGllbnQtPm9wZW5JbnNwZWN0b3JGcm9udGVuZCgqdGhpcykpCi0gICAgICAgIGNvbm5lY3RG cm9udGVuZChmcm9udGVuZENoYW5uZWwpOworICAgIH0gZWxzZSB7CisgICAgICAgIExPRyhJbnNw ZWN0b3IsICJJbnNwZWN0b3JDb250cm9sbGVyICVwIG5vIGxvY2FsIGZyb250ZW5kIGV4aXN0cywg Y3JlYXRpbmcgYSBuZXcgb25lIHRvIHNob3cuIiwgdGhpcyk7CisgICAgICAgIGlmIChJbnNwZWN0 b3I6OkZyb250ZW5kQ2hhbm5lbCogZnJvbnRlbmRDaGFubmVsID0gbV9pbnNwZWN0b3JDbGllbnQt Pm9wZW5JbnNwZWN0b3JGcm9udGVuZCgqdGhpcykpCisgICAgICAgICAgICBjb25uZWN0RnJvbnRl bmQoZnJvbnRlbmRDaGFubmVsKTsKKyAgICB9CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxl cjo6Y2xvc2UoKQogeworICAgIExPRyhJbnNwZWN0b3IsICJJbnNwZWN0b3JDb250cm9sbGVyICVw IHJlcXVlc3RpbmcgbG9jYWwgZnJvbnRlbmQgdG8gY2xvc2UuIiwgdGhpcyk7CisKICAgICBpZiAo bV9mcm9udGVuZFJvdXRlci0+aGFzTG9jYWxGcm9udGVuZCgpKQogICAgICAgICBtX2luc3BlY3Rv ckNsaWVudC0+Y2xvc2VJbnNwZWN0b3JGcm9udGVuZCgpOwogCkBAIC00NzgsNiArNTAyLDggQEAg dm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRDYWxsSW5qZWN0ZWRTY3JpcHRGdW5jdGlvbihK U0M6OkV4ZWNTdGF0ZSogc2NyaXB0U3QKIAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpmcm9u dGVuZEluaXRpYWxpemVkKCkKIHsKKyAgICBMT0coSW5zcGVjdG9yLCAiSW5zcGVjdG9yQ29udHJv bGxlciAlcCBmcm9udGVuZCBpcyBub3cgaW5pdGlhbGl6ZWQuIiwgdGhpcyk7CisKICNpZiBFTkFC TEUoUkVNT1RFX0lOU1BFQ1RPUikKICAgICBpZiAobV9pc0F1dG9tYXRpY0luc3BlY3Rpb24pCiAg ICAgICAgIG1fcGFnZS5pbnNwZWN0b3JEZWJ1Z2dhYmxlKCkudW5wYXVzZUZvckluaXRpYWxpemVk SW5zcGVjdG9yKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yRnJvbnRlbmRDbGllbnRMb2NhbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbC5jcHAKaW5kZXggMmNjY2FhZjNkMDM4YjU4YTg4MTM3 MDY0ZDRmNDQxZjU5Nzg4MjdkNS4uMjdlZmE5ZDQ1NzMwOTEwYzhhMGQ1NTkzMmIwZTQzMTllOTRk ZjBkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250 ZW5kQ2xpZW50TG9jYWwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JGcm9udGVuZENsaWVudExvY2FsLmNwcApAQCAtNTMsNiArNTMsNyBAQAogI2luY2x1ZGUgIldp bmRvd0ZlYXR1cmVzLmgiCiAjaW5jbHVkZSA8YmluZGluZ3MvU2NyaXB0VmFsdWUuaD4KICNpbmNs dWRlIDxpbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXJzLmg+CisjaW5jbHVkZSA8 dG9vbHMvTG9nZ2luZy5oPgogI2luY2x1ZGUgPHd0Zi9EZXF1ZS5oPgogI2luY2x1ZGUgPHd0Zi90 ZXh0L0NTdHJpbmcuaD4KIApAQCAtMTQ2LDExICsxNDcsMTUgQEAgSW5zcGVjdG9yRnJvbnRlbmRD bGllbnRMb2NhbDo6SW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbChJbnNwZWN0b3JDb250cm9s bGVyJgogICAgIEFTU0VSVF9BUkcoY29ubmVjdGlvbiwgY29ubmVjdGlvbik7CiAgICAgQVNTRVJU X0FSRyhmcm9udGVuZFBhZ2UsIGZyb250ZW5kUGFnZSk7CiAKKyAgICBMT0coSW5zcGVjdG9yLCAi RnJvbnRlbmRDbGllbnRMb2NhbCAlcCBjcmVhdGVkIHVzaW5nIGZyb250ZW5kOiBQYWdlICVwLCBG cm9udGVuZENoYW5uZWwgJXAuIiwgdGhpcywgZnJvbnRlbmRQYWdlLCBjb25uZWN0aW9uKTsKKwog ICAgIG1fZnJvbnRlbmRQYWdlLT5zZXR0aW5ncygpLnNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxl VVJMcyh0cnVlKTsKIH0KIAogSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbDo6fkluc3BlY3Rv ckZyb250ZW5kQ2xpZW50TG9jYWwoKQogeworICAgIExPRyhJbnNwZWN0b3IsICJGcm9udGVuZENs aWVudExvY2FsICVwIGRlc3Ryb3llZC4iLCB0aGlzKTsKKwogICAgIGlmIChtX2Zyb250ZW5kSG9z dCkKICAgICAgICAgbV9mcm9udGVuZEhvc3QtPmRpc2Nvbm5lY3RDbGllbnQoKTsKICAgICBtX2Zy b250ZW5kUGFnZSA9IG51bGxwdHI7CkBAIC0xNjgsNiArMTczLDggQEAgdm9pZCBJbnNwZWN0b3JG cm9udGVuZENsaWVudExvY2FsOjp3aW5kb3dPYmplY3RDbGVhcmVkKCkKICAgICBKU0M6OkV4ZWNT dGF0ZSogZnJvbnRlbmRFeGVjU3RhdGUgPSBleGVjU3RhdGVGcm9tUGFnZShkZWJ1Z2dlcldvcmxk KCksIG1fZnJvbnRlbmRQYWdlKTsKICAgICBtX2Zyb250ZW5kSG9zdCA9IEluc3BlY3RvckZyb250 ZW5kSG9zdDo6Y3JlYXRlKHRoaXMsIG1fZnJvbnRlbmRQYWdlKTsKICAgICBTY3JpcHRHbG9iYWxP YmplY3Q6OnNldChmcm9udGVuZEV4ZWNTdGF0ZSwgIkluc3BlY3RvckZyb250ZW5kSG9zdCIsIG1f ZnJvbnRlbmRIb3N0LmdldCgpKTsKKworICAgIExPRyhJbnNwZWN0b3IsICJGcm9udGVuZENsaWVu dExvY2FsICVwIGNyZWF0ZWQgbmV3IEZyb250ZW5kSG9zdCAlcCBmb3IgZnJvbnRlbmQgUGFnZSAl cC4iLCB0aGlzLCBtX2Zyb250ZW5kSG9zdC5nZXQoKSwgbV9mcm9udGVuZFBhZ2UpOwogfQogCiB2 b2lkIEluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWw6OmZyb250ZW5kTG9hZGVkKCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAppbmRleCAzOWE3NWE5NmYyZmMwNTNjNTZiYTg1MDlm NjYwZjVjOGY0NjM4OGEyLi5hNGNmNmQ4NDYzNTMwMDA3ODE4NTgwMDZmY2Q5YjA1N2RjN2YzYzVm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCkBAIC0xMjMsNiArMTIzLDcgQEAK ICNpbmNsdWRlIDxpbnNwZWN0b3IvSW5zcGVjdG9yVmFsdWVzLmg+CiAjaW5jbHVkZSA8cnVudGlt ZS9KU0NJbmxpbmVzLmg+CiAjaW5jbHVkZSA8cnVudGltZS9KU0NKU1ZhbHVlLmg+CisjaW5jbHVk ZSA8dG9vbHMvTG9nZ2luZy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KICNpbmNs dWRlIDx3dGYvdGV4dC9TdHJpbmdCdWZmZXIuaD4KIApAQCAtMjExLDcgKzIxMiw3IEBAIHVzaW5n IG5hbWVzcGFjZSBIVE1MTmFtZXM7CiBjbGFzcyBJbnNwZWN0b3JGcm9udGVuZENsaWVudER1bW15 IDogcHVibGljIEluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWwgewogcHVibGljOgogICAgIElu c3BlY3RvckZyb250ZW5kQ2xpZW50RHVtbXkoSW5zcGVjdG9yQ29udHJvbGxlciYgaW5zcGVjdGVk UGFnZUNvbnRyb2xsZXIsIFBhZ2UqIGZyb250ZW5kUGFnZSwgRnJvbnRlbmRDaGFubmVsKik7Ci0g ICAgdmlydHVhbCB+SW5zcGVjdG9yRnJvbnRlbmRDbGllbnREdW1teSgpIHsgfQorICAgIHZpcnR1 YWwgfkluc3BlY3RvckZyb250ZW5kQ2xpZW50RHVtbXkoKTsKICAgICB2aXJ0dWFsIHZvaWQgYXR0 YWNoV2luZG93KERvY2tTaWRlKSBvdmVycmlkZSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZGV0YWNo V2luZG93KCkgb3ZlcnJpZGUgeyB9CiAKQEAgLTIzMSwxMiArMjMyLDE4IEBAIHByb3RlY3RlZDoK IEluc3BlY3RvckZyb250ZW5kQ2xpZW50RHVtbXk6Okluc3BlY3RvckZyb250ZW5kQ2xpZW50RHVt bXkoSW5zcGVjdG9yQ29udHJvbGxlciYgaW5zcGVjdGVkUGFnZUNvbnRyb2xsZXIsIFBhZ2UqIGZy b250ZW5kUGFnZSwgRnJvbnRlbmRDaGFubmVsKiBjb25uZWN0aW9uKQogICAgIDogSW5zcGVjdG9y RnJvbnRlbmRDbGllbnRMb2NhbChpbnNwZWN0ZWRQYWdlQ29udHJvbGxlciwgZnJvbnRlbmRQYWdl LCBjb25uZWN0aW9uLCBzdGQ6Om1ha2VfdW5pcXVlPEluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9j YWw6OlNldHRpbmdzPigpKQogeworICAgIExPRyhJbnNwZWN0b3IsICJGcm9udGVuZENsaWVudER1 bW15ICVwIGNyZWF0ZWQgd2l0aCBmcm9udGVuZCBwYWdlICVwLCBGcm9udGVuZENoYW5uZWwgJXAi LCB0aGlzLCBmcm9udGVuZFBhZ2UsIGNvbm5lY3Rpb24pOworfQorCitJbnNwZWN0b3JGcm9udGVu ZENsaWVudER1bW15Ojp+SW5zcGVjdG9yRnJvbnRlbmRDbGllbnREdW1teSgpCit7CisgICAgTE9H KEluc3BlY3RvciwgIkZyb250ZW5kQ2xpZW50RHVtbXkgJXAgZGVzdHJveWVkLiIsIHRoaXMpOwog fQogCiBjbGFzcyBJbnNwZWN0b3JGcm9udGVuZENoYW5uZWxEdW1teSA6IHB1YmxpYyBGcm9udGVu ZENoYW5uZWwgewogcHVibGljOgogICAgIGV4cGxpY2l0IEluc3BlY3RvckZyb250ZW5kQ2hhbm5l bER1bW15KFBhZ2UqKTsKLSAgICB2aXJ0dWFsIH5JbnNwZWN0b3JGcm9udGVuZENoYW5uZWxEdW1t eSgpIHsgfQorICAgIHZpcnR1YWwgfkluc3BlY3RvckZyb250ZW5kQ2hhbm5lbER1bW15KCk7CiAg ICAgdmlydHVhbCBib29sIHNlbmRNZXNzYWdlVG9Gcm9udGVuZChjb25zdCBTdHJpbmcmIG1lc3Nh Z2UpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgQ29ubmVjdGlvblR5cGUgY29ubmVjdGlvblR5cGUo KSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBDb25uZWN0aW9uVHlwZTo6TG9jYWw7IH0KIApAQCAt MjQ3LDYgKzI1NCwxMiBAQCBwcml2YXRlOgogSW5zcGVjdG9yRnJvbnRlbmRDaGFubmVsRHVtbXk6 Okluc3BlY3RvckZyb250ZW5kQ2hhbm5lbER1bW15KFBhZ2UqIHBhZ2UpCiAgICAgOiBtX2Zyb250 ZW5kUGFnZShwYWdlKQogeworICAgIExPRyhJbnNwZWN0b3IsICJGcm9udGVuZENoYW5uZWxEdW1t eSAlcCBjcmVhdGVkIHdpdGggZnJvbnRlbmQgcGFnZSAlcCIsIHRoaXMsIHBhZ2UpOworfQorCitJ bnNwZWN0b3JGcm9udGVuZENoYW5uZWxEdW1teTo6fkluc3BlY3RvckZyb250ZW5kQ2hhbm5lbER1 bW15KCkKK3sKKyAgICBMT0coSW5zcGVjdG9yLCAiRnJvbnRlbmRDaGFubmVsRHVtbXkgJXAgZGVz dHJveWVkLiIsIHRoaXMpOwogfQogCiBib29sIEluc3BlY3RvckZyb250ZW5kQ2hhbm5lbER1bW15 OjpzZW5kTWVzc2FnZVRvRnJvbnRlbmQoY29uc3QgU3RyaW5nJiBtZXNzYWdlKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lm1t IGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lm1t CmluZGV4IDJjN2RkOTBlNGM3M2VjMTY3ZDRjNTQ0OTY2Zjg3MzFmZDk2ZmRkNmUuLmU2NTkxZmMx Yzg3NTQ2MTY0YmI4NTY0MTk3ODA0OTkzZDkzNjZhM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW0KQEAgLTQ1LDYg KzQ1LDcgQEAKICNpbXBvcnQgPGFsZ29yaXRobT4KICNpbXBvcnQgPGJpbmRpbmdzL1NjcmlwdFZh bHVlLmg+CiAjaW1wb3J0IDxpbnNwZWN0b3IvSW5zcGVjdG9yQWdlbnRCYXNlLmg+CisjaW1wb3J0 IDx0b29scy9Mb2dnaW5nLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0luc3BlY3RvckNvbnRyb2xsZXIu aD4KICNpbXBvcnQgPFdlYkNvcmUvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQuaD4KICNpbXBvcnQg PFdlYkNvcmUvTWFpbkZyYW1lLmg+CkBAIC05OCwxMSArOTksMTUgQEAgV2ViSW5zcGVjdG9yQ2xp ZW50OjpXZWJJbnNwZWN0b3JDbGllbnQoV2ViVmlldyAqaW5zcGVjdGVkV2ViVmlldykKICAgICA6 IG1faW5zcGVjdGVkV2ViVmlldyhpbnNwZWN0ZWRXZWJWaWV3KQogICAgICwgbV9oaWdobGlnaHRl cihhZG9wdE5TKFtbV2ViTm9kZUhpZ2hsaWdodGVyIGFsbG9jXSBpbml0V2l0aEluc3BlY3RlZFdl YlZpZXc6aW5zcGVjdGVkV2ViVmlld10pKQogeworICAgIExPRyhJbnNwZWN0b3IsICJXSzEgSW5z cGVjdG9yQ2xpZW50ICVwIGNyZWF0ZWQgZm9yIGluc3BlY3RlZCBXZWJWaWV3ICVwLiIsIHRoaXMs IGluc3BlY3RlZFdlYlZpZXcpOwogfQogCiB2b2lkIFdlYkluc3BlY3RvckNsaWVudDo6aW5zcGVj dG9yRGVzdHJveWVkKCkKIHsKICAgICBjbG9zZUluc3BlY3RvckZyb250ZW5kKCk7CisgCisgICAg TE9HKEluc3BlY3RvciwgIldLMSBJbnNwZWN0b3JDbGllbnQgJXAgd2FzIGRlc3Ryb3llZC4iLCB0 aGlzKTsKKwogICAgIGRlbGV0ZSB0aGlzOwogfQogCkBAIC0xMTksMTEgKzEyNCwxNSBAQCBGcm9u dGVuZENoYW5uZWwqIFdlYkluc3BlY3RvckNsaWVudDo6b3Blbkluc3BlY3RvckZyb250ZW5kKElu c3BlY3RvckNvbnRyb2xsZXImCiAKICAgICBtX2Zyb250ZW5kUGFnZS0+aW5zcGVjdG9yQ29udHJv bGxlcigpLnNldEluc3BlY3RvckZyb250ZW5kQ2xpZW50KG1fZnJvbnRlbmRDbGllbnQuZ2V0KCkp OwogCisgICAgTE9HKEluc3BlY3RvciwgIldLMSBJbnNwZWN0b3JDbGllbnQgJXAgb3BlbmVkIGlu c3BlY3RvciBmcm9udGVuZDogZnJvbnRlbmQgJXAsIHBhZ2UgJXAsIGZyb250ZW5kQ2xpZW50ICVw IiwgdGhpcywgd2ViSW5zcGVjdG9yRnJvbnRlbmQuZ2V0KCksIG1fZnJvbnRlbmRQYWdlLCBtX2Zy b250ZW5kQ2xpZW50LmdldCgpKTsKKwogICAgIHJldHVybiB0aGlzOwogfQogCiB2b2lkIFdlYklu c3BlY3RvckNsaWVudDo6Y2xvc2VJbnNwZWN0b3JGcm9udGVuZCgpCiB7CisgICAgTE9HKEluc3Bl Y3RvciwgIldLMSBJbnNwZWN0b3JDbGllbnQgJXAgY2xvc2luZyBpbnNwZWN0b3IgZnJvbnRlbmQu IiwgdGhpcyk7CisKICAgICBpZiAobV9mcm9udGVuZENsaWVudCkKICAgICAgICAgbV9mcm9udGVu ZENsaWVudC0+ZGlzY29ubmVjdEZyb21CYWNrZW5kKCk7CiB9CkBAIC0xNzUsNiArMTg0LDggQEAg dm9pZCBXZWJJbnNwZWN0b3JDbGllbnQ6OmRpZFNldFNlYXJjaGluZ0Zvck5vZGUoYm9vbCBlbmFi bGVkKQogCiB2b2lkIFdlYkluc3BlY3RvckNsaWVudDo6cmVsZWFzZUZyb250ZW5kKCkKIHsKKyAg ICBMT0coSW5zcGVjdG9yLCAiV0sxIEluc3BlY3RvckNsaWVudCAlcCByZWxlYXNlZCBmcm9udGVu ZCBjbGllbnQgYW5kIHBhZ2UuIiwgdGhpcyk7CisKICAgICBtX2Zyb250ZW5kQ2xpZW50ID0gbnVs bHB0cjsKICAgICBtX2Zyb250ZW5kUGFnZSA9IG51bGxwdHI7CiB9CkBAIC0xODUsNiArMTk2LDgg QEAgV2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQ6OldlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50 KFdlYlZpZXcqIGluc3BlY3RlZFdlYlZpZXcKICAgICAsIG1faW5zcGVjdGVkV2ViVmlldyhpbnNw ZWN0ZWRXZWJWaWV3KQogICAgICwgbV93aW5kb3dDb250cm9sbGVyKHdpbmRvd0NvbnRyb2xsZXIp CiB7CisgICAgTE9HKEluc3BlY3RvciwgIldLMSBJbnNwZWN0b3JGcm9udGVuZENsaWVudCAlcCBj cmVhdGVkLiIsIHRoaXMpOworCiAgICAgW3dpbmRvd0NvbnRyb2xsZXIgc2V0RnJvbnRlbmRDbGll bnQ6dGhpc107CiB9CiAKQEAgLTI1OCw2ICsyNzEsOCBAQCB2b2lkIFdlYkluc3BlY3RvckZyb250 ZW5kQ2xpZW50OjpjbG9zZVdpbmRvdygpCiAKIHZvaWQgV2ViSW5zcGVjdG9yRnJvbnRlbmRDbGll bnQ6OmRpc2Nvbm5lY3RGcm9tQmFja2VuZCgpCiB7CisgICAgTE9HKEluc3BlY3RvciwgIldLMSBG cm9udGVuZENsaWVudCAlcCBkaXNjb25uZWN0aW5nIGZyb20gYmFja2VuZC4iLCB0aGlzKTsKKwog ICAgIFttX3dpbmRvd0NvbnRyb2xsZXIuZ2V0KCkgZGVzdHJveUluc3BlY3RvclZpZXddOwogfQog CkBAIC00MjUsNiArNDQwLDggQEAgLSAoaWQpaW5pdFdpdGhJbnNwZWN0ZWRXZWJWaWV3OihXZWJW aWV3ICopaW5zcGVjdGVkV2ViVmlldyBpc1VuZGVyVGVzdDooQk9PTClpc1UKICAgICBpZiAoIShz ZWxmID0gW3NlbGYgaW5pdF0pKQogICAgICAgICByZXR1cm4gbmlsOwogCisgICAgTE9HKEluc3Bl Y3RvciwgIldLMSBJbnNwZWN0b3JDbGllbnQgJXAgY3JlYXRlZCBmb3IgaW5zcGVjdGVkIFdlYlZp ZXcgJXAuIiwgc2VsZiwgaW5zcGVjdGVkV2ViVmlldyk7CisKICAgICBfaW5zcGVjdGVkV2ViVmll dyA9IGluc3BlY3RlZFdlYlZpZXc7CiAKICAgICBOU1N0cmluZyAqcGFnZVBhdGggPSBpc1VuZGVy VGVzdCA/IFtzZWxmIGluc3BlY3RvclRlc3RQYWdlUGF0aF0gOiBbc2VsZiBpbnNwZWN0b3JQYWdl UGF0aF07CkBAIC02NzksNiArNjk2LDggQEAgLSAodm9pZClzZXREb2NraW5nVW5hdmFpbGFibGU6 KEJPT0wpdW5hdmFpbGFibGUKIAogLSAodm9pZClkZXN0cm95SW5zcGVjdG9yVmlldwogeworICAg IExPRyhJbnNwZWN0b3IsICJXSzEgV2ViSW5zcGVjdG9yV2luZG93Q29udHJvbGxlciAlcCBkZXN0 cm95aW5nIGZyb250ZW5kIFdlYlZpZXcuIiwgc2VsZik7CisKICAgICBSZXRhaW5QdHI8V2ViSW5z cGVjdG9yV2luZG93Q29udHJvbGxlcj4gcHJvdGVjdChzZWxmKTsKIAogICAgIFtbX2luc3BlY3Rl ZFdlYlZpZXcuZ2V0KCkgaW5zcGVjdG9yXSByZWxlYXNlRnJvbnRlbmRdOwpAQCAtNjk0LDYgKzcx Myw4IEBAIC0gKHZvaWQpZGVzdHJveUluc3BlY3RvclZpZXcKICAgICBfdmlzaWJsZSA9IE5POwog CiAgICAgaWYgKFBhZ2UqIGluc3BlY3RlZFBhZ2UgPSBbX2luc3BlY3RlZFdlYlZpZXcuZ2V0KCkg cGFnZV0pIHsKKyAgICAgICAgTE9HKEluc3BlY3RvciwgIldLMSBXZWJJbnNwZWN0b3JXaW5kb3dD b250cm9sbGVyICVwIGRpc2Nvbm5lY3RpbmcgZnJvbnRlbmQgY2xpZW50IGZyb20gY29udHJvbGxl ci4iLCBzZWxmKTsKKwogICAgICAgICBpbnNwZWN0ZWRQYWdlLT5pbnNwZWN0b3JDb250cm9sbGVy KCkuc2V0SW5zcGVjdG9yRnJvbnRlbmRDbGllbnQobnVsbHB0cik7CiAgICAgICAgIGluc3BlY3Rl ZFBhZ2UtPmluc3BlY3RvckNvbnRyb2xsZXIoKS5kaXNjb25uZWN0RnJvbnRlbmQoX2luc3BlY3Rv ckNsaWVudCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViSW5zcGVj dG9yL1dlYkluc3BlY3Rvci5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkluc3BlY3Rvci9XZWJJ bnNwZWN0b3IubW0KaW5kZXggMDllYjZhMTZhMGI3NGUzY2Q0ZTZlMGJhNDQyZTUzMzNlM2M5NzUx MC4uZTVmODQ2MjhiMjk0YjQ3YzdjOTcwNTcwNmM4ZmQ3NGVmNTZkMGM5YyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9tYWMvV2ViSW5zcGVjdG9yL1dlYkluc3BlY3Rvci5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L21hYy9XZWJJbnNwZWN0b3IvV2ViSW5zcGVjdG9yLm1tCkBAIC0zNyw2ICszNyw4 IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9JbnNwZWN0b3JDb250cm9sbGVyLmg+CiAjaW5jbHVkZSA8 V2ViQ29yZS9QYWdlLmg+CiAKKyNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9Mb2dnaW5nLmg+CisK IHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBOU1N0cmluZyAqV2ViSW5zcGVjdG9yRGlkU3Rh cnRTZWFyY2hpbmdGb3JOb2RlID0gQCJXZWJJbnNwZWN0b3JEaWRTdGFydFNlYXJjaGluZ0Zvck5v ZGUiOwpAQCAtNDksMTcgKzUxLDIzIEBAIC0gKGlkKWluaXRXaXRoV2ViVmlldzooV2ViVmlldyAq KXdlYlZpZXcKICAgICAgICAgcmV0dXJuIG5pbDsKICAgICBfd2ViVmlldyA9IHdlYlZpZXc7IC8v IG5vdCByZXRhaW5lZCB0byBwcmV2ZW50IGEgY3ljbGUKIAorICAgIExPRyhJbnNwZWN0b3IsICJX SzEgV2ViSW5zcGVjdG9yICVwIGNyZWF0ZWQgd2l0aCBXZWJWaWV3IGZyb250ZW5kICVwLiIsIHNl bGYsIHdlYlZpZXcpOworCiAgICAgcmV0dXJuIHNlbGY7CiB9CiAKIC0gKHZvaWQpZGVhbGxvYwog eworICAgIExPRyhJbnNwZWN0b3IsICJXSzEgV2ViSW5zcGVjdG9yICVwIGRlc3Ryb3llZC4iLCBz ZWxmKTsKKwogICAgIFtfZnJvbnRlbmQgcmVsZWFzZV07CiAgICAgW3N1cGVyIGRlYWxsb2NdOwog fQogCiAtICh2b2lkKXdlYlZpZXdDbG9zZWQKIHsKKyAgICBMT0coSW5zcGVjdG9yLCAiV0sxIFdl Ykluc3BlY3RvciAlcCBsb3N0IGl0cyBXZWJWaWV3LiIsIHNlbGYpOworCiAgICAgX3dlYlZpZXcg PSBuaWw7CiB9CiAKQEAgLTE2MCw2ICsxNjgsOCBAQCAtICh2b2lkKWNsb3NlOihpZClzZW5kZXIK ICAgICBpZiAoIV9mcm9udGVuZCkKICAgICAgICAgcmV0dXJuOwogCisgICAgTE9HKEluc3BlY3Rv ciwgIldLMSBXZWJJbnNwZWN0b3IgJXAgd2lsbCBjbG9zZS4iLCBzZWxmKTsKKwogICAgIGlmIChQ YWdlKiBwYWdlID0gY29yZShfd2ViVmlldykpCiAgICAgICAgIHBhZ2UtPmluc3BlY3RvckNvbnRy b2xsZXIoKS5jbG9zZSgpOwogfQpAQCAtMTgyLDExICsxOTIsMTUgQEAgLSAodm9pZClldmFsdWF0 ZUluRnJvbnRlbmQ6KGlkKXNlbmRlciBzY3JpcHQ6KE5TU3RyaW5nICopc2NyaXB0CiAKIC0gKHZv aWQpc2V0RnJvbnRlbmQ6KFdlYkluc3BlY3RvckZyb250ZW5kICopZnJvbnRlbmQKIHsKKyAgICBM T0coSW5zcGVjdG9yLCAiV0sxIFdlYkluc3BlY3RvciAlcCBzZXQgaXRzIGZyb250ZW5kOiAlcC4i LCBzZWxmLCBmcm9udGVuZCk7CisKICAgICBfZnJvbnRlbmQgPSBbZnJvbnRlbmQgcmV0YWluXTsK IH0KIAogLSAodm9pZClyZWxlYXNlRnJvbnRlbmQKIHsKKyAgICBMT0coSW5zcGVjdG9yLCAiV0sx IFdlYkluc3BlY3RvciAlcCByZWxlYXNlZCBpdHMgZnJvbnRlbmQ6ICVwLiIsIHNlbGYsIF9mcm9u dGVuZCk7CisKICAgICBbX2Zyb250ZW5kIHJlbGVhc2VdOwogICAgIF9mcm9udGVuZCA9IDA7CiB9 Cg==