72393 2011-11-15 09:50:51 -0800 Web Inspector: introduce Debugger domain capabilities concept. 2011-11-17 15:48:08 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman abarth apavlov bweinstein japhet joepeck keishi loislo pfeldman pkasting pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 502994 0 pfeldman 2011-11-15 09:50:51 -0800 Many of the Preferences that we have in Settings.js and override in DevTools.js are really not preferences, but capabilities. Protocol clients should have a way of figuring out whether some capability is present before using it. I'm adding the "capability" concept into the JSON and Debugger::getCapabilities as the first implementation. Marked as hidden so far. 503000 1 115185 pfeldman 2011-11-15 10:00:12 -0800 Created attachment 115185 Patch 503002 2 webkit.review.bot 2011-11-15 10:04:51 -0800 Attachment 115185 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/inspector/InspectorDebuggerAgent.cpp:103: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] Source/WebCore/inspector/InspectorDebuggerAgent.h:67: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] Total errors found: 2 in 12 files If any of these errors are false positives, please file a bug against check-webkit-style. 504590 3 115185 yurys 2011-11-16 23:27:09 -0800 Comment on attachment 115185 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115185&action=review > Source/WebCore/bindings/v8/ScriptDebugServer.cpp:43 > +#include <wtf/Vector.h> remove this > Source/WebCore/bindings/v8/ScriptDebugServer.h:44 > +#include <wtf/Vector.h> remove this > Source/WebCore/inspector/Inspector.json:1797 > + "name": "getCapabilities", Should we have a separate command getCapabilities([domain]) instead of introducing it on each agent? 504622 4 pfeldman 2011-11-17 00:17:02 -0800 Committed r100572: <http://trac.webkit.org/changeset/100572> 505174 5 pkasting 2011-11-17 13:51:31 -0800 This may have caused bug 72651. I'm going to try rolling out r100572 to see if the Linux dbg bot stabilizes. 505301 6 pkasting 2011-11-17 15:48:08 -0800 The rollout did not help, so I'm rolling this change back in. 115185 2011-11-15 10:00:12 -0800 2011-11-16 23:28:31 -0800 Patch bug-72393-20111115220010.patch text/plain 19295 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwMjc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODEwYjc3YmNlNDU1YWZk MjdmNmFhYjRlMDZjNGM0YWM0MzIyMzhhNi4uOTc1MWM0MTkxNmU5YTJjMjdmYWQ0NTk3YzNkMjQ3 MDFlZjFmMjQwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDExLTExLTE1ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9y OiBpbnRyb2R1Y2UgRGVidWdnZXIgZG9tYWluIGNhcGFiaWxpdGllcyBjb25jZXB0LgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzIzOTMKKworICAgICAg ICBNYW55IG9mIHRoZSBQcmVmZXJlbmNlcyB0aGF0IHdlIGhhdmUgaW4gU2V0dGluZ3MuanMgYW5k IG92ZXJyaWRlIGluIERldlRvb2xzLmpzCisgICAgICAgIGFyZSByZWFsbHkgbm90IHByZWZlcmVu Y2VzLCBidXQgY2FwYWJpbGl0aWVzLiBQcm90b2NvbCBjbGllbnRzIHNob3VsZCBoYXZlIGEgd2F5 CisgICAgICAgIG9mIGZpZ3VyaW5nIG91dCB3aGV0aGVyIHNvbWUgY2FwYWJpbGl0eSBpcyBwcmVz ZW50IGJlZm9yZSB1c2luZyBpdC4KKworICAgICAgICBObyBuZXcgdGVzdHMuIChPT1BTISkKKwor ICAgICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlNjcmlwdERlYnVnU2VydmVyOjpjYW5TZXRTY3JpcHRTb3VyY2UpOgorICAgICAgICAq IGJpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmg6CisgICAgICAgICogYmluZGluZ3Mvdjgv U2NyaXB0RGVidWdTZXJ2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0RGVidWdTZXJ2 ZXI6OmNhblNldFNjcmlwdFNvdXJjZSk6CisgICAgICAgICogYmluZGluZ3MvdjgvU2NyaXB0RGVi dWdTZXJ2ZXIuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5w eToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAgICogaW5zcGVj dG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yRGVidWdnZXJBZ2VudDo6Z2V0Q2FwYWJpbGl0aWVzKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv SW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv RGVidWdnZXJNb2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlwZS5lbmFibGVEZWJ1 Z2dlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5cGUuY2Fu U2V0U2NyaXB0U291cmNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2Vy UHJlc2VudGF0aW9uTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVz ZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuY2FuRWRpdFNjcmlwdFNvdXJjZSk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qczoKKworMjAxMS0xMS0xNSAgUGF2ZWwgRmVs ZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogbW92 ZSBnZW5lcmljIGNvZGUgZnJvbSBEZXZUb29scy5qcyBpbnRvIHRoZSBXZWJDb3JlLgogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzIzNzcKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwppbmRleCA1MDFjYjdlOTg1MzIwOGYwNmEyM2QwMGMyYTNiM2E2NzFm ZGQyYjE3Li4xNjE4Zjk5NzQ4YmQyYjEzN2YzNTNmYmYyZDk2YmIxYWMyYWNlOTljIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDExLTExLTE1ICBQYXZlbCBG ZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBp bnRyb2R1Y2UgRGVidWdnZXIgZG9tYWluIGNhcGFiaWxpdGllcyBjb25jZXB0LgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzIzOTMKKworICAgICAgICBN YW55IG9mIHRoZSBQcmVmZXJlbmNlcyB0aGF0IHdlIGhhdmUgaW4gU2V0dGluZ3MuanMgYW5kIG92 ZXJyaWRlIGluIERldlRvb2xzLmpzCisgICAgICAgIGFyZSByZWFsbHkgbm90IHByZWZlcmVuY2Vz LCBidXQgY2FwYWJpbGl0aWVzLiBQcm90b2NvbCBjbGllbnRzIHNob3VsZCBoYXZlIGEgd2F5Cisg ICAgICAgIG9mIGZpZ3VyaW5nIG91dCB3aGV0aGVyIHNvbWUgY2FwYWJpbGl0eSBpcyBwcmVzZW50 IGJlZm9yZSB1c2luZyBpdC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIHNyYy9qcy9EZXZUb29scy5qczoKKworMjAxMS0xMS0xNSAgUGF2ZWwgRmVs ZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogbW92 ZSBnZW5lcmljIGNvZGUgZnJvbSBEZXZUb29scy5qcyBpbnRvIHRoZSBXZWJDb3JlLgogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzIzNzcKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0RGVidWdTZXJ2ZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCmluZGV4IGFi MGE5MTAxOTI1YTg4NTU2NGNjOGE3N2JiYWE3NTM0MTg0YTRlNWEuLmY1MzkxN2M0ODk0ZDNkODkz NTM5NzhmZWNhZTk0NWZkNjdhMWJkN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9TY3JpcHREZWJ1Z1NlcnZlci5jcHAKQEAgLTE5MSw2ICsxOTEsMTEgQEAgdm9pZCBTY3Jp cHREZWJ1Z1NlcnZlcjo6c3RlcE91dE9mRnVuY3Rpb24oKQogICAgIG1fZG9uZVByb2Nlc3NpbmdE ZWJ1Z2dlckV2ZW50cyA9IHRydWU7CiB9CiAKK2Jvb2wgU2NyaXB0RGVidWdTZXJ2ZXI6OmNhblNl dFNjcmlwdFNvdXJjZSgpCit7CisgICAgcmV0dXJuIGZhbHNlOworfQorCiBib29sIFNjcmlwdERl YnVnU2VydmVyOjpzZXRTY3JpcHRTb3VyY2UoY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJiwg Ym9vbCwgU3RyaW5nKiwgU2NyaXB0VmFsdWUqLCBTY3JpcHRPYmplY3QqKQogewogICAgIC8vIEZJ WE1FKDQwMzAwKTogaW1wbGVtZW50IHRoaXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9TY3JpcHREZWJ1Z1NlcnZlci5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvU2NyaXB0RGVidWdTZXJ2ZXIuaAppbmRleCBjM2RkZDZjNmIyMWQyYTkxMDYzNjZhNjA4NmQ1 OGMxNTUxYjY5MjY4Li43ZjhjYjA1NDY5MjYzODUyMzY1MDRjYmMwZWUyYmNkY2MwMWI3YWFlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHREZWJ1Z1NlcnZlci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmgKQEAg LTQyLDYgKzQyLDcgQEAKICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUgPHd0Zi9I YXNoU2V0Lmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgorI2luY2x1ZGUgPHd0Zi9WZWN0b3Iu aD4KICNpbmNsdWRlIDx3dGYvdGV4dC9UZXh0UG9zaXRpb24uaD4KIAogbmFtZXNwYWNlIEpTQyB7 CkBAIC04MCw2ICs4MSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHN0ZXBPdmVyU3RhdGVtZW50KCk7 CiAgICAgdm9pZCBzdGVwT3V0T2ZGdW5jdGlvbigpOwogCisgICAgYm9vbCBjYW5TZXRTY3JpcHRT b3VyY2UoKTsKICAgICBib29sIHNldFNjcmlwdFNvdXJjZShjb25zdCBTdHJpbmcmIHNvdXJjZUlE LCBjb25zdCBTdHJpbmcmIG5ld0NvbnRlbnQsIGJvb2wgcHJldmlldywgU3RyaW5nKiBlcnJvciwg U2NyaXB0VmFsdWUqIG5ld0NhbGxGcmFtZXMsIFNjcmlwdE9iamVjdCogcmVzdWx0KTsKIAogICAg IHZvaWQgcmVjb21waWxlQWxsSlNGdW5jdGlvbnNTb29uKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHREZWJ1Z1NlcnZlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy92OC9TY3JpcHREZWJ1Z1NlcnZlci5jcHAKaW5kZXggNGQ3NGZkOGM1ZTU1ODM0 ZDNjOGY2ZTQ4NzgyOTlmN2ZjYjA0MDI2NS4uNWZlMzk0MzAzYzEzZThjNmU0YjU0ZmQ3NDJlOWMz MTQxOGIwMDIxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0 RGVidWdTZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERl YnVnU2VydmVyLmNwcApAQCAtNDAsNiArNDAsNyBAQAogI2luY2x1ZGUgIlY4QmluZGluZy5oIgog I2luY2x1ZGUgIlY4SmF2YVNjcmlwdENhbGxGcmFtZS5oIgogI2luY2x1ZGUgPHd0Zi9TdGRMaWJF eHRyYXMuaD4KKyNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IApAQCAtMjEzLDYgKzIxNCwxMSBAQCB2b2lkIFNjcmlwdERlYnVnU2VydmVyOjpzdGVwT3V0T2ZG dW5jdGlvbigpCiAgICAgY29udGludWVQcm9ncmFtKCk7CiB9CiAKK2Jvb2wgU2NyaXB0RGVidWdT ZXJ2ZXI6OmNhblNldFNjcmlwdFNvdXJjZSgpCit7CisgICAgcmV0dXJuIHRydWU7Cit9CisKIGJv b2wgU2NyaXB0RGVidWdTZXJ2ZXI6OnNldFNjcmlwdFNvdXJjZShjb25zdCBTdHJpbmcmIHNvdXJj ZUlELCBjb25zdCBTdHJpbmcmIG5ld0NvbnRlbnQsIGJvb2wgcHJldmlldywgU3RyaW5nKiBlcnJv ciwgU2NyaXB0VmFsdWUqIG5ld0NhbGxGcmFtZXMsIFNjcmlwdE9iamVjdCogcmVzdWx0KQogewog ICAgIGVuc3VyZURlYnVnZ2VyU2NyaXB0Q29tcGlsZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2VydmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9TY3JpcHREZWJ1Z1NlcnZlci5oCmluZGV4IGZhMWU1ODQ4YzJhOTBiOWJhNDYw OGZiY2Y5NjM5Mjc1ODhkYjJiMmUuLmMzOTIwZWM1NGQ5NzNjM2RkYWUwNTU5N2E3Njc0ZGFkY2E0 MjM0MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVn U2VydmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0RGVidWdTZXJ2 ZXIuaApAQCAtNDEsNiArNDEsNyBAQAogI2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CiAjaW5jbHVk ZSA8d3RmL05vbmNvcHlhYmxlLmg+CiAjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KKyNpbmNs dWRlIDx3dGYvVmVjdG9yLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nSGFzaC5oPgogCiBu YW1lc3BhY2UgV2ViQ29yZSB7CkBAIC03NCw2ICs3NSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHN0 ZXBPdmVyU3RhdGVtZW50KCk7CiAgICAgdm9pZCBzdGVwT3V0T2ZGdW5jdGlvbigpOwogCisgICAg Ym9vbCBjYW5TZXRTY3JpcHRTb3VyY2UoKTsKICAgICBib29sIHNldFNjcmlwdFNvdXJjZShjb25z dCBTdHJpbmcmIHNvdXJjZUlELCBjb25zdCBTdHJpbmcmIG5ld0NvbnRlbnQsIGJvb2wgcHJldmll dywgU3RyaW5nKiBlcnJvciwgU2NyaXB0VmFsdWUqIG5ld0NhbGxGcmFtZXMsIFNjcmlwdE9iamVj dCogcmVzdWx0KTsKIAogICAgIHZvaWQgcmVjb21waWxlQWxsSlNGdW5jdGlvbnNTb29uKCkgeyB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3Bl Y3Rvci5weSBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9y LnB5CmluZGV4IGE0Yjg2NDE0NzQ1YzFhYzk4MTM0MDM5ZTA4MTBiODM1ODFmNTdiZTYuLjRmZjJi MjVhNWZhNzE1MWEzNjJjMWMwYjIzZGEzYTk4MzM1N2E5MjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5CisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5CkBAIC01OSw2ICs1OSw5 IEBAIGV4Y2VwdCBFeGNlcHRpb24sIGU6CiAgICAgZXhpdCgxKQogCiAKK2RlZiBkYXNoX3RvX2Nh bWVsY2FzZSh3b3JkKToKKyAgICByZXR1cm4gJycuam9pbih4LmNhcGl0YWxpemUoKSBvciAnLScg Zm9yIHggaW4gd29yZC5zcGxpdCgnLScpKQorCiBkZWYgcGFyc2VfZGVmaW5lcyhzdHIpOgogICAg IGlmIG5vdCBzdHI6CiAgICAgICAgIHJldHVybiB7fQpAQCAtNDIyLDcgKzQyNSw3IEBAIGpzb25f YXBpID0ganNvbi5sb2Fkcyhqc29uX3N0cmluZykKIGNsYXNzIFRlbXBsYXRlczoKICAgICBmcm9u dGVuZF9kb21haW5fY2xhc3MgPSBzdHJpbmcuVGVtcGxhdGUoCiAiIiIgICAgY2xhc3MgJGRvbWFp bkNsYXNzTmFtZSB7Ci0gICAgcHVibGljOgorICAgIHB1YmxpYzokZG9tYWluQ2FwYWJpbGl0aWVz CiAgICAgICAgICRkb21haW5DbGFzc05hbWUoSW5zcGVjdG9yRnJvbnRlbmRDaGFubmVsKiBpbnNw ZWN0b3JGcm9udGVuZENoYW5uZWwpIDogbV9pbnNwZWN0b3JGcm9udGVuZENoYW5uZWwoaW5zcGVj dG9yRnJvbnRlbmRDaGFubmVsKSB7IH0KICR7ZnJvbnRlbmREb21haW5NZXRob2REZWNsYXJhdGlv bnN9ICAgICAgICB2b2lkIHNldEluc3BlY3RvckZyb250ZW5kQ2hhbm5lbChJbnNwZWN0b3JGcm9u dGVuZENoYW5uZWwqIGluc3BlY3RvckZyb250ZW5kQ2hhbm5lbCkgeyBtX2luc3BlY3RvckZyb250 ZW5kQ2hhbm5lbCA9IGluc3BlY3RvckZyb250ZW5kQ2hhbm5lbDsgfQogICAgICAgICBJbnNwZWN0 b3JGcm9udGVuZENoYW5uZWwqIGdldEluc3BlY3RvckZyb250ZW5kQ2hhbm5lbCgpIHsgcmV0dXJu IG1faW5zcGVjdG9yRnJvbnRlbmRDaGFubmVsOyB9CkBAIC05MTMsNyArOTE2LDcgQEAgYm9vbCBJ bnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlcjo6Z2V0Q29tbWFuZE5hbWUoY29uc3QgU3RyaW5nJiBt ZXNzYWdlLCBTdHJpbmcqIHIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0KKyRjYXBhYmlsaXRp ZXMKIAogSW5zcGVjdG9yRnJvbnRlbmQ6Okluc3BlY3RvckZyb250ZW5kKEluc3BlY3RvckZyb250 ZW5kQ2hhbm5lbCogaW5zcGVjdG9yRnJvbnRlbmRDaGFubmVsKQogICAgIDogbV9pbnNwZWN0b3JG cm9udGVuZENoYW5uZWwoaW5zcGVjdG9yRnJvbnRlbmRDaGFubmVsKQpAQCAtOTQwLDcgKzk0Myw3 IEBAIEluc3BlY3RvckJhY2tlbmRTdHViID0gZnVuY3Rpb24oKQogICAgIHRoaXMuX2RvbWFpbkRp c3BhdGNoZXJzID0ge307CiAgICAgdGhpcy5fZXZlbnRBcmdzID0ge307CiAgICAgdGhpcy5fcmVw bHlBcmdzID0ge307Ci0kZGVsZWdhdGVzJGV2ZW50QXJncyRyZXBseUFyZ3MkZG9tYWluRGlzcGF0 Y2hlcnN9CiskZGVsZWdhdGVzJGV2ZW50QXJncyRyZXBseUFyZ3MkZG9tYWluRGlzcGF0Y2hlcnMk Y2FwYWJpbGl0aWVzfQogCiBJbnNwZWN0b3JCYWNrZW5kU3R1Yi5wcm90b3R5cGUgPSB7CiAgICAg ZHVtcEluc3BlY3RvclRpbWVTdGF0czogMCwKQEAgLTExODIsNyArMTE4NSw2IEBAIEluc3BlY3Rv ckJhY2tlbmQgPSBuZXcgSW5zcGVjdG9yQmFja2VuZFN0dWIoKTsiIiIpCiAKIHR5cGVfbWFwID0g VHlwZU1hcChqc29uX2FwaSkKIAotCiBjbGFzcyBHZW5lcmF0b3I6CiAgICAgZnJvbnRlbmRfY2xh c3NfZmllbGRfbGluZXMgPSBbXQogICAgIGZyb250ZW5kX2RvbWFpbl9jbGFzc19saW5lcyA9IFtd CkBAIC0xMTk3LDYgKzExOTksNyBAQCBjbGFzcyBHZW5lcmF0b3I6CiAgICAgYmFja2VuZF9qc19l dmVudF9saXN0ID0gW10KICAgICBiYWNrZW5kX2pzX3JlcGx5X2xpc3QgPSBbXQogICAgIGJhY2tl bmRfanNfZG9tYWluX2Rpc3BhdGNoZXJfbGlzdCA9IFtdCisgICAgYmFja2VuZF9qc19jYXBhYmls aXRpZXNfbGlzdCA9IFtdCiAKICAgICBiYWNrZW5kX2NvbnN0cnVjdG9yX3BhcmFtX2xpc3QgPSBb XQogICAgIGJhY2tlbmRfY29uc3RydWN0b3JfaW5pdF9saXN0ID0gW10KQEAgLTEyMDQsNiArMTIw Nyw3IEBAIGNsYXNzIEdlbmVyYXRvcjoKICAgICBiYWNrZW5kX2ZvcndhcmRfbGlzdCA9IFtdCiAg ICAgYmFja2VuZF9pbmNsdWRlX2xpc3QgPSBbXQogICAgIGZyb250ZW5kX2NvbnN0cnVjdG9yX2lu aXRfbGlzdCA9IFtdCisgICAgZnJvbnRlbmRfY2FwYWJpbGl0aWVzX2NvbnN0YW50c19saXN0ID0g W10KIAogICAgIEBzdGF0aWNtZXRob2QKICAgICBkZWYgZ28oKToKQEAgLTEyMTksMTYgKzEyMjMs MjcgQEAgY2xhc3MgR2VuZXJhdG9yOgogICAgICAgICAgICAgYWdlbnRfZmllbGRfbmFtZSA9IGRv bWFpbl9kYXRhLmFnZW50X2ZpZWxkX25hbWUKIAogICAgICAgICAgICAgZnJvbnRlbmRfbWV0aG9k X2RlY2xhcmF0aW9uX2xpbmVzID0gW10KKyAgICAgICAgICAgIGRvbWFpbl9jYXBhYmlsaXRpZXMg PSBbXQorICAgICAgICAgICAgaWYgImNhcGFiaWxpdGllcyIgaW4ganNvbl9kb21haW46CisgICAg ICAgICAgICAgICAgZm9yIGpzb25fY2FwYWJpbGl0eSBpbiBqc29uX2RvbWFpblsiY2FwYWJpbGl0 aWVzIl06CisgICAgICAgICAgICAgICAgICAgIG5hbWUgPSBqc29uX2NhcGFiaWxpdHlbIm5hbWUi XQorICAgICAgICAgICAgICAgICAgICBjYXBhYmlsaXR5X3ZhcmlhYmxlX25hbWUgPSAiY2FwYWJp bGl0eSVzIiAlIGRhc2hfdG9fY2FtZWxjYXNlKG5hbWUpCisgICAgICAgICAgICAgICAgICAgIGRv bWFpbl9jYXBhYmlsaXRpZXMuYXBwZW5kKCJcbiAgICAgICAgc3RhdGljIGNvbnN0IGNoYXIqICVz OyIgJSBjYXBhYmlsaXR5X3ZhcmlhYmxlX25hbWUpCisgICAgICAgICAgICAgICAgICAgIEdlbmVy YXRvci5mcm9udGVuZF9jYXBhYmlsaXRpZXNfY29uc3RhbnRzX2xpc3QuYXBwZW5kKCJjb25zdCBj aGFyKiBJbnNwZWN0b3JGcm9udGVuZDo6JXM6OiVzID0gXCIlc1wiOyIgJSAoZG9tYWluX25hbWUs IGNhcGFiaWxpdHlfdmFyaWFibGVfbmFtZSwgbmFtZSkpCisgICAgICAgICAgICAgICAgICAgIEdl bmVyYXRvci5iYWNrZW5kX2pzX2NhcGFiaWxpdGllc19saXN0LmFwcGVuZCgiICAgICVzQWdlbnQu JXMgPSBcIiVzXCI7XG4iICUgKGRvbWFpbl9uYW1lLCBjYXBhYmlsaXR5X3ZhcmlhYmxlX25hbWUs IG5hbWUpKQorCiAgICAgICAgICAgICBpZiAiZXZlbnRzIiBpbiBqc29uX2RvbWFpbjoKICAgICAg ICAgICAgICAgICBmb3IganNvbl9ldmVudCBpbiBqc29uX2RvbWFpblsiZXZlbnRzIl06CiAgICAg ICAgICAgICAgICAgICAgIEdlbmVyYXRvci5wcm9jZXNzX2V2ZW50KGpzb25fZXZlbnQsIGRvbWFp bl9uYW1lLCBmcm9udGVuZF9tZXRob2RfZGVjbGFyYXRpb25fbGluZXMpCiAKLSAgICAgICAgICAg ICAgICBHZW5lcmF0b3IuZnJvbnRlbmRfY2xhc3NfZmllbGRfbGluZXMuYXBwZW5kKCIgICAgJXMg bV8lcztcbiIgJSAoZG9tYWluX25hbWUsIGRvbWFpbl9uYW1lX2xvd2VyKSkKLSAgICAgICAgICAg ICAgICBHZW5lcmF0b3IuZnJvbnRlbmRfY29uc3RydWN0b3JfaW5pdF9saXN0LmFwcGVuZCgiICAg ICwgbV8lcyhpbnNwZWN0b3JGcm9udGVuZENoYW5uZWwpXG4iICUgZG9tYWluX25hbWVfbG93ZXIp Ci0gICAgICAgICAgICAgICAgR2VuZXJhdG9yLmZyb250ZW5kX2RvbWFpbl9jbGFzc19saW5lcy5h cHBlbmQoVGVtcGxhdGVzLmZyb250ZW5kX2RvbWFpbl9jbGFzcy5zdWJzdGl0dXRlKE5vbmUsCi0g ICAgICAgICAgICAgICAgICAgIGRvbWFpbkNsYXNzTmFtZT1kb21haW5fbmFtZSwKLSAgICAgICAg ICAgICAgICAgICAgZG9tYWluRmllbGROYW1lPWRvbWFpbl9uYW1lX2xvd2VyLAotICAgICAgICAg ICAgICAgICAgICBmcm9udGVuZERvbWFpbk1ldGhvZERlY2xhcmF0aW9ucz1qb2luKGZyb250ZW5k X21ldGhvZF9kZWNsYXJhdGlvbl9saW5lcywgIiIpKSkKKyAgICAgICAgICAgIEdlbmVyYXRvci5m cm9udGVuZF9jbGFzc19maWVsZF9saW5lcy5hcHBlbmQoIiAgICAlcyBtXyVzO1xuIiAlIChkb21h aW5fbmFtZSwgZG9tYWluX25hbWVfbG93ZXIpKQorICAgICAgICAgICAgR2VuZXJhdG9yLmZyb250 ZW5kX2NvbnN0cnVjdG9yX2luaXRfbGlzdC5hcHBlbmQoIiAgICAsIG1fJXMoaW5zcGVjdG9yRnJv bnRlbmRDaGFubmVsKVxuIiAlIGRvbWFpbl9uYW1lX2xvd2VyKQorICAgICAgICAgICAgR2VuZXJh dG9yLmZyb250ZW5kX2RvbWFpbl9jbGFzc19saW5lcy5hcHBlbmQoVGVtcGxhdGVzLmZyb250ZW5k X2RvbWFpbl9jbGFzcy5zdWJzdGl0dXRlKE5vbmUsCisgICAgICAgICAgICAgICAgZG9tYWluQ2xh c3NOYW1lPWRvbWFpbl9uYW1lLAorICAgICAgICAgICAgICAgIGRvbWFpbkZpZWxkTmFtZT1kb21h aW5fbmFtZV9sb3dlciwKKyAgICAgICAgICAgICAgICBkb21haW5DYXBhYmlsaXRpZXM9am9pbihk b21haW5fY2FwYWJpbGl0aWVzLCAiXG4iKSwKKyAgICAgICAgICAgICAgICBmcm9udGVuZERvbWFp bk1ldGhvZERlY2xhcmF0aW9ucz1qb2luKGZyb250ZW5kX21ldGhvZF9kZWNsYXJhdGlvbl9saW5l cywgIiIpKSkKKwogICAgICAgICAgICAgaWYgImNvbW1hbmRzIiBpbiBqc29uX2RvbWFpbjoKICAg ICAgICAgICAgICAgICBmb3IganNvbl9jb21tYW5kIGluIGpzb25fZG9tYWluWyJjb21tYW5kcyJd OgogICAgICAgICAgICAgICAgICAgICBHZW5lcmF0b3IucHJvY2Vzc19jb21tYW5kKGpzb25fY29t bWFuZCwgZG9tYWluX25hbWUsIGFnZW50X2ZpZWxkX25hbWUpCkBAIC0xMzkwLDcgKzE0MDUsNiBA QCBjbGFzcyBHZW5lcmF0b3I6CiAKICAgICAgICAgR2VuZXJhdG9yLmJhY2tlbmRfanNfaW5pdGlh bGl6ZXJfbGlzdC5hcHBlbmQoIiAgICB0aGlzLl9yZWdpc3RlckRlbGVnYXRlKCd7XCJtZXRob2Rc IjogXCIlcy4lc1wiJXMsIFwiaWRcIjogMH0nKTtcbiIgJSAoZG9tYWluX25hbWUsIGpzb25fY29t bWFuZF9uYW1lLCBqc19wYXJhbWV0ZXJzX3RleHQpKQogCi0KIEdlbmVyYXRvci5nbygpCiAKIGJh Y2tlbmRfaF9maWxlID0gb3BlbihvdXRwdXRfaGVhZGVyX2Rpcm5hbWUgKyAiL0luc3BlY3RvckJh Y2tlbmREaXNwYXRjaGVyLmgiLCAidyIpCkBAIC0xNDE2LDcgKzE0MzAsOCBAQCBiYWNrZW5kX2hf ZmlsZS53cml0ZShUZW1wbGF0ZXMuYmFja2VuZF9oLnN1YnN0aXR1dGUoTm9uZSwKIAogZnJvbnRl bmRfY3BwX2ZpbGUud3JpdGUoVGVtcGxhdGVzLmZyb250ZW5kX2NwcC5zdWJzdGl0dXRlKE5vbmUs CiAgICAgY29uc3RydWN0b3JJbml0PWpvaW4oR2VuZXJhdG9yLmZyb250ZW5kX2NvbnN0cnVjdG9y X2luaXRfbGlzdCwgIiIpLAotICAgIG1ldGhvZHM9am9pbihHZW5lcmF0b3IuZnJvbnRlbmRfbWV0 aG9kX2xpc3QsICJcbiIpKSkKKyAgICBtZXRob2RzPWpvaW4oR2VuZXJhdG9yLmZyb250ZW5kX21l dGhvZF9saXN0LCAiXG4iKSwKKyAgICBjYXBhYmlsaXRpZXM9am9pbihHZW5lcmF0b3IuZnJvbnRl bmRfY2FwYWJpbGl0aWVzX2NvbnN0YW50c19saXN0LCAiXG4iKSkpCiAKIGJhY2tlbmRfY3BwX2Zp bGUud3JpdGUoVGVtcGxhdGVzLmJhY2tlbmRfY3BwLnN1YnN0aXR1dGUoTm9uZSwKICAgICBtZXRo b2ROYW1lRGVjbGFyYXRpb25zPWpvaW4oR2VuZXJhdG9yLmJhY2tlbmRfbWV0aG9kX25hbWVfZGVj bGFyYXRpb25fbGlzdCwgIlxuIiksCkBAIC0xNDI4LDcgKzE0NDMsOCBAQCBiYWNrZW5kX2pzX2Zp bGUud3JpdGUoVGVtcGxhdGVzLmJhY2tlbmRfanMuc3Vic3RpdHV0ZShOb25lLAogICAgIGRlbGVn YXRlcz1qb2luKEdlbmVyYXRvci5iYWNrZW5kX2pzX2luaXRpYWxpemVyX2xpc3QsICIiKSwKICAg ICByZXBseUFyZ3M9am9pbihHZW5lcmF0b3IuYmFja2VuZF9qc19yZXBseV9saXN0LCAiIiksCiAg ICAgZXZlbnRBcmdzPWpvaW4oR2VuZXJhdG9yLmJhY2tlbmRfanNfZXZlbnRfbGlzdCwgIiIpLAot ICAgIGRvbWFpbkRpc3BhdGNoZXJzPWpvaW4oR2VuZXJhdG9yLmJhY2tlbmRfanNfZG9tYWluX2Rp c3BhdGNoZXJfbGlzdCwgIiIpKSkKKyAgICBkb21haW5EaXNwYXRjaGVycz1qb2luKEdlbmVyYXRv ci5iYWNrZW5kX2pzX2RvbWFpbl9kaXNwYXRjaGVyX2xpc3QsICIiKSwKKyAgICBjYXBhYmlsaXRp ZXM9am9pbihHZW5lcmF0b3IuYmFja2VuZF9qc19jYXBhYmlsaXRpZXNfbGlzdCwgIiIpKSkKIAog YmFja2VuZF9oX2ZpbGUuY2xvc2UoKQogYmFja2VuZF9jcHBfZmlsZS5jbG9zZSgpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggZTBkMWZhNjkwYTM1NzBlNzEzZTM0 YmQ1OTNiZDA4YWZjY2NhYzhlMS4uOTI1NDRlMzBiM2Q2ZDg2ZmMzMmIxYmIzOWM2NDc1NzU2MGRm ZTUwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29u CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtMTc0MSw2 ICsxNzQxLDkgQEAKICAgICB7CiAgICAgICAgICJkb21haW4iOiAiRGVidWdnZXIiLAogICAgICAg ICAiZGVzY3JpcHRpb24iOiAiRGVidWdnZXIgZG9tYWluIGV4cG9zZXMgSmF2YVNjcmlwdCBkZWJ1 Z2dpbmcgY2FwYWJpbGl0aWVzLiBJdCBhbGxvd3Mgc2V0dGluZyBhbmQgcmVtb3ZpbmcgYnJlYWtw b2ludHMsIHN0ZXBwaW5nIHRocm91Z2ggZXhlY3V0aW9uLCBleHBsb3Jpbmcgc3RhY2sgdHJhY2Vz LCBldGMuIiwKKyAgICAgICAgImNhcGFiaWxpdGllcyI6IFsKKyAgICAgICAgICAgIHsgIm5hbWUi OiAic2V0LXNjcmlwdC1zb3VyY2UiLCAiZGVzY3JpcHRpb24iOiAiQWxsb3dzIHNldHRpbmcgc2Ny aXB0IHNvdXJjZSBsaXZlIiB9CisgICAgICAgIF0sCiAgICAgICAgICJ0eXBlcyI6IFsKICAgICAg ICAgICAgIHsKICAgICAgICAgICAgICAgICAiaWQiOiAiQnJlYWtwb2ludElkIiwKQEAgLTE3OTEs OCArMTc5NCwxNiBAQAogICAgICAgICBdLAogICAgICAgICAiY29tbWFuZHMiOiBbCiAgICAgICAg ICAgICB7CisgICAgICAgICAgICAgICAgIm5hbWUiOiAiZ2V0Q2FwYWJpbGl0aWVzIiwKKyAgICAg ICAgICAgICAgICAicmV0dXJucyI6IFsKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJj YXBhYmlsaXRpZXMiLCAidHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgInR5cGUiOiAic3RyaW5n In0sICJkZXNjcmlwdGlvbiI6ICJMaXN0IG9mIHRoZSBkZWJ1Z2dlciBkb21haW4gY2FwYWJpbGl0 aWVzIiB9CisgICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24i OiAiUmV0dXJucyB0aGUgbGlzdCBvZiB0aGUgZGVidWdnZXIgY2FwYWJpbGl0aWVzLiIsCisgICAg ICAgICAgICAgICAgImhpZGRlbiI6IHRydWUKKyAgICAgICAgICAgIH0sCisgICAgICAgICAgICB7 CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAiZW5hYmxlIiwKLSAgICAgICAgICAgICAgICAiZGVz Y3JpcHRpb24iOiAiRW5hYmxlcyBkZWJ1Z2dlciBmb3IgZ2l2ZW4gcGFnZS4iCisgICAgICAgICAg ICAgICAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgZGVidWdnZXIgZm9yIHRoZSBnaXZlbiBwYWdl LiBDbGllbnRzIHNob3VsZCBub3QgYXNzdW1lIHRoYXQgdGhlIGRlYnVnZ2luZyBoYXMgYmVlbiBl bmFibGVkIHVudGlsIHRoZSByZXN1bHQgZm9yIHRoaXMgY29tbWFuZCBpcyByZWNlaXZlZC4iCiAg ICAgICAgICAgICB9LAogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICJuYW1lIjogImRp c2FibGUiLApAQCAtMTg5MCw2ICsxOTAxLDcgQEAKICAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJjYWxsRnJhbWVzIiwgInR5cGUiOiAiYXJyYXkiLCAib3B0aW9uYWwiOiB0cnVlLCAiaXRl bXMiOiB7ICIkcmVmIjogIkNhbGxGcmFtZSJ9LCAiZGVzY3JpcHRpb24iOiAiTmV3IHN0YWNrIHRy YWNlIGluIGNhc2UgZWRpdGluZyBoYXMgaGFwcGVuZWQgd2hpbGUgVk0gd2FzIHN0b3BwZWQuIiB9 LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInJlc3VsdCIsICJ0eXBlIjogIm9iamVj dCIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJWTS1zcGVjaWZpYyBkZXNjcmlw dGlvbiBvZiB0aGUgY2hhbmdlcyBhcHBsaWVkLiIsICJoaWRkZW4iOiB0cnVlIH0KICAgICAgICAg ICAgICAgICBdLAorICAgICAgICAgICAgICAgICJjYXBhYmlsaXR5IjogInNldC1zY3JpcHQtc291 cmNlIiwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRWRpdHMgSmF2YVNjcmlwdCBz b3VyY2UgbGl2ZS4iCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgewpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCmluZGV4IGVl MTBkZGU2N2MwYWE4YjE2OTc4ZDZiYWE4NjU0OWI5NmQwYTk5MjMuLmUxODIwNWNjOGE4ZjVhMzRj NDE4Y2QxNTAzZDIwNThlMzdiYTZiZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKQEAgLTEwMCw2ICsxMDAsMTIgQEAgYm9v bCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjplbmFibGVkKCkKICAgICByZXR1cm4gbV9pbnNwZWN0 b3JTdGF0ZS0+Z2V0Qm9vbGVhbihEZWJ1Z2dlckFnZW50U3RhdGU6OmRlYnVnZ2VyRW5hYmxlZCk7 CiB9CiAKK3ZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6Z2V0Q2FwYWJpbGl0aWVzKEVycm9y U3RyaW5nKiwgUmVmUHRyPEluc3BlY3RvckFycmF5PiogY2FwYWJpbGl0aWVzKQoreworICAgIGlm IChzY3JpcHREZWJ1Z1NlcnZlcigpLmNhblNldFNjcmlwdFNvdXJjZSgpKQorICAgICAgICAoKmNh cGFiaWxpdGllcyktPnB1c2hTdHJpbmcoSW5zcGVjdG9yRnJvbnRlbmQ6OkRlYnVnZ2VyOjpjYXBh YmlsaXR5U2V0U2NyaXB0U291cmNlKTsKK30KKwogdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50 OjplbmFibGUoRXJyb3JTdHJpbmcqKQogewogICAgIGlmIChlbmFibGVkKCkpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaAppbmRleCA2NTJi YjVjNWEzYzIzZDAwNDQ3NzI5YzE2OGUwNjliYzU1MGZhMmI3Li4yMTE4YTFlNWZiYmZkODliZmZk MjVmMjI4NTBjYjdlMGEyOWQ3NzJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKQEAgLTY0LDYgKzY0LDcgQEAgcHVibGljOgogCiAg ICAgdmlydHVhbCB+SW5zcGVjdG9yRGVidWdnZXJBZ2VudCgpOwogCisgICAgdm9pZCBnZXRDYXBh YmlsaXRpZXMoRXJyb3JTdHJpbmcqLCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+Kik7CiAgICAgdm9p ZCBlbmFibGUoRXJyb3JTdHJpbmcqKTsKICAgICB2b2lkIGRpc2FibGUoRXJyb3JTdHJpbmcqKTsK ICAgICBib29sIGVuYWJsZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcwppbmRleCAwZmJhZmQ4ZDhhZTRjNGRlYzk1YzQ2YTA0 Y2Y2YjUxYWJlMzQ0ZGYyLi5jYjM1ZDliNjQzMjU4OTdiZjgzODdhYWM2OTgwZjY0N2NlOGE4NTI2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2Vy TW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dl ck1vZGVsLmpzCkBAIC00MCw2ICs0MCw4IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsID0g ZnVuY3Rpb24oKQogICAgICAqLwogICAgIHRoaXMuX3NjcmlwdHMgPSB7fTsKIAorICAgIHRoaXMu X2NhcGFiaWxpdGllc09iamVjdCA9IHt9OworCiAgICAgSW5zcGVjdG9yQmFja2VuZC5yZWdpc3Rl ckRlYnVnZ2VyRGlzcGF0Y2hlcihuZXcgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyRGlzcGF0Y2hlcih0 aGlzKSk7CiB9CiAKQEAgLTg1LDYgKzg3LDE2IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVs LkJyZWFrUmVhc29uID0gewogV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwucHJvdG90eXBlID0g ewogICAgIGVuYWJsZURlYnVnZ2VyOiBmdW5jdGlvbigpCiAgICAgeworICAgICAgICAvKioKKyAg ICAgICAgICogQHBhcmFtIHtQcm90b2NvbC5FcnJvcn0gZXJyb3IKKyAgICAgICAgICogQHBhcmFt IHtBcnJheS48c3RyaW5nPn0gY2FwYWJpbGl0aWVzCisgICAgICAgICAqLworICAgICAgICBmdW5j dGlvbiBjYWxsYmFjayhlcnJvciwgY2FwYWJpbGl0aWVzKQorICAgICAgICB7CisgICAgICAgICAg ICBmb3IgKHZhciBpID0gMDsgaSA8IGNhcGFiaWxpdGllcy5sZW5ndGg7ICsraSkKKyAgICAgICAg ICAgICAgICB0aGlzLl9jYXBhYmlsaXRpZXNPYmplY3RbY2FwYWJpbGl0aWVzW2ldXSA9IHRydWU7 CisgICAgICAgIH0KKyAgICAgICAgRGVidWdnZXJBZ2VudC5nZXRDYXBhYmlsaXRpZXMoY2FsbGJh Y2suYmluZCh0aGlzKSk7CiAgICAgICAgIERlYnVnZ2VyQWdlbnQuZW5hYmxlKCk7CiAgICAgfSwK IApAQCAtOTMsNiArMTA1LDE0IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlw ZSA9IHsKICAgICAgICAgRGVidWdnZXJBZ2VudC5kaXNhYmxlKCk7CiAgICAgfSwKIAorICAgIC8q KgorICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CisgICAgICovCisgICAgY2FuU2V0U2NyaXB0U291 cmNlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gISF0aGlzLl9jYXBhYmlsaXRp ZXNPYmplY3RbRGVidWdnZXJBZ2VudC5jYXBhYmlsaXR5U2V0U2NyaXB0U291cmNlXTsKKyAgICB9 LAorCiAgICAgX2RlYnVnZ2VyV2FzRW5hYmxlZDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAg dGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyTW9kZWwu RXZlbnRzLkRlYnVnZ2VyV2FzRW5hYmxlZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMK aW5kZXggNmFlYWFhYjIyZDEzMmRkMmI1NTA3ZmNhYzZlNTM2YjQ1ZDcwYzBmYi4uYjUzNDM1ZTUw NmZiZDQ0Y2UyYWJiYmMwMzAzYWYxZjE3OTRiYzMyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25N b2RlbC5qcwpAQCAtMjQ2LDcgKzI0Niw3IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRh dGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBjYW5FZGl0U2NyaXB0U291cmNl OiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCiAgICAgewotICAgICAgICBpZiAoIVByZWZlcmVuY2Vz LmNhbkVkaXRTY3JpcHRTb3VyY2UgfHwgdGhpcy5fZm9ybWF0U291cmNlKQorICAgICAgICBpZiAo IVdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmNhblNldFNjcmlwdFNvdXJjZSgpIHx8IHRoaXMu X2Zvcm1hdFNvdXJjZSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgdmFyIHJh d1NvdXJjZUNvZGUgPSB1aVNvdXJjZUNvZGUucmF3U291cmNlQ29kZTsKICAgICAgICAgdmFyIHNj cmlwdCA9IHRoaXMuX3NjcmlwdEZvclJhd1NvdXJjZUNvZGUocmF3U291cmNlQ29kZSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwppbmRleCBjMmYx MTg5Y2E2OGQ4ZDRkMTQ1ZmYzY2NjOGM1Nzk1OTM4NzdkNTYwLi5lMDNmZTFjNTY3YTAyODFhNGQ3 Mzk1Y2ZhZDY2YTZkNDlkYzk5M2RiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU2V0dGluZ3MuanMKQEAgLTMwLDcgKzMwLDYgQEAKIAogCiB2YXIgUHJlZmVyZW5j ZXMgPSB7Ci0gICAgY2FuRWRpdFNjcmlwdFNvdXJjZTogZmFsc2UsCiAgICAgbWF4SW5saW5lVGV4 dENoaWxkTGVuZ3RoOiA4MCwKICAgICBtaW5Db25zb2xlSGVpZ2h0OiA3NSwKICAgICBtaW5TaWRl YmFyV2lkdGg6IDEwMCwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL2pz L0RldlRvb2xzLmpzIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvanMvRGV2VG9vbHMuanMK aW5kZXggOTFkMjFlMTk0NjY3MzhmMjBmMjRkYTQ1MjliYjZkOTBiOGI4ZjBhMi4uMjg4N2NhOGMy NDI4ZjVjNWQ5NzZjOTk2MTljNjk4OGFlZmEzNjA3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvanMvRGV2VG9vbHMuanMKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvanMvRGV2VG9vbHMuanMKQEAgLTQwLDcgKzQwLDYgQEAKICAgICBQcmVmZXJlbmNlcy5k ZXRhaWxlZEhlYXBQcm9maWxlcyA9IHRydWU7CiAgICAgUHJlZmVyZW5jZXMuZGVidWdnZXJBbHdh eXNFbmFibGVkID0gdHJ1ZTsKICAgICBQcmVmZXJlbmNlcy5wcm9maWxlckFsd2F5c0VuYWJsZWQg PSB0cnVlOwotICAgIFByZWZlcmVuY2VzLmNhbkVkaXRTY3JpcHRTb3VyY2UgPSB0cnVlOwogICAg IFByZWZlcmVuY2VzLm9ubGluZURldGVjdGlvbkVuYWJsZWQgPSBmYWxzZTsKICAgICBQcmVmZXJl bmNlcy5uYXRpdmVJbnN0cnVtZW50YXRpb25FbmFibGVkID0gdHJ1ZTsKICAgICBQcmVmZXJlbmNl cy5maWxlU3lzdGVtRW5hYmxlZCA9IGZhbHNlOwo=