238990 2022-04-08 02:57:29 -0700 [GTK] RemoteInspector: update target list page contents on change instead of reloading 2022-04-08 04:56:40 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned aperez bugs-noreply oldest_to_newest 1859639 0 cgarcia 2022-04-08 02:57:29 -0700 We can use webkit_web_view_run_javascript to replace the target list with the new one. 1859642 1 457036 cgarcia 2022-04-08 03:06:11 -0700 Created attachment 457036 Patch 1859643 2 457037 cgarcia 2022-04-08 03:11:31 -0700 Created attachment 457037 Patch 1859675 3 cgarcia 2022-04-08 04:56:40 -0700 Committed r292599 (249432@trunk): <https://commits.webkit.org/249432@trunk> 457036 2022-04-08 03:06:11 -0700 2022-04-08 03:11:31 -0700 Patch wk-inspector-target-list.diff text/plain 14916 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggM2Q3OGFmMzg0ZDRjLi5iMzBiNWNjMmU0MzIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMzAgQEAKKzIwMjItMDQtMDggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtHVEtdIFJlbW90ZUluc3BlY3RvcjogdXBkYXRlIHRhcmdldCBs aXN0IHBhZ2UgY29udGVudHMgb24gY2hhbmdlIGluc3RlYWQgb2YgcmVsb2FkaW5nCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg5OTAKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBjYW4gdXNlIHdlYmtp dF93ZWJfdmlld19ydW5famF2YXNjcmlwdCgpIHRvIHJlcGxhY2UgdGhlIHRhcmdldCBsaXN0IHdp dGggdGhlIG5ldyBvbmUuIFRoaXMgYWxzbyBmaXhlcyB0aGUgcmFjZQorICAgICAgICBjb25kaXRp b24gd2hlbiBsb2FkaW5nIGluc3BlY3RvcjovLyBmb3IgdGhlIGZpcnN0IHRpbWUgdGhhdCB0YXJn ZXQgbGlzdCBpcyBhbHdheXMgZW1wdHkuIFRoZSB3ZWIgdmlldyBIYXNoU2V0IGlzCisgICAgICAg IG5vdyBhIEhhc2hNYXAgd2hlcmUgdGhlIHZhbHVlIGlzIGEgcG9pbnRlciB0byB0aGUgY2xpZW50 IHRvIGJlIGFibGUgdG8gYXNzb2NpYXRlIHdlYiB2aWV3IHdpdGggaXRzIGNsaWVudAorICAgICAg ICB3aXRob3V0IGhhdmluZyB0byBjaGVjayB0aGUgaG9zdCBhbmQgcG9ydC4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFJlbW90ZUluc3BlY3RvclByb3RvY29sSGFuZGxlci5j cHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUluc3BlY3RvclByb3RvY29sSGFuZGxlcjo6flJl bW90ZUluc3BlY3RvclByb3RvY29sSGFuZGxlcik6IERpc2Nvbm5lY3Qgd2ViIHZpZXcgc2lnbmFs cy4KKyAgICAgICAgKFdlYktpdDo6UmVtb3RlSW5zcGVjdG9yUHJvdG9jb2xIYW5kbGVyOjpoYW5k bGVSZXF1ZXN0KTogT24gbmV3IHdlYiB2aWV3LCBjb25uZWN0IHRvIG5vdGlmeTo6dXJpIGFuZCBy ZW1vdmUgdGhlCisgICAgICAgIHdlYiB2aWV3IGlmIGl0J3Mgbm8gbG9uZ2VyIHNob3dpbmcgYW4g aW5zcGVjdG9yIHBhZ2UgbGlzdC4KKyAgICAgICAgKFdlYktpdDo6UmVtb3RlSW5zcGVjdG9yUHJv dG9jb2xIYW5kbGVyOjp1cGRhdGVUYXJnZXRMaXN0KTogVXBkYXRlIHRoZSB0YXJnZXQgbGlzdCBo dG1sLgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVJbnNwZWN0b3JQcm90b2NvbEhhbmRsZXI6Ondl YlZpZXdMb2FkQ2hhbmdlZCk6IENhbGwgdXBkYXRlVGFyZ2V0TGlzdCgpIHdoZW4gbG9hZCBmaW5p c2hlZC4KKyAgICAgICAgKFdlYktpdDo6UmVtb3RlSW5zcGVjdG9yUHJvdG9jb2xIYW5kbGVyOjp0 YXJnZXRMaXN0Q2hhbmdlZCk6IENhbGwgdXBkYXRlVGFyZ2V0TGlzdCgpIGZvciB3ZWIgdmlld3Mg dGhhdCBhcmUgbm90CisgICAgICAgIGxvYWRpbmcuIEZvciBsb2FkaW5nIHdlYiB2aWV3IGNvbm5l Y3QgdG8gbG9hZC1ldmVudCB0byB1cGRhdGUgdGhlIHRhcmdldCBsaXN0IG9uY2UgdGhlIGxvYWQg ZmluaXNoZXMuCisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUluc3BlY3RvclByb3RvY29sSGFuZGxl cjo6Y29ubmVjdGlvbkNsb3NlZCk6IFJlbW92ZSB0aGUgYXNzb2NpYXRlZCB3ZWIgdmlld3MuCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UmVtb3RlSW5zcGVjdG9yUHJvdG9jb2xI YW5kbGVyLmg6CisgICAgICAgICogVUlQcm9jZXNzL0luc3BlY3Rvci9nbGliL1JlbW90ZUluc3Bl Y3RvckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUluc3BlY3RvckNsaWVudDo6 YXBwZW5kVGFyZ2VydExpc3QgY29uc3QpOiBBcHBlbmQgdGhlIHRhcmdldCBsaXN0IGh0bWwgdG8g dGhlIGdpdmVuIEdTdHJpbmcuCisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUluc3BlY3RvckNsaWVu dDo6YnVpbGRUYXJnZXRMaXN0UGFnZSBjb25zdCk6IFVzZSBhcHBlbmRUYXJnZXJ0TGlzdCgpIG5v dy4KKyAgICAgICAgKiBVSVByb2Nlc3MvSW5zcGVjdG9yL2dsaWIvUmVtb3RlSW5zcGVjdG9yQ2xp ZW50Lmg6CisKIDIwMjItMDQtMDcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFVzZSBjb21wdXRlZFN0eWxlTWFwKCkg aW5zdGVhZCBvZiBkZXByZWNhdGVkIGdldFByb3BlcnR5Q1NTVmFsdWUoKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRSZW1vdGVJbnNwZWN0b3JQcm90 b2NvbEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRS ZW1vdGVJbnNwZWN0b3JQcm90b2NvbEhhbmRsZXIuY3BwCmluZGV4IDkwODJhYWNkZjdmNi4uYWMy YWE5ZjM1NmVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFJlbW90ZUluc3BlY3RvclByb3RvY29sSGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRSZW1vdGVJbnNwZWN0b3JQcm90b2NvbEhhbmRsZXIu Y3BwCkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSAiV2ViUGFnZVByb3h5LmgiCiAjaW5jbHVk ZSAiV2ViU2NyaXB0TWVzc2FnZUhhbmRsZXIuaCIKICNpbmNsdWRlIDx3dGYvVVJMLmg+CisjaW5j bHVkZSA8d3RmL2dsaWIvR1VuaXF1ZVB0ci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ1Rv SW50ZWdlckNvbnZlcnNpb24uaD4KIAogbmFtZXNwYWNlIFdlYktpdCB7CkBAIC03OCw4ICs3OSwx MCBAQCBSZW1vdGVJbnNwZWN0b3JQcm90b2NvbEhhbmRsZXI6OlJlbW90ZUluc3BlY3RvclByb3Rv Y29sSGFuZGxlcihXZWJLaXRXZWJDb250ZXh0KgogCiBSZW1vdGVJbnNwZWN0b3JQcm90b2NvbEhh bmRsZXI6On5SZW1vdGVJbnNwZWN0b3JQcm90b2NvbEhhbmRsZXIoKQogewotICAgIGZvciAoYXV0 byogd2ViVmlldyA6IG1fd2ViVmlld3MpCisgICAgZm9yIChhdXRvKiB3ZWJWaWV3IDogbV93ZWJW aWV3cy5rZXlzKCkpIHsKKyAgICAgICAgZ19zaWduYWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9k YXRhKHdlYlZpZXcsIHRoaXMpOwogICAgICAgICBnX29iamVjdF93ZWFrX3VucmVmKEdfT0JKRUNU KHdlYlZpZXcpLCByZWludGVycHJldF9jYXN0PEdXZWFrTm90aWZ5Pih3ZWJWaWV3RGVzdHJveWVk KSwgdGhpcyk7CisgICAgfQogCiAgICAgZm9yIChhdXRvKiB1c2VyQ29udGVudE1hbmFnZXIgOiBt X3VzZXJDb250ZW50TWFuYWdlcnMpIHsKICAgICAgICAgd2Via2l0VXNlckNvbnRlbnRNYW5hZ2Vy R2V0VXNlckNvbnRlbnRDb250cm9sbGVyUHJveHkodXNlckNvbnRlbnRNYW5hZ2VyKS0+cmVtb3Zl VXNlck1lc3NhZ2VIYW5kbGVyRm9yTmFtZSgiaW5zcGVjdG9yIl9zLCBBUEk6OkNvbnRlbnRXb3Js ZDo6cGFnZUNvbnRlbnRXb3JsZCgpKTsKQEAgLTEwOCw5ICsxMTEsMTggQEAgdm9pZCBSZW1vdGVJ bnNwZWN0b3JQcm90b2NvbEhhbmRsZXI6OmhhbmRsZVJlcXVlc3QoV2ViS2l0VVJJU2NoZW1lUmVx dWVzdCogcmVxdWUKIAogICAgIGF1dG8qIHdlYlZpZXcgPSB3ZWJraXRfdXJpX3NjaGVtZV9yZXF1 ZXN0X2dldF93ZWJfdmlldyhyZXF1ZXN0KTsKICAgICBBU1NFUlQod2ViVmlldyk7Ci0gICAgYXV0 byB3ZWJWaWV3UmVzdWx0ID0gbV93ZWJWaWV3cy5hZGQod2ViVmlldyk7Ci0gICAgaWYgKHdlYlZp ZXdSZXN1bHQuaXNOZXdFbnRyeSkKKyAgICBhdXRvIHdlYlZpZXdSZXN1bHQgPSBtX3dlYlZpZXdz LmFkZCh3ZWJWaWV3LCBudWxscHRyKTsKKyAgICBpZiAod2ViVmlld1Jlc3VsdC5pc05ld0VudHJ5 KSB7CisgICAgICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2ViVmlldywgIm5vdGlmeTo6dXJpIiwgR19D QUxMQkFDSygrW10oV2ViS2l0V2ViVmlldyogd2ViVmlldywgR1BhcmFtU3BlYyosIFJlbW90ZUlu c3BlY3RvclByb3RvY29sSGFuZGxlciogaGFuZGxlcikgeworICAgICAgICAgICAgVVJMIHdlYlZp ZXdVUkwgPSBVUkwoU3RyaW5nOjpmcm9tVVRGOCh3ZWJraXRfd2ViX3ZpZXdfZ2V0X3VyaSh3ZWJW aWV3KSkpOworICAgICAgICAgICAgaWYgKCF3ZWJWaWV3VVJMLnByb3RvY29sSXMoImluc3BlY3Rv ciIpIHx8ICFoYW5kbGVyLT5tX2luc3BlY3RvckNsaWVudHMuY29udGFpbnMod2ViVmlld1VSTC5o b3N0QW5kUG9ydCgpKSkgeworICAgICAgICAgICAgICAgIGdfc2lnbmFsX2hhbmRsZXJzX2Rpc2Nv bm5lY3RfYnlfZGF0YSh3ZWJWaWV3LCBoYW5kbGVyKTsKKyAgICAgICAgICAgICAgICBnX29iamVj dF93ZWFrX3VucmVmKEdfT0JKRUNUKHdlYlZpZXcpLCByZWludGVycHJldF9jYXN0PEdXZWFrTm90 aWZ5Pih3ZWJWaWV3RGVzdHJveWVkKSwgaGFuZGxlcik7CisgICAgICAgICAgICAgICAgaGFuZGxl ci0+bV93ZWJWaWV3cy5yZW1vdmUod2ViVmlldyk7CisgICAgICAgICAgICB9CisgICAgICAgIH0p LCB0aGlzKTsKICAgICAgICAgZ19vYmplY3Rfd2Vha19yZWYoR19PQkpFQ1Qod2ViVmlldyksIHJl aW50ZXJwcmV0X2Nhc3Q8R1dlYWtOb3RpZnk+KHdlYlZpZXdEZXN0cm95ZWQpLCB0aGlzKTsKKyAg ICB9CiAKICAgICBhdXRvKiB1c2VyQ29udGVudE1hbmFnZXIgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0 X3VzZXJfY29udGVudF9tYW5hZ2VyKHdlYlZpZXcpOwogICAgIGF1dG8gdXNlckNvbnRlbnRNYW5h Z2VyUmVzdWx0ID0gbV91c2VyQ29udGVudE1hbmFnZXJzLmFkZCh1c2VyQ29udGVudE1hbmFnZXIp OwpAQCAtMTIzLDYgKzEzNSw3IEBAIHZvaWQgUmVtb3RlSW5zcGVjdG9yUHJvdG9jb2xIYW5kbGVy OjpoYW5kbGVSZXF1ZXN0KFdlYktpdFVSSVNjaGVtZVJlcXVlc3QqIHJlcXVlCiAgICAgYXV0byog Y2xpZW50ID0gbV9pbnNwZWN0b3JDbGllbnRzLmVuc3VyZShyZXF1ZXN0VVJMLmhvc3RBbmRQb3J0 KCksIFt0aGlzLCAmcmVxdWVzdFVSTF0gewogICAgICAgICByZXR1cm4gbWFrZVVuaXF1ZTxSZW1v dGVJbnNwZWN0b3JDbGllbnQ+KHJlcXVlc3RVUkwuaG9zdEFuZFBvcnQoKSwgKnRoaXMpOwogICAg IH0pLml0ZXJhdG9yLT52YWx1ZS5nZXQoKTsKKyAgICB3ZWJWaWV3UmVzdWx0Lml0ZXJhdG9yLT52 YWx1ZSA9IGNsaWVudDsKIAogICAgIGF1dG8qIGh0bWwgPSBjbGllbnQtPmJ1aWxkVGFyZ2V0TGlz dFBhZ2UoUmVtb3RlSW5zcGVjdG9yQ2xpZW50OjpJbnNwZWN0b3JUeXBlOjpVSSk7CiAgICAgZ3Np emUgc3RyZWFtTGVuZ3RoID0gaHRtbC0+bGVuOwpAQCAtMTM2LDMxICsxNDksNTEgQEAgdm9pZCBS ZW1vdGVJbnNwZWN0b3JQcm90b2NvbEhhbmRsZXI6Omluc3BlY3QoY29uc3QgU3RyaW5nJiBob3N0 QW5kUG9ydCwgdWludDY0X3QKICAgICAgICAgY2xpZW50LT5pbnNwZWN0KGNvbm5lY3Rpb25JRCwg dGF0Z2V0SUQsIHRhcmdldFR5cGUpOwogfQogCit2b2lkIFJlbW90ZUluc3BlY3RvclByb3RvY29s SGFuZGxlcjo6dXBkYXRlVGFyZ2V0TGlzdChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQoreworICAg IGF1dG8qIGNsaWVudEZvcldlYlZpZXcgPSBtX3dlYlZpZXdzLmdldCh3ZWJWaWV3KTsKKyAgICBp ZiAoIWNsaWVudEZvcldlYlZpZXcpCisgICAgICAgIHJldHVybjsKKworICAgIEdTdHJpbmcqIHNj cmlwdCA9IGdfc3RyaW5nX25ldygiZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3RhcmdldGxpc3Qn KS5pbm5lckhUTUw9JyIpOworICAgIGNsaWVudEZvcldlYlZpZXctPmFwcGVuZFRhcmdlcnRMaXN0 KHNjcmlwdCwgUmVtb3RlSW5zcGVjdG9yQ2xpZW50OjpJbnNwZWN0b3JUeXBlOjpVSSwgUmVtb3Rl SW5zcGVjdG9yQ2xpZW50OjpTaG91bGRFc2NhcGVTaW5nbGVRdW90ZTo6WWVzKTsKKyAgICBnX3N0 cmluZ19hcHBlbmQoc2NyaXB0LCAiJzsiKTsKKyAgICB3ZWJraXRfd2ViX3ZpZXdfcnVuX2phdmFz Y3JpcHQod2ViVmlldywgc2NyaXB0LT5zdHIsIG51bGxwdHIsIG51bGxwdHIsIG51bGxwdHIpOwor ICAgIGdfc3RyaW5nX2ZyZWUoc2NyaXB0LCBUUlVFKTsKK30KKwordm9pZCBSZW1vdGVJbnNwZWN0 b3JQcm90b2NvbEhhbmRsZXI6OndlYlZpZXdMb2FkQ2hhbmdlZChXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3LCBXZWJLaXRMb2FkRXZlbnQgZXZlbnQsIFJlbW90ZUluc3BlY3RvclByb3RvY29sSGFuZGxl ciogaGFuZGxlcikKK3sKKyAgICBpZiAoZXZlbnQgIT0gV0VCS0lUX0xPQURfRklOSVNIRUQpCisg ICAgICAgIHJldHVybjsKKworICAgIGdfc2lnbmFsX2hhbmRsZXJzX2Rpc2Nvbm5lY3RfYnlfZnVu Yyh3ZWJWaWV3LCByZWludGVycHJldF9jYXN0PGdwb2ludGVyPih3ZWJWaWV3TG9hZENoYW5nZWQp LCBoYW5kbGVyKTsKKyAgICBoYW5kbGVyLT51cGRhdGVUYXJnZXRMaXN0KHdlYlZpZXcpOworfQor CiB2b2lkIFJlbW90ZUluc3BlY3RvclByb3RvY29sSGFuZGxlcjo6dGFyZ2V0TGlzdENoYW5nZWQo UmVtb3RlSW5zcGVjdG9yQ2xpZW50JiBjbGllbnQpCiB7Ci0gICAgVmVjdG9yPFdlYktpdFdlYlZp ZXcqLCA0PiB3ZWJWaWV3c1RvUmVtb3ZlOwotICAgIGZvciAoYXV0byogd2ViVmlldyA6IG1fd2Vi Vmlld3MpIHsKLSAgICAgICAgaWYgKHdlYmtpdF93ZWJfdmlld19pc19sb2FkaW5nKHdlYlZpZXcp KQorICAgIGZvciAoYXV0byogd2ViVmlldyA6IG1fd2ViVmlld3Mua2V5cygpKSB7CisgICAgICAg IGlmIChtX3dlYlZpZXdzLmdldCh3ZWJWaWV3KSAhPSAmY2xpZW50KQogICAgICAgICAgICAgY29u dGludWU7CiAKLSAgICAgICAgVVJMIHdlYlZpZXdVUkwgPSBVUkwoU3RyaW5nIHsgd2Via2l0X3dl Yl92aWV3X2dldF91cmkod2ViVmlldykgfSk7Ci0gICAgICAgIGF1dG8gY2xpZW50Rm9yV2ViVmll dyA9IG1faW5zcGVjdG9yQ2xpZW50cy5nZXQod2ViVmlld1VSTC5ob3N0QW5kUG9ydCgpKTsKLSAg ICAgICAgaWYgKCFjbGllbnRGb3JXZWJWaWV3KSB7Ci0gICAgICAgICAgICAvLyBUaGlzIHZpZXcg aXMgbm90IHNob3dpbmcgYSBpbnNwZWN0b3IgdmlldyBhbnltb3JlLgotICAgICAgICAgICAgd2Vi Vmlld3NUb1JlbW92ZS5hcHBlbmQod2ViVmlldyk7Ci0gICAgICAgIH0gZWxzZSBpZiAoY2xpZW50 Rm9yV2ViVmlldyA9PSAmY2xpZW50KQotICAgICAgICAgICAgd2Via2l0X3dlYl92aWV3X3JlbG9h ZCh3ZWJWaWV3KTsKLSAgICB9Ci0KLSAgICBmb3IgKGF1dG8qIHdlYlZpZXcgOiB3ZWJWaWV3c1Rv UmVtb3ZlKSB7Ci0gICAgICAgIGdfb2JqZWN0X3dlYWtfdW5yZWYoR19PQkpFQ1Qod2ViVmlldyks IHJlaW50ZXJwcmV0X2Nhc3Q8R1dlYWtOb3RpZnk+KHdlYlZpZXdEZXN0cm95ZWQpLCB0aGlzKTsK LSAgICAgICAgbV93ZWJWaWV3cy5yZW1vdmUod2ViVmlldyk7CisgICAgICAgIGlmICh3ZWJraXRf d2ViX3ZpZXdfaXNfbG9hZGluZyh3ZWJWaWV3KSkKKyAgICAgICAgICAgIGdfc2lnbmFsX2Nvbm5l Y3Qod2ViVmlldywgImxvYWQtY2hhbmdlZCIsIHJlaW50ZXJwcmV0X2Nhc3Q8R0NhbGxiYWNrPih3 ZWJWaWV3TG9hZENoYW5nZWQpLCB0aGlzKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdXBk YXRlVGFyZ2V0TGlzdCh3ZWJWaWV3KTsKICAgICB9CiB9CiAKIHZvaWQgUmVtb3RlSW5zcGVjdG9y UHJvdG9jb2xIYW5kbGVyOjpjb25uZWN0aW9uQ2xvc2VkKFJlbW90ZUluc3BlY3RvckNsaWVudCYg Y2xpZW50KQogewotICAgIHRhcmdldExpc3RDaGFuZ2VkKGNsaWVudCk7CisgICAgbV93ZWJWaWV3 cy5yZW1vdmVJZihbJl0oYXV0byYgZW50cnkpIHsKKyAgICAgICAgaWYgKGVudHJ5LnZhbHVlID09 ICZjbGllbnQpIHsKKyAgICAgICAgICAgIGdfc2lnbmFsX2hhbmRsZXJzX2Rpc2Nvbm5lY3RfYnlf ZGF0YShlbnRyeS5rZXksIHRoaXMpOworICAgICAgICAgICAgZ19vYmplY3Rfd2Vha191bnJlZihH X09CSkVDVChlbnRyeS5rZXkpLCByZWludGVycHJldF9jYXN0PEdXZWFrTm90aWZ5Pih3ZWJWaWV3 RGVzdHJveWVkKSwgdGhpcyk7CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQor ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfSk7CiAgICAgbV9pbnNwZWN0b3JDbGllbnRzLnJl bW92ZShjbGllbnQuaG9zdEFuZFBvcnQoKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UmVtb3RlSW5zcGVjdG9yUHJvdG9jb2xIYW5kbGVy LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFJlbW90ZUluc3BlY3Rv clByb3RvY29sSGFuZGxlci5oCmluZGV4IGY2YTBkMDExMjMzOC4uMGYyYjJlYzc5ZjE2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFJlbW90ZUluc3Bl Y3RvclByb3RvY29sSGFuZGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0UmVtb3RlSW5zcGVjdG9yUHJvdG9jb2xIYW5kbGVyLmgKQEAgLTQ0LDYgKzQ0LDgg QEAgcHJpdmF0ZToKICAgICBzdGF0aWMgdm9pZCB1c2VyQ29udGVudE1hbmFnZXJEZXN0cm95ZWQo UmVtb3RlSW5zcGVjdG9yUHJvdG9jb2xIYW5kbGVyKiwgV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2Vy Kik7CiAKICAgICB2b2lkIGhhbmRsZVJlcXVlc3QoV2ViS2l0VVJJU2NoZW1lUmVxdWVzdCopOwor ICAgIHZvaWQgdXBkYXRlVGFyZ2V0TGlzdChXZWJLaXRXZWJWaWV3Kik7CisgICAgc3RhdGljIHZv aWQgd2ViVmlld0xvYWRDaGFuZ2VkKFdlYktpdFdlYlZpZXcqLCBXZWJLaXRMb2FkRXZlbnQsIFJl bW90ZUluc3BlY3RvclByb3RvY29sSGFuZGxlciopOwogCiAgICAgLy8gUmVtb3RlSW5zcGVjdG9y T2JzZXJ2ZXIuCiAgICAgdm9pZCB0YXJnZXRMaXN0Q2hhbmdlZChSZW1vdGVJbnNwZWN0b3JDbGll bnQmKSBvdmVycmlkZTsKQEAgLTUxLDcgKzUzLDcgQEAgcHJpdmF0ZToKIAogICAgIEhhc2hNYXA8 U3RyaW5nLCBzdGQ6OnVuaXF1ZV9wdHI8UmVtb3RlSW5zcGVjdG9yQ2xpZW50Pj4gbV9pbnNwZWN0 b3JDbGllbnRzOwogICAgIEhhc2hTZXQ8V2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyKj4gbV91c2Vy Q29udGVudE1hbmFnZXJzOwotICAgIEhhc2hTZXQ8V2ViS2l0V2ViVmlldyo+IG1fd2ViVmlld3M7 CisgICAgSGFzaE1hcDxXZWJLaXRXZWJWaWV3KiwgUmVtb3RlSW5zcGVjdG9yQ2xpZW50Kj4gbV93 ZWJWaWV3czsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL2dsaWIvUmVtb3RlSW5zcGVjdG9yQ2xpZW50LmNw cCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rvci9nbGliL1JlbW90ZUluc3BlY3Rv ckNsaWVudC5jcHAKaW5kZXggMDU4ODZlNzg1OTBmLi4zN2IyZGFlZGU1ZTggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rvci9nbGliL1JlbW90ZUluc3BlY3RvckNs aWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL2dsaWIvUmVt b3RlSW5zcGVjdG9yQ2xpZW50LmNwcApAQCAtMjkyLDI3ICsyOTIsOCBAQCB2b2lkIFJlbW90ZUlu c3BlY3RvckNsaWVudDo6c2VuZE1lc3NhZ2VUb0Zyb250ZW5kKHVpbnQ2NF90IGNvbm5lY3Rpb25J RCwgdWludDY0XwogICAgIHByb3h5LT5zZW5kTWVzc2FnZVRvRnJvbnRlbmQoU3RyaW5nOjpmcm9t VVRGOChtZXNzYWdlKSk7CiB9CiAKLUdTdHJpbmcqIFJlbW90ZUluc3BlY3RvckNsaWVudDo6YnVp bGRUYXJnZXRMaXN0UGFnZShJbnNwZWN0b3JUeXBlIGluc3BlY3RvclR5cGUpIGNvbnN0Cit2b2lk IFJlbW90ZUluc3BlY3RvckNsaWVudDo6YXBwZW5kVGFyZ2VydExpc3QoR1N0cmluZyogaHRtbCwg SW5zcGVjdG9yVHlwZSBpbnNwZWN0b3JUeXBlLCBTaG91bGRFc2NhcGVTaW5nbGVRdW90ZSBlc2Nh cGVTaW5nbGVRdW90ZSkgY29uc3QKIHsKLSAgICBHU3RyaW5nKiBodG1sID0gZ19zdHJpbmdfbmV3 KAotICAgICAgICAiPGh0bWw+PGhlYWQ+PHRpdGxlPlJlbW90ZSBpbnNwZWN0b3I8L3RpdGxlPiIK LSAgICAgICAgIjxtZXRhIGh0dHAtZXF1aXY9XCJDb250ZW50LVR5cGVcIiBjb250ZW50PVwidGV4 dC9odG1sOyBjaGFyc2V0PXV0Zi04XCIgLz4iCi0gICAgICAgICI8c3R5bGU+IgotICAgICAgICAi ICBoMSB7IGNvbG9yOiAjYmFiZGI2OyB0ZXh0LXNoYWRvdzogMCAxcHggMCB3aGl0ZTsgbWFyZ2lu LWJvdHRvbTogMDsgfSIKLSAgICAgICAgIiAgaHRtbCB7IGZvbnQtZmFtaWx5OiAtd2Via2l0LXN5 c3RlbS1mb250OyBmb250LXNpemU6IDExcHQ7IGNvbG9yOiAjMmUzNDM2OyBwYWRkaW5nOiAyMHB4 IDIwcHggMCAyMHB4OyBiYWNrZ3JvdW5kLWNvbG9yOiAjZjZmNmY0OyAiCi0gICAgICAgICIgICAg ICAgICBiYWNrZ3JvdW5kLWltYWdlOiAtd2Via2l0LWdyYWRpZW50KGxpbmVhciwgbGVmdCB0b3As IGxlZnQgYm90dG9tLCBjb2xvci1zdG9wKDAsICNlZWVlZWMpLCBjb2xvci1zdG9wKDEsICNmNmY2 ZjQpKTsiCi0gICAgICAgICIgICAgICAgICBiYWNrZ3JvdW5kLXNpemU6IDEwMCUgNWVtOyBiYWNr Z3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0OyB9IgotICAgICAgICAiICB0YWJsZSB7IHdpZHRoOiAx MDAlOyBib3JkZXItY29sbGFwc2U6IGNvbGxhcHNlOyB9IgotICAgICAgICAiICB0YWJsZSwgdGQg eyBib3JkZXI6IDFweCBzb2xpZCAjZDNkN2NmOyBib3JkZXItbGVmdDogbm9uZTsgYm9yZGVyLXJp Z2h0OiBub25lOyB9IgotICAgICAgICAiICBwIHsgbWFyZ2luLWJvdHRvbTogMzBweDsgfSIKLSAg ICAgICAgIiAgdGQgeyBwYWRkaW5nOiAxNXB4OyB9IgotICAgICAgICAiICB0ZC5kYXRhIHsgd2lk dGg6IDIwMHB4OyB9IgotICAgICAgICAiICAudGFyZ2V0bmFtZSB7IGZvbnQtd2VpZ2h0OiBib2xk OyB9IgotICAgICAgICAiICAudGFyZ2V0dXJsIHsgY29sb3I6ICNiYWJkYjY7IH0iCi0gICAgICAg ICIgIHRkLmlucHV0IHsgd2lkdGg6IDY0cHg7IH0iCi0gICAgICAgICIgIGlucHV0IHsgd2lkdGg6 IDEwMCU7IHBhZGRpbmc6IDhweDsgfSIKLSAgICAgICAgIjwvc3R5bGU+IgotICAgICAgICAiPC9o ZWFkPjxib2R5PjxoMT5JbnNwZWN0YWJsZSB0YXJnZXRzPC9oMT4iKTsKICAgICBpZiAobV90YXJn ZXRzLmlzRW1wdHkoKSkKICAgICAgICAgZ19zdHJpbmdfYXBwZW5kKGh0bWwsICI8cD5ObyB0YXJn ZXRzIGZvdW5kPC9wPiIpOwogICAgIGVsc2UgewpAQCAtMzI3LDggKzMwOCwxNiBAQCBHU3RyaW5n KiBSZW1vdGVJbnNwZWN0b3JDbGllbnQ6OmJ1aWxkVGFyZ2V0TGlzdFBhZ2UoSW5zcGVjdG9yVHlw ZSBpbnNwZWN0b3JUeXBlKQogCiAgICAgICAgICAgICAgICAgc3dpdGNoIChpbnNwZWN0b3JUeXBl KSB7CiAgICAgICAgICAgICAgICAgY2FzZSBJbnNwZWN0b3JUeXBlOjpVSToKLSAgICAgICAgICAg ICAgICAgICAgZ19zdHJpbmdfYXBwZW5kX3ByaW50ZihodG1sLCAiXCJ3aW5kb3cud2Via2l0Lm1l c3NhZ2VIYW5kbGVycy5pbnNwZWN0b3IucG9zdE1lc3NhZ2UoJyUiIEdfR1VJTlQ2NF9GT1JNQVQg IjolIiBHX0dVSU5UNjRfRk9STUFUICI6JXMnKTtcIiIsCi0gICAgICAgICAgICAgICAgICAgICAg ICBjb25uZWN0aW9uSUQsIHRhcmdldC5pZCwgdGFyZ2V0LnR5cGUuZGF0YSgpKTsKKyAgICAgICAg ICAgICAgICAgICAgZ19zdHJpbmdfYXBwZW5kKGh0bWwsICJcIndpbmRvdy53ZWJraXQubWVzc2Fn ZUhhbmRsZXJzLmluc3BlY3Rvci5wb3N0TWVzc2FnZSgiKTsKKyAgICAgICAgICAgICAgICAgICAg aWYgKGVzY2FwZVNpbmdsZVF1b3RlID09IFNob3VsZEVzY2FwZVNpbmdsZVF1b3RlOjpZZXMpCisg ICAgICAgICAgICAgICAgICAgICAgICBnX3N0cmluZ19hcHBlbmQoaHRtbCwgIlxcJyIpOworICAg ICAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgICAgICBnX3N0cmluZ19h cHBlbmRfYyhodG1sLCAnXCcnKTsKKyAgICAgICAgICAgICAgICAgICAgZ19zdHJpbmdfYXBwZW5k X3ByaW50ZihodG1sLCAiJSIgR19HVUlOVDY0X0ZPUk1BVCAiOiUiIEdfR1VJTlQ2NF9GT1JNQVQg IjolcyIsIGNvbm5lY3Rpb25JRCwgdGFyZ2V0LmlkLCB0YXJnZXQudHlwZS5kYXRhKCkpOworICAg ICAgICAgICAgICAgICAgICBpZiAoZXNjYXBlU2luZ2xlUXVvdGUgPT0gU2hvdWxkRXNjYXBlU2lu Z2xlUXVvdGU6OlllcykKKwkJCWdfc3RyaW5nX2FwcGVuZChodG1sLCAiXFwnKVwiIik7CisgICAg ICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgICAgIGdfc3RyaW5nX2Fw cGVuZChodG1sLCAiJylcIiIpOwogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAg ICAgICAgICBjYXNlIEluc3BlY3RvclR5cGU6OkhUVFA6CiAgICAgICAgICAgICAgICAgICAgIGdf c3RyaW5nX2FwcGVuZF9wcmludGYoaHRtbCwKQEAgLTM0Myw3ICszMzIsMzIgQEAgR1N0cmluZyog UmVtb3RlSW5zcGVjdG9yQ2xpZW50OjpidWlsZFRhcmdldExpc3RQYWdlKEluc3BlY3RvclR5cGUg aW5zcGVjdG9yVHlwZSkKICAgICAgICAgfQogICAgICAgICBnX3N0cmluZ19hcHBlbmQoaHRtbCwg IjwvdGFibGU+Iik7CiAgICAgfQotICAgIGdfc3RyaW5nX2FwcGVuZChodG1sLCAiPC9ib2R5Pjwv aHRtbD4iKTsKK30KKworR1N0cmluZyogUmVtb3RlSW5zcGVjdG9yQ2xpZW50OjpidWlsZFRhcmdl dExpc3RQYWdlKEluc3BlY3RvclR5cGUgaW5zcGVjdG9yVHlwZSkgY29uc3QKK3sKKyAgICBHU3Ry aW5nKiBodG1sID0gZ19zdHJpbmdfbmV3KAorICAgICAgICAiPGh0bWw+PGhlYWQ+PHRpdGxlPlJl bW90ZSBpbnNwZWN0b3I8L3RpdGxlPiIKKyAgICAgICAgIjxtZXRhIGh0dHAtZXF1aXY9XCJDb250 ZW50LVR5cGVcIiBjb250ZW50PVwidGV4dC9odG1sOyBjaGFyc2V0PXV0Zi04XCIgLz4iCisgICAg ICAgICI8c3R5bGU+IgorICAgICAgICAiICBoMSB7IGNvbG9yOiAjYmFiZGI2OyB0ZXh0LXNoYWRv dzogMCAxcHggMCB3aGl0ZTsgbWFyZ2luLWJvdHRvbTogMDsgfSIKKyAgICAgICAgIiAgaHRtbCB7 IGZvbnQtZmFtaWx5OiAtd2Via2l0LXN5c3RlbS1mb250OyBmb250LXNpemU6IDExcHQ7IGNvbG9y OiAjMmUzNDM2OyBwYWRkaW5nOiAyMHB4IDIwcHggMCAyMHB4OyBiYWNrZ3JvdW5kLWNvbG9yOiAj ZjZmNmY0OyAiCisgICAgICAgICIgICAgICAgICBiYWNrZ3JvdW5kLWltYWdlOiAtd2Via2l0LWdy YWRpZW50KGxpbmVhciwgbGVmdCB0b3AsIGxlZnQgYm90dG9tLCBjb2xvci1zdG9wKDAsICNlZWVl ZWMpLCBjb2xvci1zdG9wKDEsICNmNmY2ZjQpKTsiCisgICAgICAgICIgICAgICAgICBiYWNrZ3Jv dW5kLXNpemU6IDEwMCUgNWVtOyBiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0OyB9IgorICAg ICAgICAiICB0YWJsZSB7IHdpZHRoOiAxMDAlOyBib3JkZXItY29sbGFwc2U6IGNvbGxhcHNlOyB9 IgorICAgICAgICAiICB0YWJsZSwgdGQgeyBib3JkZXI6IDFweCBzb2xpZCAjZDNkN2NmOyBib3Jk ZXItbGVmdDogbm9uZTsgYm9yZGVyLXJpZ2h0OiBub25lOyB9IgorICAgICAgICAiICBwIHsgbWFy Z2luLWJvdHRvbTogMzBweDsgfSIKKyAgICAgICAgIiAgdGQgeyBwYWRkaW5nOiAxNXB4OyB9Igor ICAgICAgICAiICB0ZC5kYXRhIHsgd2lkdGg6IDIwMHB4OyB9IgorICAgICAgICAiICAudGFyZ2V0 bmFtZSB7IGZvbnQtd2VpZ2h0OiBib2xkOyB9IgorICAgICAgICAiICAudGFyZ2V0dXJsIHsgY29s b3I6ICNiYWJkYjY7IH0iCisgICAgICAgICIgIHRkLmlucHV0IHsgd2lkdGg6IDY0cHg7IH0iCisg ICAgICAgICIgIGlucHV0IHsgd2lkdGg6IDEwMCU7IHBhZGRpbmc6IDhweDsgfSIKKyAgICAgICAg Ijwvc3R5bGU+IgorICAgICAgICAiPC9oZWFkPjxib2R5PjxoMT5JbnNwZWN0YWJsZSB0YXJnZXRz PC9oMT4iCisgICAgICAgICI8ZGl2IGlkPSd0YXJnZXRsaXN0Jz4iKTsKKyAgICBhcHBlbmRUYXJn ZXJ0TGlzdChodG1sLCBpbnNwZWN0b3JUeXBlLCBTaG91bGRFc2NhcGVTaW5nbGVRdW90ZTo6Tm8p OworICAgIGdfc3RyaW5nX2FwcGVuZChodG1sLCAiPC9kaXY+PC9ib2R5PjwvaHRtbD4iKTsKIAog ICAgIHJldHVybiBodG1sOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv SW5zcGVjdG9yL2dsaWIvUmVtb3RlSW5zcGVjdG9yQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9JbnNwZWN0b3IvZ2xpYi9SZW1vdGVJbnNwZWN0b3JDbGllbnQuaAppbmRleCA5NTE3 OTA0MGNlODkuLmIyOTljYTA4ZWExMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvSW5zcGVjdG9yL2dsaWIvUmVtb3RlSW5zcGVjdG9yQ2xpZW50LmgKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL2dsaWIvUmVtb3RlSW5zcGVjdG9yQ2xpZW50LmgKQEAg LTU5LDYgKzU5LDggQEAgcHVibGljOgogCiAgICAgZW51bSBjbGFzcyBJbnNwZWN0b3JUeXBlIHsg VUksIEhUVFAgfTsKICAgICBHU3RyaW5nKiBidWlsZFRhcmdldExpc3RQYWdlKEluc3BlY3RvclR5 cGUpIGNvbnN0OworICAgIGVudW0gY2xhc3MgU2hvdWxkRXNjYXBlU2luZ2xlUXVvdGUgOiBib29s IHsgTm8sIFllcyB9OworICAgIHZvaWQgYXBwZW5kVGFyZ2VydExpc3QoR1N0cmluZyosIEluc3Bl Y3RvclR5cGUsIFNob3VsZEVzY2FwZVNpbmdsZVF1b3RlKSBjb25zdDsKICAgICB2b2lkIGluc3Bl Y3QodWludDY0X3QgY29ubmVjdGlvbklELCB1aW50NjRfdCB0YXJnZXRJRCwgY29uc3QgU3RyaW5n JiB0YXJnZXRUeXBlLCBJbnNwZWN0b3JUeXBlID0gSW5zcGVjdG9yVHlwZTo6VUkpOwogICAgIHZv aWQgc2VuZE1lc3NhZ2VUb0JhY2tlbmQodWludDY0X3QgY29ubmVjdGlvbklELCB1aW50NjRfdCB0 YXJnZXRJRCwgY29uc3QgU3RyaW5nJik7CiAgICAgdm9pZCBjbG9zZUZyb21Gcm9udGVuZCh1aW50 NjRfdCBjb25uZWN0aW9uSUQsIHVpbnQ2NF90IHRhcmdldElEKTsK 457037 2022-04-08 03:11:31 -0700 2022-04-08 03:56:36 -0700 Patch wk-inspector-target-list.diff text/plain 14937 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggM2Q3OGFmMzg0ZDRjLi5iMzBiNWNjMmU0MzIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMzAgQEAKKzIwMjItMDQtMDggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtHVEtdIFJlbW90ZUluc3BlY3RvcjogdXBkYXRlIHRhcmdldCBs aXN0IHBhZ2UgY29udGVudHMgb24gY2hhbmdlIGluc3RlYWQgb2YgcmVsb2FkaW5nCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg5OTAKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBjYW4gdXNlIHdlYmtp dF93ZWJfdmlld19ydW5famF2YXNjcmlwdCgpIHRvIHJlcGxhY2UgdGhlIHRhcmdldCBsaXN0IHdp dGggdGhlIG5ldyBvbmUuIFRoaXMgYWxzbyBmaXhlcyB0aGUgcmFjZQorICAgICAgICBjb25kaXRp b24gd2hlbiBsb2FkaW5nIGluc3BlY3RvcjovLyBmb3IgdGhlIGZpcnN0IHRpbWUgdGhhdCB0YXJn ZXQgbGlzdCBpcyBhbHdheXMgZW1wdHkuIFRoZSB3ZWIgdmlldyBIYXNoU2V0IGlzCisgICAgICAg IG5vdyBhIEhhc2hNYXAgd2hlcmUgdGhlIHZhbHVlIGlzIGEgcG9pbnRlciB0byB0aGUgY2xpZW50 IHRvIGJlIGFibGUgdG8gYXNzb2NpYXRlIHdlYiB2aWV3IHdpdGggaXRzIGNsaWVudAorICAgICAg ICB3aXRob3V0IGhhdmluZyB0byBjaGVjayB0aGUgaG9zdCBhbmQgcG9ydC4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFJlbW90ZUluc3BlY3RvclByb3RvY29sSGFuZGxlci5j cHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUluc3BlY3RvclByb3RvY29sSGFuZGxlcjo6flJl bW90ZUluc3BlY3RvclByb3RvY29sSGFuZGxlcik6IERpc2Nvbm5lY3Qgd2ViIHZpZXcgc2lnbmFs cy4KKyAgICAgICAgKFdlYktpdDo6UmVtb3RlSW5zcGVjdG9yUHJvdG9jb2xIYW5kbGVyOjpoYW5k bGVSZXF1ZXN0KTogT24gbmV3IHdlYiB2aWV3LCBjb25uZWN0IHRvIG5vdGlmeTo6dXJpIGFuZCBy ZW1vdmUgdGhlCisgICAgICAgIHdlYiB2aWV3IGlmIGl0J3Mgbm8gbG9uZ2VyIHNob3dpbmcgYW4g aW5zcGVjdG9yIHBhZ2UgbGlzdC4KKyAgICAgICAgKFdlYktpdDo6UmVtb3RlSW5zcGVjdG9yUHJv dG9jb2xIYW5kbGVyOjp1cGRhdGVUYXJnZXRMaXN0KTogVXBkYXRlIHRoZSB0YXJnZXQgbGlzdCBo dG1sLgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVJbnNwZWN0b3JQcm90b2NvbEhhbmRsZXI6Ondl YlZpZXdMb2FkQ2hhbmdlZCk6IENhbGwgdXBkYXRlVGFyZ2V0TGlzdCgpIHdoZW4gbG9hZCBmaW5p c2hlZC4KKyAgICAgICAgKFdlYktpdDo6UmVtb3RlSW5zcGVjdG9yUHJvdG9jb2xIYW5kbGVyOjp0 YXJnZXRMaXN0Q2hhbmdlZCk6IENhbGwgdXBkYXRlVGFyZ2V0TGlzdCgpIGZvciB3ZWIgdmlld3Mg dGhhdCBhcmUgbm90CisgICAgICAgIGxvYWRpbmcuIEZvciBsb2FkaW5nIHdlYiB2aWV3IGNvbm5l Y3QgdG8gbG9hZC1ldmVudCB0byB1cGRhdGUgdGhlIHRhcmdldCBsaXN0IG9uY2UgdGhlIGxvYWQg ZmluaXNoZXMuCisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUluc3BlY3RvclByb3RvY29sSGFuZGxl cjo6Y29ubmVjdGlvbkNsb3NlZCk6IFJlbW92ZSB0aGUgYXNzb2NpYXRlZCB3ZWIgdmlld3MuCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UmVtb3RlSW5zcGVjdG9yUHJvdG9jb2xI YW5kbGVyLmg6CisgICAgICAgICogVUlQcm9jZXNzL0luc3BlY3Rvci9nbGliL1JlbW90ZUluc3Bl Y3RvckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUluc3BlY3RvckNsaWVudDo6 YXBwZW5kVGFyZ2VydExpc3QgY29uc3QpOiBBcHBlbmQgdGhlIHRhcmdldCBsaXN0IGh0bWwgdG8g dGhlIGdpdmVuIEdTdHJpbmcuCisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUluc3BlY3RvckNsaWVu dDo6YnVpbGRUYXJnZXRMaXN0UGFnZSBjb25zdCk6IFVzZSBhcHBlbmRUYXJnZXJ0TGlzdCgpIG5v dy4KKyAgICAgICAgKiBVSVByb2Nlc3MvSW5zcGVjdG9yL2dsaWIvUmVtb3RlSW5zcGVjdG9yQ2xp ZW50Lmg6CisKIDIwMjItMDQtMDcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFVzZSBjb21wdXRlZFN0eWxlTWFwKCkg aW5zdGVhZCBvZiBkZXByZWNhdGVkIGdldFByb3BlcnR5Q1NTVmFsdWUoKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRSZW1vdGVJbnNwZWN0b3JQcm90 b2NvbEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRS ZW1vdGVJbnNwZWN0b3JQcm90b2NvbEhhbmRsZXIuY3BwCmluZGV4IDkwODJhYWNkZjdmNi4uYWMy YWE5ZjM1NmVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFJlbW90ZUluc3BlY3RvclByb3RvY29sSGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRSZW1vdGVJbnNwZWN0b3JQcm90b2NvbEhhbmRsZXIu Y3BwCkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSAiV2ViUGFnZVByb3h5LmgiCiAjaW5jbHVk ZSAiV2ViU2NyaXB0TWVzc2FnZUhhbmRsZXIuaCIKICNpbmNsdWRlIDx3dGYvVVJMLmg+CisjaW5j bHVkZSA8d3RmL2dsaWIvR1VuaXF1ZVB0ci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ1Rv SW50ZWdlckNvbnZlcnNpb24uaD4KIAogbmFtZXNwYWNlIFdlYktpdCB7CkBAIC03OCw4ICs3OSwx MCBAQCBSZW1vdGVJbnNwZWN0b3JQcm90b2NvbEhhbmRsZXI6OlJlbW90ZUluc3BlY3RvclByb3Rv Y29sSGFuZGxlcihXZWJLaXRXZWJDb250ZXh0KgogCiBSZW1vdGVJbnNwZWN0b3JQcm90b2NvbEhh bmRsZXI6On5SZW1vdGVJbnNwZWN0b3JQcm90b2NvbEhhbmRsZXIoKQogewotICAgIGZvciAoYXV0 byogd2ViVmlldyA6IG1fd2ViVmlld3MpCisgICAgZm9yIChhdXRvKiB3ZWJWaWV3IDogbV93ZWJW aWV3cy5rZXlzKCkpIHsKKyAgICAgICAgZ19zaWduYWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9k YXRhKHdlYlZpZXcsIHRoaXMpOwogICAgICAgICBnX29iamVjdF93ZWFrX3VucmVmKEdfT0JKRUNU KHdlYlZpZXcpLCByZWludGVycHJldF9jYXN0PEdXZWFrTm90aWZ5Pih3ZWJWaWV3RGVzdHJveWVk KSwgdGhpcyk7CisgICAgfQogCiAgICAgZm9yIChhdXRvKiB1c2VyQ29udGVudE1hbmFnZXIgOiBt X3VzZXJDb250ZW50TWFuYWdlcnMpIHsKICAgICAgICAgd2Via2l0VXNlckNvbnRlbnRNYW5hZ2Vy R2V0VXNlckNvbnRlbnRDb250cm9sbGVyUHJveHkodXNlckNvbnRlbnRNYW5hZ2VyKS0+cmVtb3Zl VXNlck1lc3NhZ2VIYW5kbGVyRm9yTmFtZSgiaW5zcGVjdG9yIl9zLCBBUEk6OkNvbnRlbnRXb3Js ZDo6cGFnZUNvbnRlbnRXb3JsZCgpKTsKQEAgLTEwOCw5ICsxMTEsMTggQEAgdm9pZCBSZW1vdGVJ bnNwZWN0b3JQcm90b2NvbEhhbmRsZXI6OmhhbmRsZVJlcXVlc3QoV2ViS2l0VVJJU2NoZW1lUmVx dWVzdCogcmVxdWUKIAogICAgIGF1dG8qIHdlYlZpZXcgPSB3ZWJraXRfdXJpX3NjaGVtZV9yZXF1 ZXN0X2dldF93ZWJfdmlldyhyZXF1ZXN0KTsKICAgICBBU1NFUlQod2ViVmlldyk7Ci0gICAgYXV0 byB3ZWJWaWV3UmVzdWx0ID0gbV93ZWJWaWV3cy5hZGQod2ViVmlldyk7Ci0gICAgaWYgKHdlYlZp ZXdSZXN1bHQuaXNOZXdFbnRyeSkKKyAgICBhdXRvIHdlYlZpZXdSZXN1bHQgPSBtX3dlYlZpZXdz LmFkZCh3ZWJWaWV3LCBudWxscHRyKTsKKyAgICBpZiAod2ViVmlld1Jlc3VsdC5pc05ld0VudHJ5 KSB7CisgICAgICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2ViVmlldywgIm5vdGlmeTo6dXJpIiwgR19D QUxMQkFDSygrW10oV2ViS2l0V2ViVmlldyogd2ViVmlldywgR1BhcmFtU3BlYyosIFJlbW90ZUlu c3BlY3RvclByb3RvY29sSGFuZGxlciogaGFuZGxlcikgeworICAgICAgICAgICAgVVJMIHdlYlZp ZXdVUkwgPSBVUkwoU3RyaW5nOjpmcm9tVVRGOCh3ZWJraXRfd2ViX3ZpZXdfZ2V0X3VyaSh3ZWJW aWV3KSkpOworICAgICAgICAgICAgaWYgKCF3ZWJWaWV3VVJMLnByb3RvY29sSXMoImluc3BlY3Rv ciIpIHx8ICFoYW5kbGVyLT5tX2luc3BlY3RvckNsaWVudHMuY29udGFpbnMod2ViVmlld1VSTC5o b3N0QW5kUG9ydCgpKSkgeworICAgICAgICAgICAgICAgIGdfc2lnbmFsX2hhbmRsZXJzX2Rpc2Nv bm5lY3RfYnlfZGF0YSh3ZWJWaWV3LCBoYW5kbGVyKTsKKyAgICAgICAgICAgICAgICBnX29iamVj dF93ZWFrX3VucmVmKEdfT0JKRUNUKHdlYlZpZXcpLCByZWludGVycHJldF9jYXN0PEdXZWFrTm90 aWZ5Pih3ZWJWaWV3RGVzdHJveWVkKSwgaGFuZGxlcik7CisgICAgICAgICAgICAgICAgaGFuZGxl ci0+bV93ZWJWaWV3cy5yZW1vdmUod2ViVmlldyk7CisgICAgICAgICAgICB9CisgICAgICAgIH0p LCB0aGlzKTsKICAgICAgICAgZ19vYmplY3Rfd2Vha19yZWYoR19PQkpFQ1Qod2ViVmlldyksIHJl aW50ZXJwcmV0X2Nhc3Q8R1dlYWtOb3RpZnk+KHdlYlZpZXdEZXN0cm95ZWQpLCB0aGlzKTsKKyAg ICB9CiAKICAgICBhdXRvKiB1c2VyQ29udGVudE1hbmFnZXIgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0 X3VzZXJfY29udGVudF9tYW5hZ2VyKHdlYlZpZXcpOwogICAgIGF1dG8gdXNlckNvbnRlbnRNYW5h Z2VyUmVzdWx0ID0gbV91c2VyQ29udGVudE1hbmFnZXJzLmFkZCh1c2VyQ29udGVudE1hbmFnZXIp OwpAQCAtMTIzLDYgKzEzNSw3IEBAIHZvaWQgUmVtb3RlSW5zcGVjdG9yUHJvdG9jb2xIYW5kbGVy OjpoYW5kbGVSZXF1ZXN0KFdlYktpdFVSSVNjaGVtZVJlcXVlc3QqIHJlcXVlCiAgICAgYXV0byog Y2xpZW50ID0gbV9pbnNwZWN0b3JDbGllbnRzLmVuc3VyZShyZXF1ZXN0VVJMLmhvc3RBbmRQb3J0 KCksIFt0aGlzLCAmcmVxdWVzdFVSTF0gewogICAgICAgICByZXR1cm4gbWFrZVVuaXF1ZTxSZW1v dGVJbnNwZWN0b3JDbGllbnQ+KHJlcXVlc3RVUkwuaG9zdEFuZFBvcnQoKSwgKnRoaXMpOwogICAg IH0pLml0ZXJhdG9yLT52YWx1ZS5nZXQoKTsKKyAgICB3ZWJWaWV3UmVzdWx0Lml0ZXJhdG9yLT52 YWx1ZSA9IGNsaWVudDsKIAogICAgIGF1dG8qIGh0bWwgPSBjbGllbnQtPmJ1aWxkVGFyZ2V0TGlz dFBhZ2UoUmVtb3RlSW5zcGVjdG9yQ2xpZW50OjpJbnNwZWN0b3JUeXBlOjpVSSk7CiAgICAgZ3Np emUgc3RyZWFtTGVuZ3RoID0gaHRtbC0+bGVuOwpAQCAtMTM2LDMxICsxNDksNTEgQEAgdm9pZCBS ZW1vdGVJbnNwZWN0b3JQcm90b2NvbEhhbmRsZXI6Omluc3BlY3QoY29uc3QgU3RyaW5nJiBob3N0 QW5kUG9ydCwgdWludDY0X3QKICAgICAgICAgY2xpZW50LT5pbnNwZWN0KGNvbm5lY3Rpb25JRCwg dGF0Z2V0SUQsIHRhcmdldFR5cGUpOwogfQogCit2b2lkIFJlbW90ZUluc3BlY3RvclByb3RvY29s SGFuZGxlcjo6dXBkYXRlVGFyZ2V0TGlzdChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQoreworICAg IGF1dG8qIGNsaWVudEZvcldlYlZpZXcgPSBtX3dlYlZpZXdzLmdldCh3ZWJWaWV3KTsKKyAgICBp ZiAoIWNsaWVudEZvcldlYlZpZXcpCisgICAgICAgIHJldHVybjsKKworICAgIEdTdHJpbmcqIHNj cmlwdCA9IGdfc3RyaW5nX25ldygiZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3RhcmdldGxpc3Qn KS5pbm5lckhUTUw9JyIpOworICAgIGNsaWVudEZvcldlYlZpZXctPmFwcGVuZFRhcmdlcnRMaXN0 KHNjcmlwdCwgUmVtb3RlSW5zcGVjdG9yQ2xpZW50OjpJbnNwZWN0b3JUeXBlOjpVSSwgUmVtb3Rl SW5zcGVjdG9yQ2xpZW50OjpTaG91bGRFc2NhcGVTaW5nbGVRdW90ZTo6WWVzKTsKKyAgICBnX3N0 cmluZ19hcHBlbmQoc2NyaXB0LCAiJzsiKTsKKyAgICB3ZWJraXRfd2ViX3ZpZXdfcnVuX2phdmFz Y3JpcHQod2ViVmlldywgc2NyaXB0LT5zdHIsIG51bGxwdHIsIG51bGxwdHIsIG51bGxwdHIpOwor ICAgIGdfc3RyaW5nX2ZyZWUoc2NyaXB0LCBUUlVFKTsKK30KKwordm9pZCBSZW1vdGVJbnNwZWN0 b3JQcm90b2NvbEhhbmRsZXI6OndlYlZpZXdMb2FkQ2hhbmdlZChXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3LCBXZWJLaXRMb2FkRXZlbnQgZXZlbnQsIFJlbW90ZUluc3BlY3RvclByb3RvY29sSGFuZGxl ciogaGFuZGxlcikKK3sKKyAgICBpZiAoZXZlbnQgIT0gV0VCS0lUX0xPQURfRklOSVNIRUQpCisg ICAgICAgIHJldHVybjsKKworICAgIGdfc2lnbmFsX2hhbmRsZXJzX2Rpc2Nvbm5lY3RfYnlfZnVu Yyh3ZWJWaWV3LCByZWludGVycHJldF9jYXN0PGdwb2ludGVyPih3ZWJWaWV3TG9hZENoYW5nZWQp LCBoYW5kbGVyKTsKKyAgICBoYW5kbGVyLT51cGRhdGVUYXJnZXRMaXN0KHdlYlZpZXcpOworfQor CiB2b2lkIFJlbW90ZUluc3BlY3RvclByb3RvY29sSGFuZGxlcjo6dGFyZ2V0TGlzdENoYW5nZWQo UmVtb3RlSW5zcGVjdG9yQ2xpZW50JiBjbGllbnQpCiB7Ci0gICAgVmVjdG9yPFdlYktpdFdlYlZp ZXcqLCA0PiB3ZWJWaWV3c1RvUmVtb3ZlOwotICAgIGZvciAoYXV0byogd2ViVmlldyA6IG1fd2Vi Vmlld3MpIHsKLSAgICAgICAgaWYgKHdlYmtpdF93ZWJfdmlld19pc19sb2FkaW5nKHdlYlZpZXcp KQorICAgIGZvciAoYXV0byogd2ViVmlldyA6IG1fd2ViVmlld3Mua2V5cygpKSB7CisgICAgICAg IGlmIChtX3dlYlZpZXdzLmdldCh3ZWJWaWV3KSAhPSAmY2xpZW50KQogICAgICAgICAgICAgY29u dGludWU7CiAKLSAgICAgICAgVVJMIHdlYlZpZXdVUkwgPSBVUkwoU3RyaW5nIHsgd2Via2l0X3dl Yl92aWV3X2dldF91cmkod2ViVmlldykgfSk7Ci0gICAgICAgIGF1dG8gY2xpZW50Rm9yV2ViVmll dyA9IG1faW5zcGVjdG9yQ2xpZW50cy5nZXQod2ViVmlld1VSTC5ob3N0QW5kUG9ydCgpKTsKLSAg ICAgICAgaWYgKCFjbGllbnRGb3JXZWJWaWV3KSB7Ci0gICAgICAgICAgICAvLyBUaGlzIHZpZXcg aXMgbm90IHNob3dpbmcgYSBpbnNwZWN0b3IgdmlldyBhbnltb3JlLgotICAgICAgICAgICAgd2Vi Vmlld3NUb1JlbW92ZS5hcHBlbmQod2ViVmlldyk7Ci0gICAgICAgIH0gZWxzZSBpZiAoY2xpZW50 Rm9yV2ViVmlldyA9PSAmY2xpZW50KQotICAgICAgICAgICAgd2Via2l0X3dlYl92aWV3X3JlbG9h ZCh3ZWJWaWV3KTsKLSAgICB9Ci0KLSAgICBmb3IgKGF1dG8qIHdlYlZpZXcgOiB3ZWJWaWV3c1Rv UmVtb3ZlKSB7Ci0gICAgICAgIGdfb2JqZWN0X3dlYWtfdW5yZWYoR19PQkpFQ1Qod2ViVmlldyks IHJlaW50ZXJwcmV0X2Nhc3Q8R1dlYWtOb3RpZnk+KHdlYlZpZXdEZXN0cm95ZWQpLCB0aGlzKTsK LSAgICAgICAgbV93ZWJWaWV3cy5yZW1vdmUod2ViVmlldyk7CisgICAgICAgIGlmICh3ZWJraXRf d2ViX3ZpZXdfaXNfbG9hZGluZyh3ZWJWaWV3KSkKKyAgICAgICAgICAgIGdfc2lnbmFsX2Nvbm5l Y3Qod2ViVmlldywgImxvYWQtY2hhbmdlZCIsIHJlaW50ZXJwcmV0X2Nhc3Q8R0NhbGxiYWNrPih3 ZWJWaWV3TG9hZENoYW5nZWQpLCB0aGlzKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdXBk YXRlVGFyZ2V0TGlzdCh3ZWJWaWV3KTsKICAgICB9CiB9CiAKIHZvaWQgUmVtb3RlSW5zcGVjdG9y UHJvdG9jb2xIYW5kbGVyOjpjb25uZWN0aW9uQ2xvc2VkKFJlbW90ZUluc3BlY3RvckNsaWVudCYg Y2xpZW50KQogewotICAgIHRhcmdldExpc3RDaGFuZ2VkKGNsaWVudCk7CisgICAgbV93ZWJWaWV3 cy5yZW1vdmVJZihbJl0oYXV0byYgZW50cnkpIHsKKyAgICAgICAgaWYgKGVudHJ5LnZhbHVlID09 ICZjbGllbnQpIHsKKyAgICAgICAgICAgIGdfc2lnbmFsX2hhbmRsZXJzX2Rpc2Nvbm5lY3RfYnlf ZGF0YShlbnRyeS5rZXksIHRoaXMpOworICAgICAgICAgICAgZ19vYmplY3Rfd2Vha191bnJlZihH X09CSkVDVChlbnRyeS5rZXkpLCByZWludGVycHJldF9jYXN0PEdXZWFrTm90aWZ5Pih3ZWJWaWV3 RGVzdHJveWVkKSwgdGhpcyk7CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQor ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfSk7CiAgICAgbV9pbnNwZWN0b3JDbGllbnRzLnJl bW92ZShjbGllbnQuaG9zdEFuZFBvcnQoKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UmVtb3RlSW5zcGVjdG9yUHJvdG9jb2xIYW5kbGVy LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFJlbW90ZUluc3BlY3Rv clByb3RvY29sSGFuZGxlci5oCmluZGV4IGY2YTBkMDExMjMzOC4uMGYyYjJlYzc5ZjE2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFJlbW90ZUluc3Bl Y3RvclByb3RvY29sSGFuZGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0UmVtb3RlSW5zcGVjdG9yUHJvdG9jb2xIYW5kbGVyLmgKQEAgLTQ0LDYgKzQ0LDgg QEAgcHJpdmF0ZToKICAgICBzdGF0aWMgdm9pZCB1c2VyQ29udGVudE1hbmFnZXJEZXN0cm95ZWQo UmVtb3RlSW5zcGVjdG9yUHJvdG9jb2xIYW5kbGVyKiwgV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2Vy Kik7CiAKICAgICB2b2lkIGhhbmRsZVJlcXVlc3QoV2ViS2l0VVJJU2NoZW1lUmVxdWVzdCopOwor ICAgIHZvaWQgdXBkYXRlVGFyZ2V0TGlzdChXZWJLaXRXZWJWaWV3Kik7CisgICAgc3RhdGljIHZv aWQgd2ViVmlld0xvYWRDaGFuZ2VkKFdlYktpdFdlYlZpZXcqLCBXZWJLaXRMb2FkRXZlbnQsIFJl bW90ZUluc3BlY3RvclByb3RvY29sSGFuZGxlciopOwogCiAgICAgLy8gUmVtb3RlSW5zcGVjdG9y T2JzZXJ2ZXIuCiAgICAgdm9pZCB0YXJnZXRMaXN0Q2hhbmdlZChSZW1vdGVJbnNwZWN0b3JDbGll bnQmKSBvdmVycmlkZTsKQEAgLTUxLDcgKzUzLDcgQEAgcHJpdmF0ZToKIAogICAgIEhhc2hNYXA8 U3RyaW5nLCBzdGQ6OnVuaXF1ZV9wdHI8UmVtb3RlSW5zcGVjdG9yQ2xpZW50Pj4gbV9pbnNwZWN0 b3JDbGllbnRzOwogICAgIEhhc2hTZXQ8V2ViS2l0VXNlckNvbnRlbnRNYW5hZ2VyKj4gbV91c2Vy Q29udGVudE1hbmFnZXJzOwotICAgIEhhc2hTZXQ8V2ViS2l0V2ViVmlldyo+IG1fd2ViVmlld3M7 CisgICAgSGFzaE1hcDxXZWJLaXRXZWJWaWV3KiwgUmVtb3RlSW5zcGVjdG9yQ2xpZW50Kj4gbV93 ZWJWaWV3czsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL2dsaWIvUmVtb3RlSW5zcGVjdG9yQ2xpZW50LmNw cCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rvci9nbGliL1JlbW90ZUluc3BlY3Rv ckNsaWVudC5jcHAKaW5kZXggMDU4ODZlNzg1OTBmLi44Y2IzYTEyODZjNmIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rvci9nbGliL1JlbW90ZUluc3BlY3RvckNs aWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL2dsaWIvUmVt b3RlSW5zcGVjdG9yQ2xpZW50LmNwcApAQCAtMjkyLDI3ICsyOTIsOCBAQCB2b2lkIFJlbW90ZUlu c3BlY3RvckNsaWVudDo6c2VuZE1lc3NhZ2VUb0Zyb250ZW5kKHVpbnQ2NF90IGNvbm5lY3Rpb25J RCwgdWludDY0XwogICAgIHByb3h5LT5zZW5kTWVzc2FnZVRvRnJvbnRlbmQoU3RyaW5nOjpmcm9t VVRGOChtZXNzYWdlKSk7CiB9CiAKLUdTdHJpbmcqIFJlbW90ZUluc3BlY3RvckNsaWVudDo6YnVp bGRUYXJnZXRMaXN0UGFnZShJbnNwZWN0b3JUeXBlIGluc3BlY3RvclR5cGUpIGNvbnN0Cit2b2lk IFJlbW90ZUluc3BlY3RvckNsaWVudDo6YXBwZW5kVGFyZ2VydExpc3QoR1N0cmluZyogaHRtbCwg SW5zcGVjdG9yVHlwZSBpbnNwZWN0b3JUeXBlLCBTaG91bGRFc2NhcGVTaW5nbGVRdW90ZSBlc2Nh cGVTaW5nbGVRdW90ZSkgY29uc3QKIHsKLSAgICBHU3RyaW5nKiBodG1sID0gZ19zdHJpbmdfbmV3 KAotICAgICAgICAiPGh0bWw+PGhlYWQ+PHRpdGxlPlJlbW90ZSBpbnNwZWN0b3I8L3RpdGxlPiIK LSAgICAgICAgIjxtZXRhIGh0dHAtZXF1aXY9XCJDb250ZW50LVR5cGVcIiBjb250ZW50PVwidGV4 dC9odG1sOyBjaGFyc2V0PXV0Zi04XCIgLz4iCi0gICAgICAgICI8c3R5bGU+IgotICAgICAgICAi ICBoMSB7IGNvbG9yOiAjYmFiZGI2OyB0ZXh0LXNoYWRvdzogMCAxcHggMCB3aGl0ZTsgbWFyZ2lu LWJvdHRvbTogMDsgfSIKLSAgICAgICAgIiAgaHRtbCB7IGZvbnQtZmFtaWx5OiAtd2Via2l0LXN5 c3RlbS1mb250OyBmb250LXNpemU6IDExcHQ7IGNvbG9yOiAjMmUzNDM2OyBwYWRkaW5nOiAyMHB4 IDIwcHggMCAyMHB4OyBiYWNrZ3JvdW5kLWNvbG9yOiAjZjZmNmY0OyAiCi0gICAgICAgICIgICAg ICAgICBiYWNrZ3JvdW5kLWltYWdlOiAtd2Via2l0LWdyYWRpZW50KGxpbmVhciwgbGVmdCB0b3As IGxlZnQgYm90dG9tLCBjb2xvci1zdG9wKDAsICNlZWVlZWMpLCBjb2xvci1zdG9wKDEsICNmNmY2 ZjQpKTsiCi0gICAgICAgICIgICAgICAgICBiYWNrZ3JvdW5kLXNpemU6IDEwMCUgNWVtOyBiYWNr Z3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0OyB9IgotICAgICAgICAiICB0YWJsZSB7IHdpZHRoOiAx MDAlOyBib3JkZXItY29sbGFwc2U6IGNvbGxhcHNlOyB9IgotICAgICAgICAiICB0YWJsZSwgdGQg eyBib3JkZXI6IDFweCBzb2xpZCAjZDNkN2NmOyBib3JkZXItbGVmdDogbm9uZTsgYm9yZGVyLXJp Z2h0OiBub25lOyB9IgotICAgICAgICAiICBwIHsgbWFyZ2luLWJvdHRvbTogMzBweDsgfSIKLSAg ICAgICAgIiAgdGQgeyBwYWRkaW5nOiAxNXB4OyB9IgotICAgICAgICAiICB0ZC5kYXRhIHsgd2lk dGg6IDIwMHB4OyB9IgotICAgICAgICAiICAudGFyZ2V0bmFtZSB7IGZvbnQtd2VpZ2h0OiBib2xk OyB9IgotICAgICAgICAiICAudGFyZ2V0dXJsIHsgY29sb3I6ICNiYWJkYjY7IH0iCi0gICAgICAg ICIgIHRkLmlucHV0IHsgd2lkdGg6IDY0cHg7IH0iCi0gICAgICAgICIgIGlucHV0IHsgd2lkdGg6 IDEwMCU7IHBhZGRpbmc6IDhweDsgfSIKLSAgICAgICAgIjwvc3R5bGU+IgotICAgICAgICAiPC9o ZWFkPjxib2R5PjxoMT5JbnNwZWN0YWJsZSB0YXJnZXRzPC9oMT4iKTsKICAgICBpZiAobV90YXJn ZXRzLmlzRW1wdHkoKSkKICAgICAgICAgZ19zdHJpbmdfYXBwZW5kKGh0bWwsICI8cD5ObyB0YXJn ZXRzIGZvdW5kPC9wPiIpOwogICAgIGVsc2UgewpAQCAtMzI3LDggKzMwOCwxNiBAQCBHU3RyaW5n KiBSZW1vdGVJbnNwZWN0b3JDbGllbnQ6OmJ1aWxkVGFyZ2V0TGlzdFBhZ2UoSW5zcGVjdG9yVHlw ZSBpbnNwZWN0b3JUeXBlKQogCiAgICAgICAgICAgICAgICAgc3dpdGNoIChpbnNwZWN0b3JUeXBl KSB7CiAgICAgICAgICAgICAgICAgY2FzZSBJbnNwZWN0b3JUeXBlOjpVSToKLSAgICAgICAgICAg ICAgICAgICAgZ19zdHJpbmdfYXBwZW5kX3ByaW50ZihodG1sLCAiXCJ3aW5kb3cud2Via2l0Lm1l c3NhZ2VIYW5kbGVycy5pbnNwZWN0b3IucG9zdE1lc3NhZ2UoJyUiIEdfR1VJTlQ2NF9GT1JNQVQg IjolIiBHX0dVSU5UNjRfRk9STUFUICI6JXMnKTtcIiIsCi0gICAgICAgICAgICAgICAgICAgICAg ICBjb25uZWN0aW9uSUQsIHRhcmdldC5pZCwgdGFyZ2V0LnR5cGUuZGF0YSgpKTsKKyAgICAgICAg ICAgICAgICAgICAgZ19zdHJpbmdfYXBwZW5kKGh0bWwsICJcIndpbmRvdy53ZWJraXQubWVzc2Fn ZUhhbmRsZXJzLmluc3BlY3Rvci5wb3N0TWVzc2FnZSgiKTsKKyAgICAgICAgICAgICAgICAgICAg aWYgKGVzY2FwZVNpbmdsZVF1b3RlID09IFNob3VsZEVzY2FwZVNpbmdsZVF1b3RlOjpZZXMpCisg ICAgICAgICAgICAgICAgICAgICAgICBnX3N0cmluZ19hcHBlbmQoaHRtbCwgIlxcJyIpOworICAg ICAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgICAgICBnX3N0cmluZ19h cHBlbmRfYyhodG1sLCAnXCcnKTsKKyAgICAgICAgICAgICAgICAgICAgZ19zdHJpbmdfYXBwZW5k X3ByaW50ZihodG1sLCAiJSIgR19HVUlOVDY0X0ZPUk1BVCAiOiUiIEdfR1VJTlQ2NF9GT1JNQVQg IjolcyIsIGNvbm5lY3Rpb25JRCwgdGFyZ2V0LmlkLCB0YXJnZXQudHlwZS5kYXRhKCkpOworICAg ICAgICAgICAgICAgICAgICBpZiAoZXNjYXBlU2luZ2xlUXVvdGUgPT0gU2hvdWxkRXNjYXBlU2lu Z2xlUXVvdGU6OlllcykKKyAgICAgICAgICAgICAgICAgICAgICAgIGdfc3RyaW5nX2FwcGVuZCho dG1sLCAiXFwnKVwiIik7CisgICAgICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAg ICAgICAgICAgIGdfc3RyaW5nX2FwcGVuZChodG1sLCAiJylcIiIpOwogICAgICAgICAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgICAgICAgICBjYXNlIEluc3BlY3RvclR5cGU6OkhUVFA6CiAg ICAgICAgICAgICAgICAgICAgIGdfc3RyaW5nX2FwcGVuZF9wcmludGYoaHRtbCwKQEAgLTM0Myw3 ICszMzIsMzIgQEAgR1N0cmluZyogUmVtb3RlSW5zcGVjdG9yQ2xpZW50OjpidWlsZFRhcmdldExp c3RQYWdlKEluc3BlY3RvclR5cGUgaW5zcGVjdG9yVHlwZSkKICAgICAgICAgfQogICAgICAgICBn X3N0cmluZ19hcHBlbmQoaHRtbCwgIjwvdGFibGU+Iik7CiAgICAgfQotICAgIGdfc3RyaW5nX2Fw cGVuZChodG1sLCAiPC9ib2R5PjwvaHRtbD4iKTsKK30KKworR1N0cmluZyogUmVtb3RlSW5zcGVj dG9yQ2xpZW50OjpidWlsZFRhcmdldExpc3RQYWdlKEluc3BlY3RvclR5cGUgaW5zcGVjdG9yVHlw ZSkgY29uc3QKK3sKKyAgICBHU3RyaW5nKiBodG1sID0gZ19zdHJpbmdfbmV3KAorICAgICAgICAi PGh0bWw+PGhlYWQ+PHRpdGxlPlJlbW90ZSBpbnNwZWN0b3I8L3RpdGxlPiIKKyAgICAgICAgIjxt ZXRhIGh0dHAtZXF1aXY9XCJDb250ZW50LVR5cGVcIiBjb250ZW50PVwidGV4dC9odG1sOyBjaGFy c2V0PXV0Zi04XCIgLz4iCisgICAgICAgICI8c3R5bGU+IgorICAgICAgICAiICBoMSB7IGNvbG9y OiAjYmFiZGI2OyB0ZXh0LXNoYWRvdzogMCAxcHggMCB3aGl0ZTsgbWFyZ2luLWJvdHRvbTogMDsg fSIKKyAgICAgICAgIiAgaHRtbCB7IGZvbnQtZmFtaWx5OiAtd2Via2l0LXN5c3RlbS1mb250OyBm b250LXNpemU6IDExcHQ7IGNvbG9yOiAjMmUzNDM2OyBwYWRkaW5nOiAyMHB4IDIwcHggMCAyMHB4 OyBiYWNrZ3JvdW5kLWNvbG9yOiAjZjZmNmY0OyAiCisgICAgICAgICIgICAgICAgICBiYWNrZ3Jv dW5kLWltYWdlOiAtd2Via2l0LWdyYWRpZW50KGxpbmVhciwgbGVmdCB0b3AsIGxlZnQgYm90dG9t LCBjb2xvci1zdG9wKDAsICNlZWVlZWMpLCBjb2xvci1zdG9wKDEsICNmNmY2ZjQpKTsiCisgICAg ICAgICIgICAgICAgICBiYWNrZ3JvdW5kLXNpemU6IDEwMCUgNWVtOyBiYWNrZ3JvdW5kLXJlcGVh dDogbm8tcmVwZWF0OyB9IgorICAgICAgICAiICB0YWJsZSB7IHdpZHRoOiAxMDAlOyBib3JkZXIt Y29sbGFwc2U6IGNvbGxhcHNlOyB9IgorICAgICAgICAiICB0YWJsZSwgdGQgeyBib3JkZXI6IDFw eCBzb2xpZCAjZDNkN2NmOyBib3JkZXItbGVmdDogbm9uZTsgYm9yZGVyLXJpZ2h0OiBub25lOyB9 IgorICAgICAgICAiICBwIHsgbWFyZ2luLWJvdHRvbTogMzBweDsgfSIKKyAgICAgICAgIiAgdGQg eyBwYWRkaW5nOiAxNXB4OyB9IgorICAgICAgICAiICB0ZC5kYXRhIHsgd2lkdGg6IDIwMHB4OyB9 IgorICAgICAgICAiICAudGFyZ2V0bmFtZSB7IGZvbnQtd2VpZ2h0OiBib2xkOyB9IgorICAgICAg ICAiICAudGFyZ2V0dXJsIHsgY29sb3I6ICNiYWJkYjY7IH0iCisgICAgICAgICIgIHRkLmlucHV0 IHsgd2lkdGg6IDY0cHg7IH0iCisgICAgICAgICIgIGlucHV0IHsgd2lkdGg6IDEwMCU7IHBhZGRp bmc6IDhweDsgfSIKKyAgICAgICAgIjwvc3R5bGU+IgorICAgICAgICAiPC9oZWFkPjxib2R5Pjxo MT5JbnNwZWN0YWJsZSB0YXJnZXRzPC9oMT4iCisgICAgICAgICI8ZGl2IGlkPSd0YXJnZXRsaXN0 Jz4iKTsKKyAgICBhcHBlbmRUYXJnZXJ0TGlzdChodG1sLCBpbnNwZWN0b3JUeXBlLCBTaG91bGRF c2NhcGVTaW5nbGVRdW90ZTo6Tm8pOworICAgIGdfc3RyaW5nX2FwcGVuZChodG1sLCAiPC9kaXY+ PC9ib2R5PjwvaHRtbD4iKTsKIAogICAgIHJldHVybiBodG1sOwogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL2dsaWIvUmVtb3RlSW5zcGVjdG9yQ2xpZW50 LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNwZWN0b3IvZ2xpYi9SZW1vdGVJbnNwZWN0 b3JDbGllbnQuaAppbmRleCA5NTE3OTA0MGNlODkuLmIyOTljYTA4ZWExMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL2dsaWIvUmVtb3RlSW5zcGVjdG9yQ2xp ZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL2dsaWIvUmVtb3Rl SW5zcGVjdG9yQ2xpZW50LmgKQEAgLTU5LDYgKzU5LDggQEAgcHVibGljOgogCiAgICAgZW51bSBj bGFzcyBJbnNwZWN0b3JUeXBlIHsgVUksIEhUVFAgfTsKICAgICBHU3RyaW5nKiBidWlsZFRhcmdl dExpc3RQYWdlKEluc3BlY3RvclR5cGUpIGNvbnN0OworICAgIGVudW0gY2xhc3MgU2hvdWxkRXNj YXBlU2luZ2xlUXVvdGUgOiBib29sIHsgTm8sIFllcyB9OworICAgIHZvaWQgYXBwZW5kVGFyZ2Vy dExpc3QoR1N0cmluZyosIEluc3BlY3RvclR5cGUsIFNob3VsZEVzY2FwZVNpbmdsZVF1b3RlKSBj b25zdDsKICAgICB2b2lkIGluc3BlY3QodWludDY0X3QgY29ubmVjdGlvbklELCB1aW50NjRfdCB0 YXJnZXRJRCwgY29uc3QgU3RyaW5nJiB0YXJnZXRUeXBlLCBJbnNwZWN0b3JUeXBlID0gSW5zcGVj dG9yVHlwZTo6VUkpOwogICAgIHZvaWQgc2VuZE1lc3NhZ2VUb0JhY2tlbmQodWludDY0X3QgY29u bmVjdGlvbklELCB1aW50NjRfdCB0YXJnZXRJRCwgY29uc3QgU3RyaW5nJik7CiAgICAgdm9pZCBj bG9zZUZyb21Gcm9udGVuZCh1aW50NjRfdCBjb25uZWN0aW9uSUQsIHVpbnQ2NF90IHRhcmdldElE KTsK