66304 2011-08-16 08:08:02 -0700 Web Inspector: convert DOM breakpoint types to strings. 2011-08-16 10:27:39 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 451619 0 pfeldman 2011-08-16 08:08:02 -0700 Patch to follow. 451641 1 104051 pfeldman 2011-08-16 08:45:13 -0700 Created attachment 104051 Patch 451666 2 104051 yurys 2011-08-16 09:28:29 -0700 Comment on attachment 104051 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=104051&action=review > Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp:196 > + case SubtreeModified: return "subtree-modified"; style: wrong indentation 451722 3 pfeldman 2011-08-16 10:27:39 -0700 Committed r93125: <http://trac.webkit.org/changeset/93125> 104051 2011-08-16 08:45:13 -0700 2011-08-16 09:28:29 -0700 Patch bug-66304-20110816194511.patch text/plain 9622 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTMxMDEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkYzYzYjQyZWI1MzY1N2Ix YzgxNGJhZjAwYjUzYjc5NWY0NDRkMTFlLi45MjY1N2U5YWY0OGEwYWMxZjdmNzJhMzQ0NTE4NTcw ZjMxNjNjN2MyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEgQEAKIDIwMTEtMDgtMTYgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IGNvbnZlcnQgRE9NIGJyZWFrcG9pbnQgdHlwZXMgdG8gc3RyaW5ncy4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MzA0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpz b246CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6ZG9tVHlwZUZvck5hbWUpOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yRE9NRGVidWdnZXJBZ2VudDo6c2V0RE9NQnJlYWtwb2ludCk6CisgICAgICAgIChXZWJD b3JlOjpJbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50OjpyZW1vdmVET01CcmVha3BvaW50KToKKyAg ICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudC5oOgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvRE9NQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5ET01CcmVha3BvaW50c1NpZGViYXJQYW5lKToKKworMjAxMS0wOC0x NiAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CisKICAgICAgICAgV2ViIElu c3BlY3RvcjogaGlkZSBub24tY29uc2VydmF0aXZlIG1ldGhvZHMgZnJvbSB0aGUgcHJvdG9jb2wg ZG9jdW1lbnRhdGlvbi4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTY2MzAxCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3IuanNvbiBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgppbmRl eCBkMjk1ZGE5OGQ0NzE1NGE4YTMzZjIyYWY1MzcwOTQ2NmFmYmQyZDc5Li4zZmM1MjQzZjE5ZWI5 ODQzNjJkMmY1MTFmMmMyNjVlYTBlNzgzMDMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3Rvci5qc29uCkBAIC0xNjk0LDIwICsxNjk0LDI4IEBACiAgICAgewogICAgICAgICAiZG9t YWluIjogIkRPTURlYnVnZ2VyIiwKICAgICAgICAgImRlc2NyaXB0aW9uIjogIkRPTSBkZWJ1Z2dp bmcgYWxsb3dzIHNldHRpbmcgYnJlYWtwb2ludHMgb24gcGFydGljdWxhciBET00gb3BlcmF0aW9u cyBhbmQgZXZlbnRzLiBKYXZhU2NyaXB0IGV4ZWN1dGlvbiB3aWxsIHN0b3Agb24gdGhlc2Ugb3Bl cmF0aW9ucyBhcyBpZiB0aGVyZSB3YXMgYSByZWd1bGFyIGJyZWFrcG9pbnQgc2V0LiIsCisgICAg ICAgICJ0eXBlcyI6IFsKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAiaWQiOiAiRE9N QnJlYWtwb2ludFR5cGUiLAorICAgICAgICAgICAgICAgICJ0eXBlIjogInN0cmluZyIsCisgICAg ICAgICAgICAgICAgImVudW0iOiBbInN1YnRyZWUtbW9kaWZpZWQiLCAiYXR0cmlidXRlLW1vZGlm aWVkIiwgIm5vZGUtcmVtb3ZlZCJdLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJE T00gYnJlYWtwb2ludCB0eXBlLiIKKyAgICAgICAgICAgIH0KKyAgICAgICAgXSwKICAgICAgICAg ImNvbW1hbmRzIjogWwogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICJuYW1lIjogInNl dERPTUJyZWFrcG9pbnQiLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwogICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogIm5vZGVJZCIsICJ0eXBlIjogImludGVnZXIiLCAiZGVz Y3JpcHRpb24iOiAiSWRlbnRpZmllciBvZiB0aGUgbm9kZSB0byBzZXQgYnJlYWtwb2ludCBvbi4i IH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidHlwZSIsICJ0eXBlIjogImludGVn ZXIiLCAiZGVzY3JpcHRpb24iOiAiVHlwZSBvZiB0aGUgb3BlcmF0aW9uIHRvIHN0b3AgdXBvbi4i IH0KKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ0eXBlIiwgIiRyZWYiOiAiRE9NQnJl YWtwb2ludFR5cGUiLCAiZGVzY3JpcHRpb24iOiAiVHlwZSBvZiB0aGUgb3BlcmF0aW9uIHRvIHN0 b3AgdXBvbi4iIH0KICAgICAgICAgICAgICAgICBdLAotICAgICAgICAgICAgICAgICJkZXNjcmlw dGlvbiI6ICJTZXRzIGJyZWFrcG9pbnQgb24gcGFydGljdWxhciBvcGVyYXRpb24gd2l0aCBET00u ICIKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiU2V0cyBicmVha3BvaW50IG9uIHBh cnRpY3VsYXIgb3BlcmF0aW9uIHdpdGggRE9NLiIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAg ICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAicmVtb3ZlRE9NQnJlYWtwb2ludCIsCiAgICAg ICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAibm9kZUlkIiwgInR5cGUiOiAiaW50ZWdlciIsICJkZXNjcmlwdGlvbiI6ICJJZGVudGlmaWVy IG9mIHRoZSBub2RlIHRvIHJlbW92ZSBicmVha3BvaW50IGZyb20uIiB9LAotICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogInR5cGUiLCAidHlwZSI6ICJpbnRlZ2VyIiwgImRlc2NyaXB0aW9u IjogIlR5cGUgb2YgdGhlIGJyZWFrcG9pbnQgdG8gcmVtb3ZlLiIgfQorICAgICAgICAgICAgICAg ICAgICB7ICJuYW1lIjogInR5cGUiLCAiJHJlZiI6ICJET01CcmVha3BvaW50VHlwZSIsICJkZXNj cmlwdGlvbiI6ICJUeXBlIG9mIHRoZSBicmVha3BvaW50IHRvIHJlbW92ZS4iIH0KICAgICAgICAg ICAgICAgICBdLAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJSZW1vdmVzIERPTSBi cmVha3BvaW50IHRoYXQgd2FzIHNldCB1c2luZyA8Y29kZT5zZXRET01CcmVha3BvaW50PC9jb2Rl Pi4iCiAgICAgICAgICAgICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQuY3BwCmluZGV4IDRmZGRkODYwNjUxZTI0MzAyM2Iy MDA2NmNlZWY3ODBkYTBlYzAwMjUuLjgxYjYxYzNmZjFjZTQ4N2Q2ODYyMTM2NjZkMjMxYjVhZTA5 MTVmZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01E ZWJ1Z2dlckFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RE9NRGVidWdnZXJBZ2VudC5jcHAKQEAgLTE3OSwxMSArMTc5LDM0IEBAIHZvaWQgSW5zcGVjdG9y RE9NRGVidWdnZXJBZ2VudDo6ZGlkUmVtb3ZlRE9NTm9kZShOb2RlKiBub2RlKQogICAgIH0KIH0K IAotdm9pZCBJbnNwZWN0b3JET01EZWJ1Z2dlckFnZW50OjpzZXRET01CcmVha3BvaW50KEVycm9y U3RyaW5nKiwgaW50IG5vZGVJZCwgaW50IHR5cGUpCitzdGF0aWMgaW50IGRvbVR5cGVGb3JOYW1l KGNvbnN0IFN0cmluZyYgdHlwZVN0cmluZykKK3sKKyAgICBpZiAodHlwZVN0cmluZyA9PSAic3Vi dHJlZS1tb2RpZmllZCIpCisgICAgICAgIHJldHVybiBTdWJ0cmVlTW9kaWZpZWQ7CisgICAgaWYg KHR5cGVTdHJpbmcgPT0gImF0dHJpYnV0ZS1tb2RpZmllZCIpCisgICAgICAgIHJldHVybiBBdHRy aWJ1dGVNb2RpZmllZDsKKyAgICBpZiAodHlwZVN0cmluZyA9PSAibm9kZS1yZW1vdmVkIikKKyAg ICAgICAgcmV0dXJuIE5vZGVSZW1vdmVkOworICAgIHJldHVybiBTdWJ0cmVlTW9kaWZpZWQ7Cit9 CisKK3N0YXRpYyBTdHJpbmcgZG9tVHlwZU5hbWUoaW50IHR5cGUpCit7CisgICAgc3dpdGNoICh0 eXBlKSB7CisgICAgY2FzZSBTdWJ0cmVlTW9kaWZpZWQ6IHJldHVybiAic3VidHJlZS1tb2RpZmll ZCI7CisgICAgY2FzZSBBdHRyaWJ1dGVNb2RpZmllZDogcmV0dXJuICJhdHRyaWJ1dGUtbW9kaWZp ZWQiOworICAgIGNhc2UgTm9kZVJlbW92ZWQ6IHJldHVybiAibm9kZS1yZW1vdmVkIjsKKyAgICBk ZWZhdWx0OiBicmVhazsKKyAgICB9CisgICAgcmV0dXJuICIiOworfQorCit2b2lkIEluc3BlY3Rv ckRPTURlYnVnZ2VyQWdlbnQ6OnNldERPTUJyZWFrcG9pbnQoRXJyb3JTdHJpbmcqLCBpbnQgbm9k ZUlkLCBjb25zdCBTdHJpbmcmIHR5cGVTdHJpbmcpCiB7CiAgICAgTm9kZSogbm9kZSA9IG1fZG9t QWdlbnQtPm5vZGVGb3JJZChub2RlSWQpOwogICAgIGlmICghbm9kZSkKICAgICAgICAgcmV0dXJu OworICAgIGludCB0eXBlID0gZG9tVHlwZUZvck5hbWUodHlwZVN0cmluZyk7CiAKICAgICB1aW50 MzJfdCByb290Qml0ID0gMSA8PCB0eXBlOwogICAgIG1fZG9tQnJlYWtwb2ludHMuc2V0KG5vZGUs IG1fZG9tQnJlYWtwb2ludHMuZ2V0KG5vZGUpIHwgcm9vdEJpdCk7CkBAIC0xOTMsMTEgKzIxNiwx MiBAQCB2b2lkIEluc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQ6OnNldERPTUJyZWFrcG9pbnQoRXJy b3JTdHJpbmcqLCBpbnQgbm9kZUlkLCBpbnQgdAogICAgIH0KIH0KIAotdm9pZCBJbnNwZWN0b3JE T01EZWJ1Z2dlckFnZW50OjpyZW1vdmVET01CcmVha3BvaW50KEVycm9yU3RyaW5nKiwgaW50IG5v ZGVJZCwgaW50IHR5cGUpCit2b2lkIEluc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQ6OnJlbW92ZURP TUJyZWFrcG9pbnQoRXJyb3JTdHJpbmcqLCBpbnQgbm9kZUlkLCBjb25zdCBTdHJpbmcmIHR5cGVT dHJpbmcpCiB7CiAgICAgTm9kZSogbm9kZSA9IG1fZG9tQWdlbnQtPm5vZGVGb3JJZChub2RlSWQp OwogICAgIGlmICghbm9kZSkKICAgICAgICAgcmV0dXJuOworICAgIGludCB0eXBlID0gZG9tVHlw ZUZvck5hbWUodHlwZVN0cmluZyk7CiAKICAgICB1aW50MzJfdCByb290Qml0ID0gMSA8PCB0eXBl OwogICAgIHVpbnQzMl90IG1hc2sgPSBtX2RvbUJyZWFrcG9pbnRzLmdldChub2RlKSAmIH5yb290 Qml0OwpAQCAtMjc1LDcgKzI5OSw3IEBAIHZvaWQgSW5zcGVjdG9yRE9NRGVidWdnZXJBZ2VudDo6 ZGVzY3JpcHRpb25Gb3JET01FdmVudChOb2RlKiB0YXJnZXQsIGludCBicmVha3BvCiAgICAgaW50 IGJyZWFrcG9pbnRPd25lck5vZGVJZCA9IG1fZG9tQWdlbnQtPmJvdW5kTm9kZUlkKGJyZWFrcG9p bnRPd25lcik7CiAgICAgQVNTRVJUKGJyZWFrcG9pbnRPd25lck5vZGVJZCk7CiAgICAgZGVzY3Jp cHRpb24tPnNldE51bWJlcigibm9kZUlkIiwgYnJlYWtwb2ludE93bmVyTm9kZUlkKTsKLSAgICBk ZXNjcmlwdGlvbi0+c2V0TnVtYmVyKCJ0eXBlIiwgYnJlYWtwb2ludFR5cGUpOworICAgIGRlc2Ny aXB0aW9uLT5zZXRTdHJpbmcoInR5cGUiLCBkb21UeXBlTmFtZShicmVha3BvaW50VHlwZSkpOwog fQogCiBib29sIEluc3BlY3RvckRPTURlYnVnZ2VyQWdlbnQ6Omhhc0JyZWFrcG9pbnQoTm9kZSog bm9kZSwgaW50IHR5cGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yRE9NRGVidWdnZXJBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckRPTURlYnVnZ2VyQWdlbnQuaAppbmRleCA1OWEzYzY5ZWVjZTA0OTIwMzIxMzZlNzA2ZDYz MDI5ZjkwNDMxODUyLi41ODFjNGJjODFiMDIzNGY0MWYzOWRhNTE4YThjNWE4YWM2MTQ0NDc5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NRGVidWdnZXJB Z2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01EZWJ1Z2dl ckFnZW50LmgKQEAgLTY3LDggKzY3LDggQEAgcHVibGljOgogICAgIHZvaWQgcmVtb3ZlWEhSQnJl YWtwb2ludChFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgdXJsKTsKICAgICB2b2lkIHNldEV2 ZW50TGlzdGVuZXJCcmVha3BvaW50KEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBldmVudE5h bWUpOwogICAgIHZvaWQgcmVtb3ZlRXZlbnRMaXN0ZW5lckJyZWFrcG9pbnQoRXJyb3JTdHJpbmcq LCBjb25zdCBTdHJpbmcmIGV2ZW50TmFtZSk7Ci0gICAgdm9pZCBzZXRET01CcmVha3BvaW50KEVy cm9yU3RyaW5nKiwgaW50IG5vZGVJZCwgaW50IHR5cGUpOwotICAgIHZvaWQgcmVtb3ZlRE9NQnJl YWtwb2ludChFcnJvclN0cmluZyosIGludCBub2RlSWQsIGludCB0eXBlKTsKKyAgICB2b2lkIHNl dERPTUJyZWFrcG9pbnQoRXJyb3JTdHJpbmcqLCBpbnQgbm9kZUlkLCBjb25zdCBTdHJpbmcmIHR5 cGUpOworICAgIHZvaWQgcmVtb3ZlRE9NQnJlYWtwb2ludChFcnJvclN0cmluZyosIGludCBub2Rl SWQsIGNvbnN0IFN0cmluZyYgdHlwZSk7CiAKICAgICAvLyBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b24gQVBJCiAgICAgdm9pZCB3aWxsSW5zZXJ0RE9NTm9kZShOb2RlKiwgTm9kZSogcGFyZW50KTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQnJlYWtw b2ludHNTaWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RE9NQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcwppbmRleCA2YzJmNDg5ZDJiNGIwNjM3Mjk5YWMw NDMwNDZhMjZiNThiODZjY2ZkLi40NTA5MzdiMzNhZjhjNjZkZDY2NDFmYWQ4NGY1YTIwZDliZGU0 NGZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUJy ZWFrcG9pbnRzU2lkZWJhclBhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9ET01CcmVha3BvaW50c1NpZGViYXJQYW5lLmpzCkBAIC0zNSwyMCArMzUsMjAgQEAg V2ViSW5zcGVjdG9yLkRPTUJyZWFrcG9pbnRzU2lkZWJhclBhbmUgPSBmdW5jdGlvbigpCiAgICAg dGhpcy5fYnJlYWtwb2ludEVsZW1lbnRzID0ge307CiAKICAgICB0aGlzLl9icmVha3BvaW50VHlw ZXMgPSB7Ci0gICAgICAgIFN1YnRyZWVNb2RpZmllZDogMCwKLSAgICAgICAgQXR0cmlidXRlTW9k aWZpZWQ6IDEsCi0gICAgICAgIE5vZGVSZW1vdmVkOiAyCisgICAgICAgIFN1YnRyZWVNb2RpZmll ZDogInN1YnRyZWUtbW9kaWZpZWQiLAorICAgICAgICBBdHRyaWJ1dGVNb2RpZmllZDogImF0dHJp YnV0ZS1tb2RpZmllZCIsCisgICAgICAgIE5vZGVSZW1vdmVkOiAibm9kZS1yZW1vdmVkIgogICAg IH07Ci0gICAgdGhpcy5fYnJlYWtwb2ludFR5cGVMYWJlbHMgPSBbCi0gICAgICAgIFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiU3VidHJlZSBNb2RpZmllZCIpLAotICAgICAgICBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIkF0dHJpYnV0ZSBNb2RpZmllZCIpLAotICAgICAgICBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIk5vZGUgUmVtb3ZlZCIpCi0gICAgXTsKLSAgICB0aGlzLl9jb250ZXh0TWVudUxhYmVs cyA9IFsKLSAgICAgICAgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dl ckNhc2VNZW51VGl0bGVzKCkgPyAiQnJlYWsgb24gc3VidHJlZSBtb2RpZmljYXRpb25zIiA6ICJC cmVhayBvbiBTdWJ0cmVlIE1vZGlmaWNhdGlvbnMiKSwKLSAgICAgICAgV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiQnJlYWsgb24g YXR0cmlidXRlcyBtb2RpZmljYXRpb25zIiA6ICJCcmVhayBvbiBBdHRyaWJ1dGVzIE1vZGlmaWNh dGlvbnMiKSwKLSAgICAgICAgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VM b3dlckNhc2VNZW51VGl0bGVzKCkgPyAiQnJlYWsgb24gbm9kZSByZW1vdmFsIiA6ICJCcmVhayBv biBOb2RlIFJlbW92YWwiKQotICAgIF07CisgICAgdGhpcy5fYnJlYWtwb2ludFR5cGVMYWJlbHMg PSB7fTsKKyAgICB0aGlzLl9icmVha3BvaW50VHlwZUxhYmVsc1t0aGlzLl9icmVha3BvaW50VHlw ZXMuU3VidHJlZU1vZGlmaWVkXSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3VidHJlZSBNb2Rp ZmllZCIpOworICAgIHRoaXMuX2JyZWFrcG9pbnRUeXBlTGFiZWxzW3RoaXMuX2JyZWFrcG9pbnRU eXBlcy5BdHRyaWJ1dGVNb2RpZmllZF0gPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkF0dHJpYnV0 ZSBNb2RpZmllZCIpOworICAgIHRoaXMuX2JyZWFrcG9pbnRUeXBlTGFiZWxzW3RoaXMuX2JyZWFr cG9pbnRUeXBlcy5Ob2RlUmVtb3ZlZF0gPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk5vZGUgUmVt b3ZlZCIpOworCisgICAgdGhpcy5fY29udGV4dE1lbnVMYWJlbHMgPSB7fTsKKyAgICB0aGlzLl9j b250ZXh0TWVudUxhYmVsc1t0aGlzLl9icmVha3BvaW50VHlwZXMuU3VidHJlZU1vZGlmaWVkXSA9 IFdlYkluc3BlY3Rvci5VSVN0cmluZyhXZWJJbnNwZWN0b3IudXNlTG93ZXJDYXNlTWVudVRpdGxl cygpID8gIkJyZWFrIG9uIHN1YnRyZWUgbW9kaWZpY2F0aW9ucyIgOiAiQnJlYWsgb24gU3VidHJl ZSBNb2RpZmljYXRpb25zIik7CisgICAgdGhpcy5fY29udGV4dE1lbnVMYWJlbHNbdGhpcy5fYnJl YWtwb2ludFR5cGVzLkF0dHJpYnV0ZU1vZGlmaWVkXSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZyhX ZWJJbnNwZWN0b3IudXNlTG93ZXJDYXNlTWVudVRpdGxlcygpID8gIkJyZWFrIG9uIGF0dHJpYnV0 ZXMgbW9kaWZpY2F0aW9ucyIgOiAiQnJlYWsgb24gQXR0cmlidXRlcyBNb2RpZmljYXRpb25zIik7 CisgICAgdGhpcy5fY29udGV4dE1lbnVMYWJlbHNbdGhpcy5fYnJlYWtwb2ludFR5cGVzLk5vZGVS ZW1vdmVkXSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZyhXZWJJbnNwZWN0b3IudXNlTG93ZXJDYXNl TWVudVRpdGxlcygpID8gIkJyZWFrIG9uIG5vZGUgcmVtb3ZhbCIgOiAiQnJlYWsgb24gTm9kZSBS ZW1vdmFsIik7CisKICAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5JbnNwZWN0 ZWRVUkxDaGFuZ2VkLCB0aGlzLl9pbnNwZWN0ZWRVUkxDaGFuZ2VkLCB0aGlzKTsKIH0KIApAQCAt NzgsNyArNzgsOCBAQCBXZWJJbnNwZWN0b3IuRE9NQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9zYXZlQnJlYWtwb2ludHMoKTsKICAgICAgICAg fQogCi0gICAgICAgIGZvciAodmFyIHR5cGUgPSAwOyB0eXBlIDwgMzsgKyt0eXBlKSB7CisgICAg ICAgIGZvciAodmFyIGtleSBpbiB0aGlzLl9icmVha3BvaW50VHlwZXMpIHsKKyAgICAgICAgICAg IHZhciB0eXBlID0gdGhpcy5fYnJlYWtwb2ludFR5cGVzW2tleV07CiAgICAgICAgICAgICB2YXIg bGFiZWwgPSB0aGlzLl9jb250ZXh0TWVudUxhYmVsc1t0eXBlXTsKICAgICAgICAgICAgIGNvbnRl eHRNZW51LmFwcGVuZENoZWNrYm94SXRlbShsYWJlbCwgdG9nZ2xlQnJlYWtwb2ludC5iaW5kKHRo aXMsIHR5cGUpLCBub2RlQnJlYWtwb2ludHNbdHlwZV0pOwogICAgICAgICB9Cg==