206821 2020-01-27 03:55:26 -0800 [GTK] Remote Inspector: add support for service workers targets 2020-01-28 02:43:30 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned berto bugs-noreply ews-watchlist gustavo hi joepeck keith_miller mark.lam msaboff saam tzagallo zan oldest_to_newest 1611356 0 cgarcia 2020-01-27 03:55:26 -0800 Add support for debugging service workers 1611359 1 388845 cgarcia 2020-01-27 04:04:28 -0800 Created attachment 388845 Patch 1611360 2 ews-watchlist 2020-01-27 04:05:42 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1611861 3 cgarcia 2020-01-28 02:43:30 -0800 Committed r255232: <https://trac.webkit.org/changeset/255232> 388845 2020-01-27 04:04:28 -0800 2020-01-28 01:45:53 -0800 Patch wk2-inspector-service-worker.diff text/plain 12516 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGYzNjQ1YzMyOGQ1Li5hZjUxNTg5YThhMSAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMDEtMjcgIENhcmxv cyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIFJl bW90ZSBJbnNwZWN0b3I6IGFkZCBzdXBwb3J0IGZvciBzZXJ2aWNlIHdvcmtlcnMgdGFyZ2V0cwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA2ODIxCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSGFuZGxlIFNl cnZpY2VXb3JrZXIgdGFyZ2V0IHR5cGUuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvcmVtb3RlL2ds aWIvUmVtb3RlSW5zcGVjdG9yR2xpYi5jcHA6CisgICAgICAgIChJbnNwZWN0b3I6OnRhcmdldERl YnVnZ2FibGVUeXBlKToKKyAgICAgICAgKEluc3BlY3Rvcjo6UmVtb3RlSW5zcGVjdG9yOjpsaXN0 aW5nRm9ySW5zcGVjdGlvblRhcmdldCBjb25zdCk6CisKIDIwMjAtMDEtMjYgIEFsZXhleSBTaHZh eWthICA8c2h2YWlrYWxlc2hAZ21haWwuY29tPgogCiAgICAgICAgIEludmFsaWQgcmFuZ2VzIGlu IGNoYXJhY3RlciBjbGFzc2VzIHNob3VsZCBiZSBiYW5uZWQgaW4gdW5pY29kZSBwYXR0ZXJucwpk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvZ2xpYi9S ZW1vdGVJbnNwZWN0b3JHbGliLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Iv cmVtb3RlL2dsaWIvUmVtb3RlSW5zcGVjdG9yR2xpYi5jcHAKaW5kZXggNGE1MjEwODNjY2UuLjQ3 MzhmNTA0N2JlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Jl bW90ZS9nbGliL1JlbW90ZUluc3BlY3RvckdsaWIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9pbnNwZWN0b3IvcmVtb3RlL2dsaWIvUmVtb3RlSW5zcGVjdG9yR2xpYi5jcHAKQEAgLTE0 NiwxOSArMTQ2LDMwIEBAIHZvaWQgUmVtb3RlSW5zcGVjdG9yOjpzZXR1cENvbm5lY3Rpb24oUmVm PFNvY2tldENvbm5lY3Rpb24+JiYgY29ubmVjdGlvbikKICAgICAgICAgcHVzaExpc3RpbmdzU29v bigpOwogfQogCitzdGF0aWMgY29uc3QgY2hhciogdGFyZ2V0RGVidWdnYWJsZVR5cGUoUmVtb3Rl SW5zcGVjdGlvblRhcmdldDo6VHlwZSB0eXBlKQoreworICAgIHN3aXRjaCAodHlwZSkgeworICAg IGNhc2UgUmVtb3RlSW5zcGVjdGlvblRhcmdldDo6VHlwZTo6SmF2YVNjcmlwdDoKKyAgICAgICAg cmV0dXJuICJKYXZhU2NyaXB0IjsKKyAgICBjYXNlIFJlbW90ZUluc3BlY3Rpb25UYXJnZXQ6OlR5 cGU6OlNlcnZpY2VXb3JrZXI6CisgICAgICAgIHJldHVybiAiU2VydmljZVdvcmtlciI7CisgICAg Y2FzZSBSZW1vdGVJbnNwZWN0aW9uVGFyZ2V0OjpUeXBlOjpXZWJQYWdlOgorICAgICAgICByZXR1 cm4gIldlYlBhZ2UiOworICAgIGRlZmF1bHQ6CisgICAgICAgIGJyZWFrOworICAgIH0KKworICAg IFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7Cit9CisKIFRhcmdldExpc3RpbmcgUmVtb3Rl SW5zcGVjdG9yOjpsaXN0aW5nRm9ySW5zcGVjdGlvblRhcmdldChjb25zdCBSZW1vdGVJbnNwZWN0 aW9uVGFyZ2V0JiB0YXJnZXQpIGNvbnN0CiB7CiAgICAgaWYgKCF0YXJnZXQucmVtb3RlRGVidWdn aW5nQWxsb3dlZCgpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAotICAgIC8vIEZJWE1FOiBT dXBwb3J0IHJlbW90ZSBkZWJ1Z2dpbmcgb2YgYSBTZXJ2aWNlV29ya2VyLgotICAgIGlmICh0YXJn ZXQudHlwZSgpID09IFJlbW90ZUluc3BlY3Rpb25UYXJnZXQ6OlR5cGU6OlNlcnZpY2VXb3JrZXIp Ci0gICAgICAgIHJldHVybiBudWxscHRyOwotCi0gICAgQVNTRVJUKHRhcmdldC50eXBlKCkgPT0g UmVtb3RlSW5zcGVjdGlvblRhcmdldDo6VHlwZTo6SmF2YVNjcmlwdCB8fCB0YXJnZXQudHlwZSgp ID09IFJlbW90ZUluc3BlY3Rpb25UYXJnZXQ6OlR5cGU6OlBhZ2UgfHwgdGFyZ2V0LnR5cGUoKSA9 PSBSZW1vdGVJbnNwZWN0aW9uVGFyZ2V0OjpUeXBlOjpXZWJQYWdlKTsKICAgICByZXR1cm4gZ192 YXJpYW50X25ldygiKHRzc3NiKSIsIHN0YXRpY19jYXN0PGd1aW50NjQ+KHRhcmdldC50YXJnZXRJ ZGVudGlmaWVyKCkpLAotICAgICAgICB0YXJnZXQudHlwZSgpID09IFJlbW90ZUluc3BlY3Rpb25U YXJnZXQ6OlR5cGU6OkphdmFTY3JpcHQgPyAiSmF2YVNjcmlwdCIgOiAiV2ViIiwKLSAgICAgICAg dGFyZ2V0Lm5hbWUoKS51dGY4KCkuZGF0YSgpLCB0YXJnZXQudHlwZSgpID09IFJlbW90ZUluc3Bl Y3Rpb25UYXJnZXQ6OlR5cGU6OkphdmFTY3JpcHQgPyAibnVsbCIgOiB0YXJnZXQudXJsKCkudXRm OCgpLmRhdGEoKSwKKyAgICAgICAgdGFyZ2V0RGVidWdnYWJsZVR5cGUodGFyZ2V0LnR5cGUoKSks IHRhcmdldC5uYW1lKCkudXRmOCgpLmRhdGEoKSwKKyAgICAgICAgdGFyZ2V0LnR5cGUoKSA9PSBS ZW1vdGVJbnNwZWN0aW9uVGFyZ2V0OjpUeXBlOjpKYXZhU2NyaXB0ID8gIm51bGwiIDogdGFyZ2V0 LnVybCgpLnV0ZjgoKS5kYXRhKCksCiAgICAgICAgIHRhcmdldC5oYXNMb2NhbERlYnVnZ2VyKCkp OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCmluZGV4IDI5Y2IyM2JmZTNhLi44MDA2N2JiNzA0OCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyNSBAQAorMjAyMC0wMS0yNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lh QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gUmVtb3RlIEluc3BlY3RvcjogYWRkIHN1cHBv cnQgZm9yIHNlcnZpY2Ugd29ya2VycyB0YXJnZXRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDY4MjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgc3VwcG9ydCBmb3IgZGVidWdnaW5nIHNlcnZpY2Ug d29ya2Vycy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFJlbW90ZUluc3Bl Y3RvclByb3RvY29sSGFuZGxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUluc3BlY3Rv clByb3RvY29sSGFuZGxlcjo6aGFuZGxlUmVxdWVzdCk6IFBhc3MgdGFyZ2V0IHR5cGUgdG8gbWVz c2FnZSBoYW5kbGVyIHRvby4KKyAgICAgICAgKFdlYktpdDo6UmVtb3RlSW5zcGVjdG9yUHJvdG9j b2xIYW5kbGVyOjppbnNwZWN0KTogUGFzcyB0aGUgcmVjZWl2ZWQgdGFyZ2V0IHR5cGUgdG8gdGhl IGNsaWVudC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRSZW1vdGVJbnNwZWN0 b3JQcm90b2NvbEhhbmRsZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvZ2xpYi9SZW1vdGVJbnNw ZWN0b3JDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVJbnNwZWN0b3JQcm94eTo6 bG9hZCk6IEl0IG5vdyByZWNlaXZlcyB0aGUgZGVidWdnYWJsZSB0eXBlIHRoYXQgaXMgc2V0IHRv IHRoZSBBUEk6OkRlYnVnZ2FibGVJbmZvLgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVJbnNwZWN0 b3JDbGllbnQ6Om1lc3NhZ2VIYW5kbGVycyk6IEhhbmRsZSBzZXJ2aWNlIHdvcmtlciB0YXJnZXRz IHRvby4KKyAgICAgICAgKFdlYktpdDo6ZGVidWdnYWJsZVR5cGUpOiBIZWxwZXIgdG8gY29udmVy dCB0aGUgdGFyZ2V0IHR5cGUgdG8gZGVidWdnYWJsZSB0eXBlLgorICAgICAgICAoV2ViS2l0OjpS ZW1vdGVJbnNwZWN0b3JDbGllbnQ6Omluc3BlY3QpOiBQYXNzIHRoZSBkZWJ1Z2dhYmxlIHR1cGUg dG8gUmVtb3RlSW5zcGVjdG9yUHJveHk6OmxvYWQoKS4KKyAgICAgICAgKiBVSVByb2Nlc3MvZ2xp Yi9SZW1vdGVJbnNwZWN0b3JDbGllbnQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL1dlYklu c3BlY3RvclByb3h5R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yUHJveHk6 OmluZm9Gb3JMb2NhbERlYnVnZ2FibGUpOiBVc2UgV2ViUGFnZSBhcyBkZWJ1Z2dhYmxlIHR5cGUg aW5zdGVhZCBvZiB0aGUgZGVmYXVsdC4KKwogMjAyMC0wMS0yNiAgRnVqaWkgSGlyb25vcmkgIDxI aXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBbV2luQ2Fpcm9dW2N1cmxdIEFTU0VS VElPTiBGQUlMRUQ6IHNlc3Npb25JRCAhPSBQQUw6OlNlc3Npb25JRDo6ZGVmYXVsdFNlc3Npb25J RCgpIGluIE5ldHdvcmtQcm9jZXNzIHNpbmNlIHIyNTUwNjcKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UmVtb3RlSW5zcGVjdG9yUHJvdG9jb2xIYW5k bGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UmVtb3RlSW5z cGVjdG9yUHJvdG9jb2xIYW5kbGVyLmNwcAppbmRleCA2ZWMyNjBiMmNjNC4uMTZhY2JkODVlYWEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UmVtb3Rl SW5zcGVjdG9yUHJvdG9jb2xIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFJlbW90ZUluc3BlY3RvclByb3RvY29sSGFuZGxlci5jcHAKQEAgLTQ2 LDExICs0NiwxMSBAQCBwdWJsaWM6CiAgICAgewogICAgICAgICBTdHJpbmcgbWVzc2FnZSA9IHNl cmlhbGl6ZWRTY3JpcHRWYWx1ZS50b1N0cmluZygpOwogICAgICAgICBWZWN0b3I8U3RyaW5nPiB0 b2tlbnMgPSBtZXNzYWdlLnNwbGl0KCc6Jyk7Ci0gICAgICAgIGlmICh0b2tlbnMuc2l6ZSgpICE9 IDIpCisgICAgICAgIGlmICh0b2tlbnMuc2l6ZSgpICE9IDMpCiAgICAgICAgICAgICByZXR1cm47 CiAKICAgICAgICAgVVJMIHJlcXVlc3RVUkwgPSBVUkwoeyB9LCBwYWdlLnBhZ2VMb2FkU3RhdGUo KS51cmwoKSk7Ci0gICAgICAgIG1faW5zcGVjdG9yUHJvdG9jb2xIYW5kbGVyLmluc3BlY3QocmVx dWVzdFVSTC5ob3N0QW5kUG9ydCgpLCB0b2tlbnNbMF0udG9VSW50NjQoKSwgdG9rZW5zWzFdLnRv VUludDY0KCkpOworICAgICAgICBtX2luc3BlY3RvclByb3RvY29sSGFuZGxlci5pbnNwZWN0KHJl cXVlc3RVUkwuaG9zdEFuZFBvcnQoKSwgdG9rZW5zWzBdLnRvVUludDY0KCksIHRva2Vuc1sxXS50 b1VJbnQ2NCgpLCB0b2tlbnNbMl0pOwogICAgIH0KIAogICAgIH5TY3JpcHRNZXNzYWdlQ2xpZW50 KCkgeyB9CkBAIC0xNDMsOCArMTQzLDggQEAgdm9pZCBSZW1vdGVJbnNwZWN0b3JQcm90b2NvbEhh bmRsZXI6OmhhbmRsZVJlcXVlc3QoV2ViS2l0VVJJU2NoZW1lUmVxdWVzdCogcmVxdWUKICAgICAg ICAgICAgICAgICBnX3N0cmluZ19hcHBlbmRfcHJpbnRmKGh0bWwsCiAgICAgICAgICAgICAgICAg ICAgICI8dGJvZHk+PHRyPiIKICAgICAgICAgICAgICAgICAgICAgIjx0ZCBjbGFzcz1cImRhdGFc Ij48ZGl2IGNsYXNzPVwidGFyZ2V0bmFtZVwiPiVzPC9kaXY+PGRpdiBjbGFzcz1cInRhcmdldHVy bFwiPiVzPC9kaXY+PC90ZD4iCi0gICAgICAgICAgICAgICAgICAgICI8dGQgY2xhc3M9XCJpbnB1 dFwiPjxpbnB1dCB0eXBlPVwiYnV0dG9uXCIgdmFsdWU9XCJJbnNwZWN0XCIgb25jbGljaz1cIndp bmRvdy53ZWJraXQubWVzc2FnZUhhbmRsZXJzLmluc3BlY3Rvci5wb3N0TWVzc2FnZSgnJSIgR19H VUlOVDY0X0ZPUk1BVCAiOiUiIEdfR1VJTlQ2NF9GT1JNQVQgIicpO1wiPjwvdGQ+IgotICAgICAg ICAgICAgICAgICAgICAiPC90cj48L3Rib2R5PiIsIHRhcmdldC5uYW1lLmRhdGEoKSwgdGFyZ2V0 LnVybC5kYXRhKCksIGNvbm5lY3Rpb25JRCwgdGFyZ2V0LmlkKTsKKyAgICAgICAgICAgICAgICAg ICAgIjx0ZCBjbGFzcz1cImlucHV0XCI+PGlucHV0IHR5cGU9XCJidXR0b25cIiB2YWx1ZT1cIklu c3BlY3RcIiBvbmNsaWNrPVwid2luZG93LndlYmtpdC5tZXNzYWdlSGFuZGxlcnMuaW5zcGVjdG9y LnBvc3RNZXNzYWdlKCclIiBHX0dVSU5UNjRfRk9STUFUICI6JSIgR19HVUlOVDY0X0ZPUk1BVCAi OiVzJyk7XCI+PC90ZD4iCisgICAgICAgICAgICAgICAgICAgICI8L3RyPjwvdGJvZHk+IiwgdGFy Z2V0Lm5hbWUuZGF0YSgpLCB0YXJnZXQudXJsLmRhdGEoKSwgY29ubmVjdGlvbklELCB0YXJnZXQu aWQsIHRhcmdldC50eXBlLmRhdGEoKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAg ICAgZ19zdHJpbmdfYXBwZW5kKGh0bWwsICI8L3RhYmxlPiIpOwpAQCAtMTU1LDEwICsxNTUsMTAg QEAgdm9pZCBSZW1vdGVJbnNwZWN0b3JQcm90b2NvbEhhbmRsZXI6OmhhbmRsZVJlcXVlc3QoV2Vi S2l0VVJJU2NoZW1lUmVxdWVzdCogcmVxdWUKICAgICB3ZWJraXRfdXJpX3NjaGVtZV9yZXF1ZXN0 X2ZpbmlzaChyZXF1ZXN0LCBzdHJlYW0uZ2V0KCksIHN0cmVhbUxlbmd0aCwgInRleHQvaHRtbCIp OwogfQogCi12b2lkIFJlbW90ZUluc3BlY3RvclByb3RvY29sSGFuZGxlcjo6aW5zcGVjdChjb25z dCBTdHJpbmcmIGhvc3RBbmRQb3J0LCB1aW50NjRfdCBjb25uZWN0aW9uSUQsIHVpbnQ2NF90IHRh dGdldElEKQordm9pZCBSZW1vdGVJbnNwZWN0b3JQcm90b2NvbEhhbmRsZXI6Omluc3BlY3QoY29u c3QgU3RyaW5nJiBob3N0QW5kUG9ydCwgdWludDY0X3QgY29ubmVjdGlvbklELCB1aW50NjRfdCB0 YXRnZXRJRCwgY29uc3QgU3RyaW5nJiB0YXJnZXRUeXBlKQogewogICAgIGlmIChhdXRvKiBjbGll bnQgPSBtX2luc3BlY3RvckNsaWVudHMuZ2V0KGhvc3RBbmRQb3J0KSkKLSAgICAgICAgY2xpZW50 LT5pbnNwZWN0KGNvbm5lY3Rpb25JRCwgdGF0Z2V0SUQpOworICAgICAgICBjbGllbnQtPmluc3Bl Y3QoY29ubmVjdGlvbklELCB0YXRnZXRJRCwgdGFyZ2V0VHlwZSk7CiB9CiAKIHZvaWQgUmVtb3Rl SW5zcGVjdG9yUHJvdG9jb2xIYW5kbGVyOjp0YXJnZXRMaXN0Q2hhbmdlZChSZW1vdGVJbnNwZWN0 b3JDbGllbnQmIGNsaWVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0UmVtb3RlSW5zcGVjdG9yUHJvdG9jb2xIYW5kbGVyLmggYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFJlbW90ZUluc3BlY3RvclByb3RvY29sSGFuZGxl ci5oCmluZGV4IDliZDk4ZjZiYTlmLi5jNDg3M2U3NTY2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRSZW1vdGVJbnNwZWN0b3JQcm90b2NvbEhhbmRs ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFJlbW90ZUlu c3BlY3RvclByb3RvY29sSGFuZGxlci5oCkBAIC0zNyw3ICszNyw3IEBAIHB1YmxpYzoKICAgICBl eHBsaWNpdCBSZW1vdGVJbnNwZWN0b3JQcm90b2NvbEhhbmRsZXIoV2ViS2l0V2ViQ29udGV4dCog Y29udGV4dCk7CiAgICAgflJlbW90ZUluc3BlY3RvclByb3RvY29sSGFuZGxlcigpOwogCi0gICAg dm9pZCBpbnNwZWN0KGNvbnN0IFN0cmluZyYgaG9zdEFuZFBvcnQsIHVpbnQ2NF90IGNvbm5lY3Rp b25JRCwgdWludDY0X3QgdGFyZ2V0SUQpOworICAgIHZvaWQgaW5zcGVjdChjb25zdCBTdHJpbmcm IGhvc3RBbmRQb3J0LCB1aW50NjRfdCBjb25uZWN0aW9uSUQsIHVpbnQ2NF90IHRhcmdldElELCBj b25zdCBTdHJpbmcmIHRhcmdldFR5cGUpOwogCiBwcml2YXRlOgogICAgIHN0YXRpYyB2b2lkIHdl YlZpZXdEZXN0cm95ZWQoUmVtb3RlSW5zcGVjdG9yUHJvdG9jb2xIYW5kbGVyKiwgV2ViS2l0V2Vi VmlldyopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ2xpYi9SZW1vdGVJ bnNwZWN0b3JDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ2xpYi9SZW1vdGVJ bnNwZWN0b3JDbGllbnQuY3BwCmluZGV4IGQ5ZDUwZGMyODZiLi41N2VmMTc0OTczOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ2xpYi9SZW1vdGVJbnNwZWN0b3JDbGllbnQu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2dsaWIvUmVtb3RlSW5zcGVjdG9yQ2xp ZW50LmNwcApAQCAtNTcsMTEgKzU3LDExIEBAIHB1YmxpYzoKICAgICAgICAgbV9wcm94eS0+aW52 YWxpZGF0ZSgpOwogICAgIH0KIAotICAgIHZvaWQgbG9hZCgpCisgICAgdm9pZCBsb2FkKEluc3Bl Y3Rvcjo6RGVidWdnYWJsZVR5cGUgZGVidWdnYWJsZVR5cGUpCiAgICAgewogICAgICAgICAvLyBG SVhNRSA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMjA1NTM2PjogdGhpcyBzaG91bGQgaW5mZXIgbW9y ZSB1c2VmdWwgZGF0YSBhYm91dCB0aGUgZGVidWcgdGFyZ2V0LgogICAgICAgICBSZWY8QVBJOjpE ZWJ1Z2dhYmxlSW5mbz4gZGVidWdnYWJsZUluZm8gPSBBUEk6OkRlYnVnZ2FibGVJbmZvOjpjcmVh dGUoRGVidWdnYWJsZUluZm9EYXRhOjplbXB0eSgpKTsKLSAgICAgICAgZGVidWdnYWJsZUluZm8t PnNldERlYnVnZ2FibGVUeXBlKEluc3BlY3Rvcjo6RGVidWdnYWJsZVR5cGU6OldlYlBhZ2UpOwor ICAgICAgICBkZWJ1Z2dhYmxlSW5mby0+c2V0RGVidWdnYWJsZVR5cGUoZGVidWdnYWJsZVR5cGUp OwogICAgICAgICBtX3Byb3h5LT5sb2FkKFdURk1vdmUoZGVidWdnYWJsZUluZm8pLCBtX2luc3Bl Y3RvckNsaWVudC5iYWNrZW5kQ29tbWFuZHNVUkwoKSk7CiAgICAgfQogCkBAIC0xMzEsNyArMTMx LDcgQEAgY29uc3QgU29ja2V0Q29ubmVjdGlvbjo6TWVzc2FnZUhhbmRsZXJzJiBSZW1vdGVJbnNw ZWN0b3JDbGllbnQ6Om1lc3NhZ2VIYW5kbGVycygKICAgICAgICAgICAgIGNvbnN0IGNoYXIqIHVy bDsKICAgICAgICAgICAgIGdib29sZWFuIGhhc0xvY2FsRGVidWdnZXI7CiAgICAgICAgICAgICB3 aGlsZSAoZ192YXJpYW50X2l0ZXJfbG9vcChpdGVyLmdldCgpLCAiKHQmcyZzJnNiKSIsICZ0YXJn ZXRJRCwgJnR5cGUsICZuYW1lLCAmdXJsLCAmaGFzTG9jYWxEZWJ1Z2dlcikpIHsKLSAgICAgICAg ICAgICAgICBpZiAoIWdfc3RyY21wMCh0eXBlLCAiV2ViIikgfHwgIWdfc3RyY21wMCh0eXBlLCAi SmF2YVNjcmlwdCIpKQorICAgICAgICAgICAgICAgIGlmICghZ19zdHJjbXAwKHR5cGUsICJKYXZh U2NyaXB0IikgfHwgIWdfc3RyY21wMCh0eXBlLCAiU2VydmljZVdvcmtlciIpIHx8ICFnX3N0cmNt cDAodHlwZSwgIldlYlBhZ2UiKSkKICAgICAgICAgICAgICAgICAgICAgdGFyZ2V0TGlzdC51bmNo ZWNrZWRBcHBlbmQoeyB0YXJnZXRJRCwgdHlwZSwgbmFtZSwgdXJsIH0pOwogICAgICAgICAgICAg fQogICAgICAgICAgICAgY2xpZW50LnNldFRhcmdldExpc3QoY29ubmVjdGlvbklELCBXVEZNb3Zl KHRhcmdldExpc3QpKTsKQEAgLTIwMyw3ICsyMDMsMTggQEAgdm9pZCBSZW1vdGVJbnNwZWN0b3JD bGllbnQ6OmNvbm5lY3Rpb25EaWRDbG9zZSgpCiAgICAgbV9vYnNlcnZlci5jb25uZWN0aW9uQ2xv c2VkKCp0aGlzKTsKIH0KIAotdm9pZCBSZW1vdGVJbnNwZWN0b3JDbGllbnQ6Omluc3BlY3QodWlu dDY0X3QgY29ubmVjdGlvbklELCB1aW50NjRfdCB0YXJnZXRJRCkKK3N0YXRpYyBJbnNwZWN0b3I6 OkRlYnVnZ2FibGVUeXBlIGRlYnVnZ2FibGVUeXBlKGNvbnN0IFN0cmluZyYgdGFyZ2V0VHlwZSkK K3sKKyAgICBpZiAodGFyZ2V0VHlwZSA9PSAiSmF2YVNjcmlwdCIpCisgICAgICAgIHJldHVybiBJ bnNwZWN0b3I6OkRlYnVnZ2FibGVUeXBlOjpKYXZhU2NyaXB0OworICAgIGlmICh0YXJnZXRUeXBl ID09ICJTZXJ2aWNlV29ya2VyIikKKyAgICAgICAgcmV0dXJuIEluc3BlY3Rvcjo6RGVidWdnYWJs ZVR5cGU6OlNlcnZpY2VXb3JrZXI7CisgICAgaWYgKHRhcmdldFR5cGUgPT0gIldlYlBhZ2UiKQor ICAgICAgICByZXR1cm4gSW5zcGVjdG9yOjpEZWJ1Z2dhYmxlVHlwZTo6V2ViUGFnZTsKKyAgICBS RUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOworfQorCit2b2lkIFJlbW90ZUluc3BlY3RvckNs aWVudDo6aW5zcGVjdCh1aW50NjRfdCBjb25uZWN0aW9uSUQsIHVpbnQ2NF90IHRhcmdldElELCBj b25zdCBTdHJpbmcmIHRhcmdldFR5cGUpCiB7CiAgICAgYXV0byBhZGRSZXN1bHQgPSBtX2luc3Bl Y3RvclByb3h5TWFwLmVuc3VyZShzdGQ6Om1ha2VfcGFpcihjb25uZWN0aW9uSUQsIHRhcmdldElE KSwgW3RoaXMsIGNvbm5lY3Rpb25JRCwgdGFyZ2V0SURdIHsKICAgICAgICAgcmV0dXJuIG1ha2VV bmlxdWU8UmVtb3RlSW5zcGVjdG9yUHJveHk+KCp0aGlzLCBjb25uZWN0aW9uSUQsIHRhcmdldElE KTsKQEAgLTIxNCw3ICsyMjUsNyBAQCB2b2lkIFJlbW90ZUluc3BlY3RvckNsaWVudDo6aW5zcGVj dCh1aW50NjRfdCBjb25uZWN0aW9uSUQsIHVpbnQ2NF90IHRhcmdldElEKQogICAgIH0KIAogICAg IG1fc29ja2V0Q29ubmVjdGlvbi0+c2VuZE1lc3NhZ2UoIlNldHVwIiwgZ192YXJpYW50X25ldygi KHR0KSIsIGNvbm5lY3Rpb25JRCwgdGFyZ2V0SUQpKTsKLSAgICBhZGRSZXN1bHQuaXRlcmF0b3It PnZhbHVlLT5sb2FkKCk7CisgICAgYWRkUmVzdWx0Lml0ZXJhdG9yLT52YWx1ZS0+bG9hZChkZWJ1 Z2dhYmxlVHlwZSh0YXJnZXRUeXBlKSk7CiB9CiAKIHZvaWQgUmVtb3RlSW5zcGVjdG9yQ2xpZW50 OjpzZW5kTWVzc2FnZVRvQmFja2VuZCh1aW50NjRfdCBjb25uZWN0aW9uSUQsIHVpbnQ2NF90IHRh cmdldElELCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9nbGliL1JlbW90ZUluc3BlY3RvckNsaWVudC5oIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvZ2xpYi9SZW1vdGVJbnNwZWN0b3JDbGllbnQuaAppbmRleCBhZGVlMDJjZTVkNi4u MzI0MzE2ZDVkZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2dsaWIvUmVt b3RlSW5zcGVjdG9yQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ2xpYi9S ZW1vdGVJbnNwZWN0b3JDbGllbnQuaApAQCAtNjYsNyArNjYsNyBAQCBwdWJsaWM6CiAgICAgY29u c3QgU3RyaW5nJiBob3N0QW5kUG9ydCgpIGNvbnN0IHsgcmV0dXJuIG1faG9zdEFuZFBvcnQ7IH0K ICAgICBjb25zdCBTdHJpbmcmIGJhY2tlbmRDb21tYW5kc1VSTCgpIGNvbnN0IHsgcmV0dXJuIG1f YmFja2VuZENvbW1hbmRzVVJMOyB9CiAKLSAgICB2b2lkIGluc3BlY3QodWludDY0X3QgY29ubmVj dGlvbklELCB1aW50NjRfdCB0YXJnZXRJRCk7CisgICAgdm9pZCBpbnNwZWN0KHVpbnQ2NF90IGNv bm5lY3Rpb25JRCwgdWludDY0X3QgdGFyZ2V0SUQsIGNvbnN0IFN0cmluZyYgdGFyZ2V0VHlwZSk7 CiAgICAgdm9pZCBzZW5kTWVzc2FnZVRvQmFja2VuZCh1aW50NjRfdCBjb25uZWN0aW9uSUQsIHVp bnQ2NF90IHRhcmdldElELCBjb25zdCBTdHJpbmcmKTsKICAgICB2b2lkIGNsb3NlRnJvbUZyb250 ZW5kKHVpbnQ2NF90IGNvbm5lY3Rpb25JRCwgdWludDY0X3QgdGFyZ2V0SUQpOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvV2ViSW5zcGVjdG9yUHJveHlHdGsuY3Bw IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcApp bmRleCBjZmRlMzQ5YmI3MS4uODE3YzM5ODZkM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2d0ay9XZWJJbnNwZWN0b3JQcm94eUd0ay5jcHAKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvZ3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcApAQCAtNDQsNiArNDQsNyBA QAogI2luY2x1ZGUgIldlYlByb2Nlc3NQcm94eS5oIgogI2luY2x1ZGUgPFdlYkNvcmUvQ2VydGlm aWNhdGVJbmZvLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9HdGtVdGlsaXRpZXMuaD4KKyNpbmNsdWRl IDxXZWJDb3JlL0luc3BlY3RvckRlYnVnZ2FibGVUeXBlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9O b3RJbXBsZW1lbnRlZC5oPgogI2luY2x1ZGUgPHd0Zi9GaWxlU3lzdGVtLmg+CiAjaW5jbHVkZSA8 d3RmL3RleHQvQmFzZTY0Lmg+CkBAIC0zNjcsNyArMzY4LDkgQEAgU3RyaW5nIFdlYkluc3BlY3Rv clByb3h5OjppbnNwZWN0b3JCYXNlVVJMKCkKIERlYnVnZ2FibGVJbmZvRGF0YSBXZWJJbnNwZWN0 b3JQcm94eTo6aW5mb0ZvckxvY2FsRGVidWdnYWJsZSgpCiB7CiAgICAgLy8gRklYTUUgPGh0dHBz Oi8vd2Via2l0Lm9yZy9iLzIwNTUzNj46IHRoaXMgc2hvdWxkIGluZmVyIG1vcmUgdXNlZnVsIGRh dGEgYWJvdXQgdGhlIGRlYnVnIHRhcmdldC4KLSAgICByZXR1cm4gRGVidWdnYWJsZUluZm9EYXRh OjplbXB0eSgpOworICAgIGF1dG8gZGF0YSA9IERlYnVnZ2FibGVJbmZvRGF0YTo6ZW1wdHkoKTsK KyAgICBkYXRhLmRlYnVnZ2FibGVUeXBlID0gSW5zcGVjdG9yOjpEZWJ1Z2dhYmxlVHlwZTo6V2Vi UGFnZTsKKyAgICByZXR1cm4gZGF0YTsKIH0KIAogdW5zaWduZWQgV2ViSW5zcGVjdG9yUHJveHk6 OnBsYXRmb3JtSW5zcGVjdGVkV2luZG93SGVpZ2h0KCkK