192910 2018-12-19 19:07:43 -0800 ITMLKit Inspector: Elements tab does not show DOM Tree 2018-12-20 12:08:36 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue ews-watchlist hi inspector-bugzilla-changes joepeck keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1489661 0 joepeck 2018-12-19 19:07:43 -0800 ITMLKit Inspector: Elements tab does not show DOM Tree Steps to Reproduce: 1. Inspect ITMLKit context => Issues in Elements tab Notes: • Agents not getting activated • Events being received for extra domains before they are activated 1489662 1 joepeck 2018-12-19 19:08:01 -0800 <rdar://problem/46680585> 1489665 2 357770 joepeck 2018-12-19 19:17:07 -0800 Created attachment 357770 [PATCH] Proposed Fix 1489713 3 357770 bburg 2018-12-19 21:15:32 -0800 Comment on attachment 357770 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=357770&action=review r=me > Source/WebInspectorUI/UserInterface/Base/Main.js:764 > + if (WI.mainTarget.DOMAgent) I was a little puzzled seeing these additions. Were these things simply not being done before, or did they move after target multiplexing was added? > Source/WebInspectorUI/UserInterface/Protocol/Connection.js:180 > + console.error("Protocol Error: Attempted to dispatch an unspecified method '" + qualifiedName + "'", messageObject); Nice tweak. 1489965 4 357770 joepeck 2018-12-20 11:41:02 -0800 Comment on attachment 357770 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=357770&action=review >> Source/WebInspectorUI/UserInterface/Base/Main.js:764 >> + if (WI.mainTarget.DOMAgent) > > I was a little puzzled seeing these additions. Were these things simply not being done before, or did they move after target multiplexing was added? I believe this was a new thing in startup added a while back. I don't think it is actually required here, but I want to make sure we do it in case the ITMLKit backend changes. 1489990 5 357770 commit-queue 2018-12-20 12:08:35 -0800 Comment on attachment 357770 [PATCH] Proposed Fix Clearing flags on attachment: 357770 Committed r239460: <https://trac.webkit.org/changeset/239460> 1489991 6 commit-queue 2018-12-20 12:08:36 -0800 All reviewed patches have been landed. Closing bug. 357770 2018-12-19 19:17:07 -0800 2018-12-20 12:08:35 -0800 [PATCH] Proposed Fix itml-1.patch text/plain 9807 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGE2NDQ2ZTlkMTEyLi5kODAxNDc5MDJmYyAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTgtMTItMTkgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBJVE1MS2l0IEluc3Bl Y3RvcjogRWxlbWVudHMgdGFiIGRvZXMgbm90IHNob3cgRE9NIFRyZWUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MjkxMAorICAgICAgICA8cmRhcjov L3Byb2JsZW0vNDY2ODA1ODU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBpbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckFnZW50Lmg6CisgICAgICAg ICogaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JBZ2VudC5jcHA6CisgICAgICAgIChJbnNwZWN0 b3I6Okluc3BlY3RvckFnZW50OjplbmFibGUpOgorICAgICAgICAoSW5zcGVjdG9yOjpJbnNwZWN0 b3JBZ2VudDo6YWN0aXZhdGVFeHRyYURvbWFpbik6CisgICAgICAgIChJbnNwZWN0b3I6Okluc3Bl Y3RvckFnZW50OjphY3RpdmF0ZUV4dHJhRG9tYWlucyk6CisgICAgICAgIFNlbmQgZXh0cmEgZG9t YWlucyBpbW1lZGlhdGVseSBpbnN0ZWFkIG9mIHdhaXRpbmcgdW50aWwKKyAgICAgICAgdGhlIElu c3BlY3RvciBkb21haW4gaXMgZW5hYmxlZC4gVGhpcyB3aWxsIGVuc3VyZSB0aGUgZnJvbnRlbmQK KyAgICAgICAgaGVhcnMgYWJvdXQgZXh0cmEgYXVnbWVudGVkIGRvbWFpbnMgYmVmb3JlIGF1Z21l bnRpbmcgYWdlbnRzCisgICAgICAgIGdldCBhIGNoYW5jZSB0byBzZW5kIGFueSBtZXNzYWdlcy4K KwogMjAxOC0xMi0xOCAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KIAogICAgICAg ICBVbnJldmlld2VkLiBBcHBlYXNlIGEgYnVpbGQgZXJyb3Igd2hlcmUgd2Ugd2VyZW4ndCB1c2lu ZyBhIHZhcmlhYmxlIGRlZmluZWQgaW4gYW4gImlmIgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yQWdlbnQuY3BwIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yQWdlbnQuY3BwCmluZGV4IGYw YTBmODM2YjgxLi5jNzcwZTZkMThkMCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckFnZW50LmNwcApAQCAtNjgsMTEgKzY4 LDYgQEAgdm9pZCBJbnNwZWN0b3JBZ2VudDo6ZW5hYmxlKEVycm9yU3RyaW5nJikKICAgICBpZiAo bV9wZW5kaW5nSW5zcGVjdERhdGEuZmlyc3QpCiAgICAgICAgIGluc3BlY3QobV9wZW5kaW5nSW5z cGVjdERhdGEuZmlyc3QuY29weVJlZigpLCBtX3BlbmRpbmdJbnNwZWN0RGF0YS5zZWNvbmQuY29w eVJlZigpKTsKIAotI2lmIEVOQUJMRShJTlNQRUNUT1JfQUxURVJOQVRFX0RJU1BBVENIRVJTKQot ICAgIGlmIChtX3BlbmRpbmdFeHRyYURvbWFpbnNEYXRhKQotICAgICAgICBtX2Zyb250ZW5kRGlz cGF0Y2hlci0+YWN0aXZhdGVFeHRyYURvbWFpbnMobV9wZW5kaW5nRXh0cmFEb21haW5zRGF0YSk7 Ci0jZW5kaWYKLQogICAgIGZvciAoYXV0byYgdGVzdENvbW1hbmQgOiBtX3BlbmRpbmdFdmFsdWF0 ZVRlc3RDb21tYW5kcykKICAgICAgICAgbV9mcm9udGVuZERpc3BhdGNoZXItPmV2YWx1YXRlRm9y VGVzdEluRnJvbnRlbmQodGVzdENvbW1hbmQpOwogCkBAIC0xMTMsMTIgKzEwOCw4IEBAIHZvaWQg SW5zcGVjdG9yQWdlbnQ6OmV2YWx1YXRlRm9yVGVzdEluRnJvbnRlbmQoY29uc3QgU3RyaW5nJiBz Y3JpcHQpCiAjaWYgRU5BQkxFKElOU1BFQ1RPUl9BTFRFUk5BVEVfRElTUEFUQ0hFUlMpCiB2b2lk IEluc3BlY3RvckFnZW50OjphY3RpdmF0ZUV4dHJhRG9tYWluKGNvbnN0IFN0cmluZyYgZG9tYWlu TmFtZSkKIHsKLSAgICBpZiAoIW1fZW5hYmxlZCkgewotICAgICAgICBpZiAoIW1fcGVuZGluZ0V4 dHJhRG9tYWluc0RhdGEpCi0gICAgICAgICAgICBtX3BlbmRpbmdFeHRyYURvbWFpbnNEYXRhID0g SlNPTjo6QXJyYXlPZjxTdHJpbmc+OjpjcmVhdGUoKTsKLSAgICAgICAgbV9wZW5kaW5nRXh0cmFE b21haW5zRGF0YS0+YWRkSXRlbShkb21haW5OYW1lKTsKKyAgICBpZiAoIW1fZW5hYmxlZCkKICAg ICAgICAgcmV0dXJuOwotICAgIH0KIAogICAgIGF1dG8gZG9tYWluTmFtZXMgPSBKU09OOjpBcnJh eU9mPFN0cmluZz46OmNyZWF0ZSgpOwogICAgIGRvbWFpbk5hbWVzLT5hZGRJdGVtKGRvbWFpbk5h bWUpOwpAQCAtMTM0LDEwICsxMjUsNyBAQCB2b2lkIEluc3BlY3RvckFnZW50OjphY3RpdmF0ZUV4 dHJhRG9tYWlucyhjb25zdCBWZWN0b3I8U3RyaW5nPiYgZXh0cmFEb21haW5zKQogICAgIGZvciAo YXV0byBkb21haW5OYW1lIDogZXh0cmFEb21haW5zKQogICAgICAgICBkb21haW5OYW1lcy0+YWRk SXRlbShkb21haW5OYW1lKTsKIAotICAgIGlmICghbV9lbmFibGVkKQotICAgICAgICBtX3BlbmRp bmdFeHRyYURvbWFpbnNEYXRhID0gV1RGTW92ZShkb21haW5OYW1lcyk7Ci0gICAgZWxzZQotICAg ICAgICBtX2Zyb250ZW5kRGlzcGF0Y2hlci0+YWN0aXZhdGVFeHRyYURvbWFpbnMoV1RGTW92ZShk b21haW5OYW1lcykpOworICAgIG1fZnJvbnRlbmREaXNwYXRjaGVyLT5hY3RpdmF0ZUV4dHJhRG9t YWlucyhXVEZNb3ZlKGRvbWFpbk5hbWVzKSk7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yQWdlbnQuaCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckFnZW50LmgKaW5k ZXggZDJhNmQ1YmFmNTYuLjI2MTE5YzAyZjI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JBZ2VudC5oCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvckFnZW50LmgKQEAgLTcxLDkgKzcx LDYgQEAgcHJpdmF0ZToKIAogICAgIFZlY3RvcjxTdHJpbmc+IG1fcGVuZGluZ0V2YWx1YXRlVGVz dENvbW1hbmRzOwogICAgIHN0ZDo6cGFpcjxSZWZQdHI8UHJvdG9jb2w6OlJ1bnRpbWU6OlJlbW90 ZU9iamVjdD4sIFJlZlB0cjxKU09OOjpPYmplY3Q+PiBtX3BlbmRpbmdJbnNwZWN0RGF0YTsKLSNp ZiBFTkFCTEUoSU5TUEVDVE9SX0FMVEVSTkFURV9ESVNQQVRDSEVSUykKLSAgICBSZWZQdHI8SlNP Tjo6QXJyYXlPZjxTdHJpbmc+PiBtX3BlbmRpbmdFeHRyYURvbWFpbnNEYXRhOwotI2VuZGlmCiAg ICAgYm9vbCBtX2VuYWJsZWQgeyBmYWxzZSB9OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cK aW5kZXggN2QwYWY1YTBjODIuLjhmYzI1ZmQyMjQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwyNyBAQAorMjAxOC0xMi0xOSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9A YXBwbGUuY29tPgorCisgICAgICAgIElUTUxLaXQgSW5zcGVjdG9yOiBFbGVtZW50cyB0YWIgZG9l cyBub3Qgc2hvdyBET00gVHJlZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTkyOTEwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NjY4MDU4NT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvUHJvdG9jb2wvQ29ubmVjdGlvbi5qczoKKyAgICAgICAgKEluc3BlY3RvckJhY2tlbmQu Q29ubmVjdGlvbi5wcm90b3R5cGUuX2Rpc3BhdGNoRXZlbnQpOgorICAgICAgICBCZXR0ZXIgbG9n Z2luZyBmb3IgZXJyb3JzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6 CisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9BcHBDb250cm9sbGVyLmpzOgor ICAgICAgICAoV0kuQXBwQ29udHJvbGxlci5wcm90b3R5cGUuYWN0aXZhdGVFeHRyYURvbWFpbnMp OgorICAgICAgICBMZXQgVGFyZ2V0cyBnZXQgYSBjaGFuY2UgdG8gYWN0aXZhdGUgZXh0cmEgZG9t YWlucy4KKyAgICAgICAgUGVyZm9ybSBhIGxpdHRsZSBtb3JlIHdvcmsgaW4gdGhlc2UgY2FzZXMu CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Byb3RvY29sL1RhcmdldC5qczoKKyAgICAgICAg KFdJLlRhcmdldCk6CisgICAgICAgIChXSS5UYXJnZXQucHJvdG90eXBlLmFjdGl2YXRlRXh0cmFE b21haW4pOgorICAgICAgICBFeHBvc2UgYWdlbnRzIGZvciBkb21haW5zIHRoYXQgYXJlIGFjdGl2 ZS4KKyAgICAgICAgRXhwb3NlIGFnZW50cyBmb3IgZXh0cmEgZG9tYWlucyB3aGVuIHRoZXkgYXJl IGFjdGl2YXRlZC4KKwogMjAxOC0xMi0xOCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBw bGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IG0zdTggY29udGVudCBub3Qgc2hvd24s IGl0IHNob3VsZCBiZSB0ZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9CYXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9CYXNlL01haW4uanMKaW5kZXggYjEwZmM5MTA0NzAuLjI1MWNlZjdjNDM0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCkBAIC03 NTQsOCArNzU0LDE5IEBAIFdJLmFjdGl2YXRlRXh0cmFEb21haW5zID0gZnVuY3Rpb24oZG9tYWlu cykKIHsKICAgICB0aGlzLm5vdGlmaWNhdGlvbnMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdJ Lk5vdGlmaWNhdGlvbi5FeHRyYURvbWFpbnNBY3RpdmF0ZWQsIHtkb21haW5zfSk7CiAKLSAgICBp ZiAoV0kubWFpblRhcmdldCAmJiBXSS5tYWluVGFyZ2V0LkNTU0FnZW50KQotICAgICAgICBXSS5D U1NDb21wbGV0aW9ucy5pbml0aWFsaXplQ1NTQ29tcGxldGlvbnMoV0kuYXNzdW1pbmdNYWluVGFy Z2V0KCkpOworICAgIGlmIChXSS5tYWluVGFyZ2V0KSB7CisgICAgICAgIGlmICghV0kucGFnZVRh cmdldCAmJiBXSS5tYWluVGFyZ2V0LkRPTUFnZW50KQorICAgICAgICAgICAgV0kucGFnZVRhcmdl dCA9IFdJLm1haW5UYXJnZXQ7CisKKyAgICAgICAgaWYgKFdJLm1haW5UYXJnZXQuQ1NTQWdlbnQp CisgICAgICAgICAgICBXSS5DU1NDb21wbGV0aW9ucy5pbml0aWFsaXplQ1NTQ29tcGxldGlvbnMo V0kuYXNzdW1pbmdNYWluVGFyZ2V0KCkpOworCisgICAgICAgIGlmIChXSS5tYWluVGFyZ2V0LkRP TUFnZW50KQorICAgICAgICAgICAgV0kuZG9tTWFuYWdlci5lbnN1cmVEb2N1bWVudCgpOworCisg ICAgICAgIGlmIChXSS5tYWluVGFyZ2V0LlBhZ2VBZ2VudCkKKyAgICAgICAgICAgIFdJLm5ldHdv cmtNYW5hZ2VyLmluaXRpYWxpemVUYXJnZXQoV0kubWFpblRhcmdldCk7CisgICAgfQogCiAgICAg dGhpcy5fdXBkYXRlUmVsb2FkVG9vbGJhckJ1dHRvbigpOwogICAgIHRoaXMuX3VwZGF0ZURvd25s b2FkVG9vbGJhckJ1dHRvbigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQXBwQ29udHJvbGxlci5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0FwcENvbnRyb2xsZXIuanMKaW5kZXgg YjkzOTYyMzBjZTQuLjMyNDY5YWY0ODBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9BcHBDb250cm9sbGVyLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0FwcENvbnRyb2xsZXIu anMKQEAgLTY1LDEwICs2NSwxNyBAQCBXSS5BcHBDb250cm9sbGVyID0gY2xhc3MgQXBwQ29udHJv bGxlciBleHRlbmRzIFdJLkFwcENvbnRyb2xsZXJCYXNlCiAKICAgICAgICAgdGhpcy5faGFzRXh0 cmFEb21haW5zID0gdHJ1ZTsKIAorICAgICAgICBjb25zb2xlLmFzc2VydChXSS5tYWluVGFyZ2V0 IGluc3RhbmNlb2YgV0kuRGlyZWN0QmFja2VuZFRhcmdldCk7CisgICAgICAgIGNvbnNvbGUuYXNz ZXJ0KFdJLm1haW5UYXJnZXQudHlwZSA9PT0gV0kuVGFyZ2V0LlR5cGUuSlNDb250ZXh0KTsKKyAg ICAgICAgY29uc29sZS5hc3NlcnQoV0kuc2hhcmVkQXBwLmRlYnVnZ2FibGVUeXBlID09PSBXSS5E ZWJ1Z2dhYmxlVHlwZS5KYXZhU2NyaXB0KTsKKyAgICAgICAgY29uc29sZS5hc3NlcnQoV0kudGFy Z2V0cy5sZW5ndGggPT09IDEpOworCiAgICAgICAgIGZvciAobGV0IGRvbWFpbiBvZiBkb21haW5z KSB7CiAgICAgICAgICAgICBsZXQgYWdlbnQgPSBJbnNwZWN0b3JCYWNrZW5kLmFjdGl2YXRlRG9t YWluKGRvbWFpbik7CiAgICAgICAgICAgICBpZiAoYWdlbnQuZW5hYmxlKQogICAgICAgICAgICAg ICAgIGFnZW50LmVuYWJsZSgpOworICAgICAgICAgICAgZm9yIChsZXQgdGFyZ2V0IG9mIFdJLnRh cmdldHMpCisgICAgICAgICAgICAgICAgdGFyZ2V0LmFjdGl2YXRlRXh0cmFEb21haW4oZG9tYWlu KTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIEZJWE1FOiBhbGwgY29kZSB3aXRoaW4gV0kuYWN0 aXZhdGVFeHRyYURvbWFpbnMgc2hvdWxkIGJlIGRpc3RyaWJ1dGVkIGVsc2V3aGVyZS4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0Nvbm5l Y3Rpb24uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9D b25uZWN0aW9uLmpzCmluZGV4IDRlMmU0MDMxZmUzLi5kMTM3Zjg4NGVkMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvQ29ubmVjdGlvbi5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9Db25u ZWN0aW9uLmpzCkBAIC0xNjUsMTkgKzE2NSwxOSBAQCBJbnNwZWN0b3JCYWNrZW5kLkNvbm5lY3Rp b24gPSBjbGFzcyBJbnNwZWN0b3JCYWNrZW5kQ29ubmVjdGlvbgogICAgICAgICBsZXQgcXVhbGlm aWVkTmFtZSA9IG1lc3NhZ2VPYmplY3RbIm1ldGhvZCJdOwogICAgICAgICBsZXQgW2RvbWFpbk5h bWUsIGV2ZW50TmFtZV0gPSBxdWFsaWZpZWROYW1lLnNwbGl0KCIuIik7CiAgICAgICAgIGlmICgh KGRvbWFpbk5hbWUgaW4gdGhpcy5fYWdlbnRzKSkgewotICAgICAgICAgICAgY29uc29sZS5lcnJv cigiUHJvdG9jb2wgRXJyb3I6IEF0dGVtcHRlZCB0byBkaXNwYXRjaCBtZXRob2QgJyIgKyBldmVu dE5hbWUgKyAiJyBmb3Igbm9uLWV4aXN0aW5nIGRvbWFpbiAnIiArIGRvbWFpbk5hbWUgKyAiJyIp OworICAgICAgICAgICAgY29uc29sZS5lcnJvcigiUHJvdG9jb2wgRXJyb3I6IEF0dGVtcHRlZCB0 byBkaXNwYXRjaCBtZXRob2QgJyIgKyBldmVudE5hbWUgKyAiJyBmb3Igbm9uLWV4aXN0aW5nIGRv bWFpbiAnIiArIGRvbWFpbk5hbWUgKyAiJyIsIG1lc3NhZ2VPYmplY3QpOwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9CiAKICAgICAgICAgbGV0IGFnZW50ID0gdGhpcy5fYWdlbnRzW2Rv bWFpbk5hbWVdOwogICAgICAgICBpZiAoIWFnZW50LmFjdGl2ZSkgewotICAgICAgICAgICAgY29u c29sZS5lcnJvcigiUHJvdG9jb2wgRXJyb3I6IEF0dGVtcHRlZCB0byBkaXNwYXRjaCBtZXRob2Qg Zm9yIGRvbWFpbiAnIiArIGRvbWFpbk5hbWUgKyAiJyB3aGljaCBleGlzdHMgYnV0IGlzIG5vdCBh Y3RpdmUuIik7CisgICAgICAgICAgICBjb25zb2xlLmVycm9yKCJQcm90b2NvbCBFcnJvcjogQXR0 ZW1wdGVkIHRvIGRpc3BhdGNoIG1ldGhvZCBmb3IgZG9tYWluICciICsgZG9tYWluTmFtZSArICIn IHdoaWNoIGV4aXN0cyBidXQgaXMgbm90IGFjdGl2ZS4iLCBtZXNzYWdlT2JqZWN0KTsKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgfQogCiAgICAgICAgIGxldCBldmVudCA9IGFnZW50Lmdl dEV2ZW50KGV2ZW50TmFtZSk7CiAgICAgICAgIGlmICghZXZlbnQpIHsKLSAgICAgICAgICAgIGNv bnNvbGUuZXJyb3IoIlByb3RvY29sIEVycm9yOiBBdHRlbXB0ZWQgdG8gZGlzcGF0Y2ggYW4gdW5z cGVjaWZpZWQgbWV0aG9kICciICsgcXVhbGlmaWVkTmFtZSArICInIik7CisgICAgICAgICAgICBj b25zb2xlLmVycm9yKCJQcm90b2NvbCBFcnJvcjogQXR0ZW1wdGVkIHRvIGRpc3BhdGNoIGFuIHVu c3BlY2lmaWVkIG1ldGhvZCAnIiArIHF1YWxpZmllZE5hbWUgKyAiJyIsIG1lc3NhZ2VPYmplY3Qp OwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL1RhcmdldC5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL1RhcmdldC5qcwppbmRleCAzMzgy YzYzYjViYi4uZGM3OTk1MjY3NjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1Byb3RvY29sL1RhcmdldC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9UYXJnZXQuanMKQEAgLTQzLDggKzQzLDExIEBAIFdJ LlRhcmdldCA9IGNsYXNzIFRhcmdldCBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICAvLyBzdXBw b3J0ZWQgYnkgdGhlIHRhcmdldC4KICAgICAgICAgdGhpcy5fYWdlbnRzID0ge307CiAgICAgICAg IGNvbnN0IHN1cHBvcnRlZERvbWFpbnMgPSB0aGlzLl9zdXBwb3J0ZWREb21haW5zRm9yVGFyZ2V0 VHlwZSh0aGlzLl90eXBlKTsKLSAgICAgICAgZm9yIChsZXQgZG9tYWluIG9mIHN1cHBvcnRlZERv bWFpbnMpCi0gICAgICAgICAgICB0aGlzLl9hZ2VudHNbZG9tYWluXSA9IHRoaXMuX2Nvbm5lY3Rp b24uX2FnZW50c1tkb21haW5dOworICAgICAgICBmb3IgKGxldCBkb21haW4gb2Ygc3VwcG9ydGVk RG9tYWlucykgeworICAgICAgICAgICAgbGV0IGFnZW50ID0gdGhpcy5fY29ubmVjdGlvbi5fYWdl bnRzW2RvbWFpbl07CisgICAgICAgICAgICBpZiAoYWdlbnQgJiYgYWdlbnQuYWN0aXZlKQorICAg ICAgICAgICAgICAgIHRoaXMuX2FnZW50c1tkb21haW5dID0gYWdlbnQ7CisgICAgICAgIH0KIAog ICAgICAgICB0aGlzLl9jb25uZWN0aW9uLnRhcmdldCA9IHRoaXM7CiAKQEAgLTk3LDYgKzEwMCwx MyBAQCBXSS5UYXJnZXQgPSBjbGFzcyBUYXJnZXQgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAg fSk7CiAgICAgfQogCisgICAgYWN0aXZhdGVFeHRyYURvbWFpbihkb21haW4pCisgICAgeworICAg ICAgICBsZXQgYWdlbnQgPSB0aGlzLl9jb25uZWN0aW9uLl9hZ2VudHNbZG9tYWluXTsKKyAgICAg ICAgaWYgKGFnZW50ICYmIGFnZW50LmFjdGl2ZSkKKyAgICAgICAgICAgIHRoaXMuX2FnZW50c1tk b21haW5dID0gYWdlbnQ7CisgICAgfQorCiAgICAgLy8gQWdlbnRzCiAKICAgICBnZXQgQXBwbGlj YXRpb25DYWNoZUFnZW50KCkgeyByZXR1cm4gdGhpcy5fYWdlbnRzLkFwcGxpY2F0aW9uQ2FjaGU7 IH0K