143019 2015-03-24 14:13:06 -0700 Web Inspector: Adopt ES6 Class Syntax for CSSStyleDeclarationTextEditor 2015-03-24 15:54:54 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 tobi+webkit webkit-unassigned commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1079708 0 tobi+webkit 2015-03-24 14:13:06 -0700 * SUMMARY Adopt ES6 Class Syntax for CSSStyleDeclarationTextEditor. * NOTES The const keyword isn't allowed in strict mode, and ES6 class method scope uses strict mode implicitly. Instances of const will need to be replaced with var. 1079712 1 webkit-bug-importer 2015-03-24 14:13:45 -0700 <rdar://problem/20281383> 1079726 2 249354 tobi+webkit 2015-03-24 14:39:08 -0700 Created attachment 249354 patch 1079751 3 249354 commit-queue 2015-03-24 15:54:49 -0700 Comment on attachment 249354 patch Clearing flags on attachment: 249354 Committed r181912: <http://trac.webkit.org/changeset/181912> 1079752 4 commit-queue 2015-03-24 15:54:54 -0700 All reviewed patches have been landed. Closing bug. 249354 2015-03-24 14:39:08 -0700 2015-03-24 15:54:49 -0700 patch bug-143019-20150324223831.patch text/plain 20841 tobi+webkit U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxOTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA4 ZWM4NWQ2OTIyMDJjYjAzOWYyM2JmNzA2NjkwZDAxN2I5ZGNkMjdjLi44MjM1ODEzMmExODY0NjM4 MDQ4NzEzZmVmNmNiYTdmYjAxZWYzNmNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAxNS0wMy0yNCAgVG9iaWFzIFJlaXNzICA8dG9iaSt3ZWJraXRAYmFzZWNv ZGUuZGU+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWRvcHQgRVM2IENsYXNzIFN5bnRheCBm b3IgQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzAxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gQ29udmVydCBDU1NTdHlsZURlY2xhcmF0aW9uVGV4 dEVkaXRvciB0byB1c2UgY2xhc3Mgc3ludGF4CisgICAgICAgIC0gQ29udmVydCBjb25zdHJ1Y3Rv ciBmdW5jdGlvbnMgdG8gY29uc3RydWN0b3IgbWV0aG9kcworICAgICAgICAtIENvbnZlcnQgImNv bnN0cnVjdG9yLm1ldGhvZCIgdG8gY2xhc3Mgc3RhdGljIG1ldGhvZHMgd2hlcmUgcG9zc2libGUK KyAgICAgICAgLSBDb252ZXJ0IGFsbCBtZXRob2RzIHRvIG1ldGhvZCBzeW50YXgsIGVsaW1pbmF0 ZSBjb21tYXMgYmV0d2VlbiBtZXRob2RzCisgICAgICAgIC0gQ29udmVydCBhbGwgc3VwZXJjbGFz cyBjYWxscyBpbiBjbGFzc2VzIHRvIHVzZSAic3VwZXIiCisgICAgICAgIC0gUmVtb3ZlZCBGSVhN RSBmcm9tIFdlYkluc3BlY3Rvci5PYmplY3Qgc3ViY2xhc3NlcywgYWRkZWQgY2FsbHMgdG8gc3Vw ZXIuCisgICAgICAgIC0gRml4ZWQgc3RyaWN0IG1vZGUgaXNzdWVzIG5vdyB0aGF0IGNsYXNzZXMg ZW5mb3JjZSBzdHJpY3QgbW9kZSAoc2VlIGJlbG93KS4KKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IuanM6CisgICAgICAgIE1hbnkg ZnVuY3Rpb24gZGVjbGFyYXRpb25zIG1vZGlmaWVkLgorCiAyMDE1LTAzLTI0ICBKb3NlcGggUGVj b3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogV29y a2Fyb3VuZCBpc3N1ZSBjYXVzaW5nIHVuY2F1Z2h0IGV4Y2VwdGlvbiBpbiBJbnNwZWN0b3IKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0 eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IuanMKaW5kZXggMjAx NGExNjJkOTc0YTk1MDNiNGRiMGYxMjRkZjQ1ZDM0MWFlMDA1NS4uYTRiMjNkZmU5YmIxMDJjMzA2 ZGNhMWE5MTlmY2JhNWRlZTNkMzJjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNs YXJhdGlvblRleHRFZGl0b3IuanMKQEAgLTIzLDg5ICsyMyw3NiBAQAogICogVEhFIFBPU1NJQklM SVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLVdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0 aW9uVGV4dEVkaXRvciA9IGZ1bmN0aW9uKGRlbGVnYXRlLCBzdHlsZSwgZWxlbWVudCkKK1dlYklu c3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvciA9IGNsYXNzIENTU1N0eWxlRGVj bGFyYXRpb25UZXh0RWRpdG9yIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogewotICAgIC8v IEZJWE1FOiBDb252ZXJ0IHRoaXMgdG8gYSBXZWJJbnNwZWN0b3IuT2JqZWN0IHN1YmNsYXNzLCBh bmQgY2FsbCBzdXBlcigpLgotICAgIC8vIFdlYkluc3BlY3Rvci5PYmplY3QuY2FsbCh0aGlzKTsK LQotICAgIHRoaXMuX2VsZW1lbnQgPSBlbGVtZW50IHx8IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImRpdiIpOwotICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuQ1NT U3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IuU3R5bGVDbGFzc05hbWUpOwotICAgIHRoaXMuX2Vs ZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuU3ludGF4SGlnaGxpZ2h0ZWRTdHlsZUNs YXNzTmFtZSk7Ci0KLSAgICB0aGlzLl9zaG93c0ltcGxpY2l0UHJvcGVydGllcyA9IHRydWU7Ci0g ICAgdGhpcy5fYWx3YXlzU2hvd1Byb3BlcnR5TmFtZXMgPSB7fTsKLSAgICB0aGlzLl9zb3J0UHJv cGVydGllcyA9IGZhbHNlOwotCi0gICAgdGhpcy5fcHJlZml4V2hpdGVzcGFjZSA9ICIiOwotICAg IHRoaXMuX3N1ZmZpeFdoaXRlc3BhY2UgPSAiIjsKLSAgICB0aGlzLl9saW5lUHJlZml4V2hpdGVz cGFjZSA9ICIiOwotCi0gICAgdGhpcy5fZGVsZWdhdGUgPSBkZWxlZ2F0ZSB8fCBudWxsOwotCi0g ICAgdGhpcy5fY29kZU1pcnJvciA9IENvZGVNaXJyb3IodGhpcy5lbGVtZW50LCB7Ci0gICAgICAg IHJlYWRPbmx5OiB0cnVlLAotICAgICAgICBsaW5lV3JhcHBpbmc6IHRydWUsCi0gICAgICAgIG1v ZGU6ICJjc3MtcnVsZSIsCi0gICAgICAgIGVsZWN0cmljQ2hhcnM6IGZhbHNlLAotICAgICAgICBp bmRlbnRXaXRoVGFiczogdHJ1ZSwKLSAgICAgICAgaW5kZW50VW5pdDogNCwKLSAgICAgICAgc21h cnRJbmRlbnQ6IGZhbHNlLAotICAgICAgICBtYXRjaEJyYWNrZXRzOiB0cnVlLAotICAgICAgICBh dXRvQ2xvc2VCcmFja2V0czogdHJ1ZQotICAgIH0pOwotCi0gICAgdGhpcy5fY29tcGxldGlvbkNv bnRyb2xsZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkNvZGVNaXJyb3JDb21wbGV0aW9uQ29udHJvbGxl cih0aGlzLl9jb2RlTWlycm9yLCB0aGlzKTsKLSAgICB0aGlzLl90b2tlblRyYWNraW5nQ29udHJv bGxlciA9IG5ldyBXZWJJbnNwZWN0b3IuQ29kZU1pcnJvclRva2VuVHJhY2tpbmdDb250cm9sbGVy KHRoaXMuX2NvZGVNaXJyb3IsIHRoaXMpOwotCi0gICAgdGhpcy5fanVtcFRvU3ltYm9sVHJhY2tp bmdNb2RlRW5hYmxlZCA9IGZhbHNlOwotICAgIHRoaXMuX3Rva2VuVHJhY2tpbmdDb250cm9sbGVy LmNsYXNzTmFtZUZvckhpZ2hsaWdodGVkUmFuZ2UgPSBXZWJJbnNwZWN0b3IuQ29kZU1pcnJvclRv a2VuVHJhY2tpbmdDb250cm9sbGVyLkp1bXBUb1N5bWJvbEhpZ2hsaWdodFN0eWxlQ2xhc3NOYW1l OwotICAgIHRoaXMuX3Rva2VuVHJhY2tpbmdDb250cm9sbGVyLm1vdXNlT3ZlckRlbGF5RHVyYXRp b24gPSAwOwotICAgIHRoaXMuX3Rva2VuVHJhY2tpbmdDb250cm9sbGVyLm1vdXNlT3V0UmVsZWFz ZURlbGF5RHVyYXRpb24gPSAwOwotICAgIHRoaXMuX3Rva2VuVHJhY2tpbmdDb250cm9sbGVyLm1v ZGUgPSBXZWJJbnNwZWN0b3IuQ29kZU1pcnJvclRva2VuVHJhY2tpbmdDb250cm9sbGVyLk1vZGUu Tm9uU3ltYm9sVG9rZW5zOwotCi0gICAgLy8gTWFrZSBzdXJlIENvbXBsZXRpb25Db250cm9sbGVy IGFkZHMgZXZlbnQgbGlzdGVuZXJzIGZpcnN0LgotICAgIC8vIE90aGVyd2lzZSB3ZSBlbmQgdXAg aW4gcmFjZSBjb25kaXRpb25zIGR1cmluZyBjb21wbGV0ZSBvciBkZWxldGUtY29tcGxldGUgcGhh c2VzLgotICAgIHRoaXMuX2NvZGVNaXJyb3Iub24oImNoYW5nZSIsIHRoaXMuX2NvbnRlbnRDaGFu Z2VkLmJpbmQodGhpcykpOwotICAgIHRoaXMuX2NvZGVNaXJyb3Iub24oImJsdXIiLCB0aGlzLl9l ZGl0b3JCbHVyZWQuYmluZCh0aGlzKSk7Ci0KLSAgICB0aGlzLnN0eWxlID0gc3R5bGU7Ci19Owor ICAgIGNvbnN0cnVjdG9yKGRlbGVnYXRlLCBzdHlsZSwgZWxlbWVudCkKKyAgICB7CisgICAgICAg IHN1cGVyKCk7CiAKLS8vIEZJWE1FOiBNb3ZlIHRvIGEgV2ViSW5zcGVjdG9yLk9iamVjdCBzdWJj bGFzcyBhbmQgd2UgY2FuIHJlbW92ZSB0aGlzLgotV2ViSW5zcGVjdG9yLk9iamVjdC5kZXByZWNh dGVkQWRkQ29uc3RydWN0b3JGdW5jdGlvbnMoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRp b25UZXh0RWRpdG9yKTsKKyAgICAgICAgdGhpcy5fZWxlbWVudCA9IGVsZW1lbnQgfHwgZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0 LmFkZChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IuU3R5bGVDbGFz c05hbWUpOworICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9y LlN5bnRheEhpZ2hsaWdodGVkU3R5bGVDbGFzc05hbWUpOwogCi1XZWJJbnNwZWN0b3IuQ1NTU3R5 bGVEZWNsYXJhdGlvblRleHRFZGl0b3IuU3R5bGVDbGFzc05hbWUgPSAiY3NzLXN0eWxlLXRleHQt ZWRpdG9yIjsKLVdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5SZWFk T25seVN0eWxlQ2xhc3NOYW1lID0gInJlYWQtb25seSI7Ci1XZWJJbnNwZWN0b3IuQ1NTU3R5bGVE ZWNsYXJhdGlvblRleHRFZGl0b3IuQ29sb3JTd2F0Y2hFbGVtZW50U3R5bGVDbGFzc05hbWUgPSAi Y29sb3Itc3dhdGNoIjsKLVdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRv ci5DaGVja2JveFBsYWNlaG9sZGVyRWxlbWVudFN0eWxlQ2xhc3NOYW1lID0gImNoZWNrYm94LXBs YWNlaG9sZGVyIjsKLVdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5F ZGl0aW5nTGluZVN0eWxlQ2xhc3NOYW1lID0gImVkaXRpbmctbGluZSI7Ci1XZWJJbnNwZWN0b3Iu Q1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IuQ29tbWl0Q29hbGVzY2VEZWxheSA9IDI1MDsK LVdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5SZW1vdmVFZGl0aW5n TGluZUNsYXNzZXNEZWxheSA9IDIwMDA7CisgICAgICAgIHRoaXMuX3Nob3dzSW1wbGljaXRQcm9w ZXJ0aWVzID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5fYWx3YXlzU2hvd1Byb3BlcnR5TmFtZXMgPSB7 fTsKKyAgICAgICAgdGhpcy5fc29ydFByb3BlcnRpZXMgPSBmYWxzZTsKIAotV2ViSW5zcGVjdG9y LkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsKLSAgICBjb25zdHJ1 Y3RvcjogV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLAorICAgICAg ICB0aGlzLl9wcmVmaXhXaGl0ZXNwYWNlID0gIiI7CisgICAgICAgIHRoaXMuX3N1ZmZpeFdoaXRl c3BhY2UgPSAiIjsKKyAgICAgICAgdGhpcy5fbGluZVByZWZpeFdoaXRlc3BhY2UgPSAiIjsKKwor ICAgICAgICB0aGlzLl9kZWxlZ2F0ZSA9IGRlbGVnYXRlIHx8IG51bGw7CisKKyAgICAgICAgdGhp cy5fY29kZU1pcnJvciA9IENvZGVNaXJyb3IodGhpcy5lbGVtZW50LCB7CisgICAgICAgICAgICBy ZWFkT25seTogdHJ1ZSwKKyAgICAgICAgICAgIGxpbmVXcmFwcGluZzogdHJ1ZSwKKyAgICAgICAg ICAgIG1vZGU6ICJjc3MtcnVsZSIsCisgICAgICAgICAgICBlbGVjdHJpY0NoYXJzOiBmYWxzZSwK KyAgICAgICAgICAgIGluZGVudFdpdGhUYWJzOiB0cnVlLAorICAgICAgICAgICAgaW5kZW50VW5p dDogNCwKKyAgICAgICAgICAgIHNtYXJ0SW5kZW50OiBmYWxzZSwKKyAgICAgICAgICAgIG1hdGNo QnJhY2tldHM6IHRydWUsCisgICAgICAgICAgICBhdXRvQ2xvc2VCcmFja2V0czogdHJ1ZQorICAg ICAgICB9KTsKKworICAgICAgICB0aGlzLl9jb21wbGV0aW9uQ29udHJvbGxlciA9IG5ldyBXZWJJ bnNwZWN0b3IuQ29kZU1pcnJvckNvbXBsZXRpb25Db250cm9sbGVyKHRoaXMuX2NvZGVNaXJyb3Is IHRoaXMpOworICAgICAgICB0aGlzLl90b2tlblRyYWNraW5nQ29udHJvbGxlciA9IG5ldyBXZWJJ bnNwZWN0b3IuQ29kZU1pcnJvclRva2VuVHJhY2tpbmdDb250cm9sbGVyKHRoaXMuX2NvZGVNaXJy b3IsIHRoaXMpOworCisgICAgICAgIHRoaXMuX2p1bXBUb1N5bWJvbFRyYWNraW5nTW9kZUVuYWJs ZWQgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5fdG9rZW5UcmFja2luZ0NvbnRyb2xsZXIuY2xhc3NO YW1lRm9ySGlnaGxpZ2h0ZWRSYW5nZSA9IFdlYkluc3BlY3Rvci5Db2RlTWlycm9yVG9rZW5UcmFj a2luZ0NvbnRyb2xsZXIuSnVtcFRvU3ltYm9sSGlnaGxpZ2h0U3R5bGVDbGFzc05hbWU7CisgICAg ICAgIHRoaXMuX3Rva2VuVHJhY2tpbmdDb250cm9sbGVyLm1vdXNlT3ZlckRlbGF5RHVyYXRpb24g PSAwOworICAgICAgICB0aGlzLl90b2tlblRyYWNraW5nQ29udHJvbGxlci5tb3VzZU91dFJlbGVh c2VEZWxheUR1cmF0aW9uID0gMDsKKyAgICAgICAgdGhpcy5fdG9rZW5UcmFja2luZ0NvbnRyb2xs ZXIubW9kZSA9IFdlYkluc3BlY3Rvci5Db2RlTWlycm9yVG9rZW5UcmFja2luZ0NvbnRyb2xsZXIu TW9kZS5Ob25TeW1ib2xUb2tlbnM7CisKKyAgICAgICAgLy8gTWFrZSBzdXJlIENvbXBsZXRpb25D b250cm9sbGVyIGFkZHMgZXZlbnQgbGlzdGVuZXJzIGZpcnN0LgorICAgICAgICAvLyBPdGhlcndp c2Ugd2UgZW5kIHVwIGluIHJhY2UgY29uZGl0aW9ucyBkdXJpbmcgY29tcGxldGUgb3IgZGVsZXRl LWNvbXBsZXRlIHBoYXNlcy4KKyAgICAgICAgdGhpcy5fY29kZU1pcnJvci5vbigiY2hhbmdlIiwg dGhpcy5fY29udGVudENoYW5nZWQuYmluZCh0aGlzKSk7CisgICAgICAgIHRoaXMuX2NvZGVNaXJy b3Iub24oImJsdXIiLCB0aGlzLl9lZGl0b3JCbHVyZWQuYmluZCh0aGlzKSk7CisKKyAgICAgICAg dGhpcy5zdHlsZSA9IHN0eWxlOworICAgIH0KIAogICAgIC8vIFB1YmxpYwogCiAgICAgZ2V0IGVs ZW1lbnQoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2VsZW1lbnQ7Ci0gICAgfSwKKyAg ICB9CiAKICAgICBnZXQgZGVsZWdhdGUoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2Rl bGVnYXRlOwotICAgIH0sCisgICAgfQogCiAgICAgc2V0IGRlbGVnYXRlKGRlbGVnYXRlKQogICAg IHsKICAgICAgICAgdGhpcy5fZGVsZWdhdGUgPSBkZWxlZ2F0ZSB8fCBudWxsOwotICAgIH0sCisg ICAgfQogCiAgICAgZ2V0IHN0eWxlKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9zdHls ZTsKLSAgICB9LAorICAgIH0KIAogICAgIHNldCBzdHlsZShzdHlsZSkKICAgICB7CkBAIC0xMjks MjkgKzExNiwyOSBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3Iu cHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl91cGRhdGVKdW1wVG9TeW1ib2xUcmFja2luZ01v ZGUoKTsKIAogICAgICAgICB0aGlzLl9yZXNldENvbnRlbnQoKTsKLSAgICB9LAorICAgIH0KIAog ICAgIGdldCBmb2N1c2VkKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9jb2RlTWlycm9y LmdldFdyYXBwZXJFbGVtZW50KCkuY2xhc3NMaXN0LmNvbnRhaW5zKCJDb2RlTWlycm9yLWZvY3Vz ZWQiKTsKLSAgICB9LAorICAgIH0KIAogICAgIGdldCBhbHdheXNTaG93UHJvcGVydHlOYW1lcygp CiAgICAgewogICAgICAgICByZXR1cm4gT2JqZWN0LmtleXModGhpcy5fYWx3YXlzU2hvd1Byb3Bl cnR5TmFtZXMpOwotICAgIH0sCisgICAgfQogCiAgICAgc2V0IGFsd2F5c1Nob3dQcm9wZXJ0eU5h bWVzKGFsd2F5c1Nob3dQcm9wZXJ0eU5hbWVzKQogICAgIHsKICAgICAgICAgdGhpcy5fYWx3YXlz U2hvd1Byb3BlcnR5TmFtZXMgPSAoYWx3YXlzU2hvd1Byb3BlcnR5TmFtZXMgfHwgW10pLmtleVNl dCgpOwogCiAgICAgICAgIHRoaXMuX3Jlc2V0Q29udGVudCgpOwotICAgIH0sCisgICAgfQogCiAg ICAgZ2V0IHNob3dzSW1wbGljaXRQcm9wZXJ0aWVzKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0 aGlzLl9zaG93c0ltcGxpY2l0UHJvcGVydGllczsKLSAgICB9LAorICAgIH0KIAogICAgIHNldCBz aG93c0ltcGxpY2l0UHJvcGVydGllcyhzaG93c0ltcGxpY2l0UHJvcGVydGllcykKICAgICB7CkBA IC0xNjEsMTIgKzE0OCwxMiBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRF ZGl0b3IucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9zaG93c0ltcGxpY2l0UHJvcGVydGll cyA9IHNob3dzSW1wbGljaXRQcm9wZXJ0aWVzOwogCiAgICAgICAgIHRoaXMuX3Jlc2V0Q29udGVu dCgpOwotICAgIH0sCisgICAgfQogCiAgICAgZ2V0IHNvcnRQcm9wZXJ0aWVzKCkKICAgICB7CiAg ICAgICAgIHJldHVybiB0aGlzLl9zb3J0UHJvcGVydGllczsKLSAgICB9LAorICAgIH0KIAogICAg IHNldCBzb3J0UHJvcGVydGllcyhzb3J0UHJvcGVydGllcykKICAgICB7CkBAIC0xNzYsMzIgKzE2 MywzMiBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IucHJvdG90 eXBlID0gewogICAgICAgICB0aGlzLl9zb3J0UHJvcGVydGllcyA9IHNvcnRQcm9wZXJ0aWVzOwog CiAgICAgICAgIHRoaXMuX3Jlc2V0Q29udGVudCgpOwotICAgIH0sCisgICAgfQogCi0gICAgZm9j dXM6IGZ1bmN0aW9uKCkKKyAgICBmb2N1cygpCiAgICAgewogICAgICAgICB0aGlzLl9jb2RlTWly cm9yLmZvY3VzKCk7Ci0gICAgfSwKKyAgICB9CiAKLSAgICByZWZyZXNoOiBmdW5jdGlvbigpCisg ICAgcmVmcmVzaCgpCiAgICAgewogICAgICAgICB0aGlzLl9yZXNldENvbnRlbnQoKTsKLSAgICB9 LAorICAgIH0KIAotICAgIHVwZGF0ZUxheW91dDogZnVuY3Rpb24oZm9yY2UpCisgICAgdXBkYXRl TGF5b3V0KGZvcmNlKQogICAgIHsKICAgICAgICAgdGhpcy5fY29kZU1pcnJvci5yZWZyZXNoKCk7 Ci0gICAgfSwKKyAgICB9CiAKICAgICAvLyBQcm90ZWN0ZWQKIAotICAgIGRpZERpc21pc3NQb3Bv dmVyOiBmdW5jdGlvbihwb3BvdmVyKQorICAgIGRpZERpc21pc3NQb3BvdmVyKHBvcG92ZXIpCiAg ICAgewogICAgICAgICBpZiAocG9wb3ZlciA9PT0gdGhpcy5fY29sb3JQaWNrZXJQb3BvdmVyKQog ICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2NvbG9yUGlja2VyUG9wb3ZlcjsKLSAgICB9LAorICAg IH0KIAotICAgIGNvbXBsZXRpb25Db250cm9sbGVyQ29tcGxldGlvbnNIaWRkZW46IGZ1bmN0aW9u KGNvbXBsZXRpb25Db250cm9sbGVyKQorICAgIGNvbXBsZXRpb25Db250cm9sbGVyQ29tcGxldGlv bnNIaWRkZW4oY29tcGxldGlvbkNvbnRyb2xsZXIpCiAgICAgewogICAgICAgICB2YXIgc3R5bGVU ZXh0ID0gdGhpcy5fc3R5bGUudGV4dDsKICAgICAgICAgdmFyIGN1cnJlbnRUZXh0ID0gdGhpcy5f Zm9ybWF0dGVkQ29udGVudCgpOwpAQCAtMjEzLDIwICsyMDAsMjAgQEAgV2ViSW5zcGVjdG9yLkNT U1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRo aXMuX2NvbW1pdENoYW5nZXMoKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgdGhpcy5fcHJv cGVydGllc0NoYW5nZWQoKTsKLSAgICB9LAorICAgIH0KIAogICAgIC8vIFByaXZhdGUKIAotICAg IF9jbGVhclJlbW92ZUVkaXRpbmdMaW5lQ2xhc3Nlc1RpbWVvdXQ6IGZ1bmN0aW9uKCkKKyAgICBf Y2xlYXJSZW1vdmVFZGl0aW5nTGluZUNsYXNzZXNUaW1lb3V0KCkKICAgICB7CiAgICAgICAgIGlm ICghdGhpcy5fcmVtb3ZlRWRpdGluZ0xpbmVDbGFzc2VzVGltZW91dCkKICAgICAgICAgICAgIHJl dHVybjsKIAogICAgICAgICBjbGVhclRpbWVvdXQodGhpcy5fcmVtb3ZlRWRpdGluZ0xpbmVDbGFz c2VzVGltZW91dCk7CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9yZW1vdmVFZGl0aW5nTGluZUNsYXNz ZXNUaW1lb3V0OwotICAgIH0sCisgICAgfQogCi0gICAgX3JlbW92ZUVkaXRpbmdMaW5lQ2xhc3Nl czogZnVuY3Rpb24oKQorICAgIF9yZW1vdmVFZGl0aW5nTGluZUNsYXNzZXMoKQogICAgIHsKICAg ICAgICAgdGhpcy5fY2xlYXJSZW1vdmVFZGl0aW5nTGluZUNsYXNzZXNUaW1lb3V0KCk7CiAKQEAg LTIzOCwxNiArMjI1LDE2IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVk aXRvci5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLl9jb2RlTWlycm9y Lm9wZXJhdGlvbihyZW1vdmVFZGl0aW5nTGluZUNsYXNzZXMuYmluZCh0aGlzKSk7Ci0gICAgfSwK KyAgICB9CiAKLSAgICBfcmVtb3ZlRWRpdGluZ0xpbmVDbGFzc2VzU29vbjogZnVuY3Rpb24oKQor ICAgIF9yZW1vdmVFZGl0aW5nTGluZUNsYXNzZXNTb29uKCkKICAgICB7CiAgICAgICAgIGlmICh0 aGlzLl9yZW1vdmVFZGl0aW5nTGluZUNsYXNzZXNUaW1lb3V0KQogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB0aGlzLl9yZW1vdmVFZGl0aW5nTGluZUNsYXNzZXNUaW1lb3V0ID0gc2V0VGlt ZW91dCh0aGlzLl9yZW1vdmVFZGl0aW5nTGluZUNsYXNzZXMuYmluZCh0aGlzKSwgV2ViSW5zcGVj dG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLlJlbW92ZUVkaXRpbmdMaW5lQ2xhc3Nl c0RlbGF5KTsKLSAgICB9LAorICAgIH0KIAotICAgIF9mb3JtYXR0ZWRDb250ZW50OiBmdW5jdGlv bigpCisgICAgX2Zvcm1hdHRlZENvbnRlbnQoKQogICAgIHsKICAgICAgICAgLy8gU3RhcnQgd2l0 aCB0aGUgcHJlZml4IHdoaXRlc3BhY2Ugd2Ugc3RyaXBwZWQuCiAgICAgICAgIHZhciBjb250ZW50 ID0gdGhpcy5fcHJlZml4V2hpdGVzcGFjZTsKQEAgLTI2NSw5ICsyNTIsOSBAQCBXZWJJbnNwZWN0 b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IucHJvdG90eXBlID0gewogICAgICAgICBj b250ZW50ICs9IHRoaXMuX3N1ZmZpeFdoaXRlc3BhY2U7CiAKICAgICAgICAgcmV0dXJuIGNvbnRl bnQ7Ci0gICAgfSwKKyAgICB9CiAKLSAgICBfY29tbWl0Q2hhbmdlczogZnVuY3Rpb24oKQorICAg IF9jb21taXRDaGFuZ2VzKCkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9jb21taXRDaGFuZ2Vz VGltZW91dCkgewogICAgICAgICAgICAgY2xlYXJUaW1lb3V0KHRoaXMuX2NvbW1pdENoYW5nZXNU aW1lb3V0KTsKQEAgLTI3NSw5ICsyNjIsOSBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJh dGlvblRleHRFZGl0b3IucHJvdG90eXBlID0gewogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5f c3R5bGUudGV4dCA9IHRoaXMuX2Zvcm1hdHRlZENvbnRlbnQoKTsKLSAgICB9LAorICAgIH0KIAot ICAgIF9lZGl0b3JCbHVyZWQ6IGZ1bmN0aW9uKGNvZGVNaXJyb3IpCisgICAgX2VkaXRvckJsdXJl ZChjb2RlTWlycm9yKQogICAgIHsKICAgICAgICAgLy8gQ2xpY2tpbmcgYSBzdWdnZXN0aW9uIGNh dXNlcyB0aGUgZWRpdG9yIHRvIGJsdXIuIFdlIGRvbid0IHdhbnQgdG8gcmVzZXQgY29udGVudCBp biB0aGlzIGNhc2UuCiAgICAgICAgIGlmICh0aGlzLl9jb21wbGV0aW9uQ29udHJvbGxlci5pc0hh bmRsaW5nQ2xpY2tFdmVudCgpKQpAQCAtMjg2LDkgKzI3Myw5IEBAIFdlYkluc3BlY3Rvci5DU1NT dHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUgPSB7CiAgICAgICAgIC8vIFJlc2V0 IHRoZSBjb250ZW50IG9uIGJsdXIgc2luY2Ugd2Ugc3RvcCBhY2NlcHRpbmcgZXh0ZXJuYWwgY2hh bmdlcyB3aGlsZSB0aGUgdGhlIGVkaXRvciBpcyBmb2N1c2VkLgogICAgICAgICAvLyBUaGlzIGNh dXNlcyB1cyB0byBwaWNrIHVwIGFueSBjaGFuZ2UgdGhhdCB3YXMgc3VwcHJlc3NlZCB3aGlsZSB0 aGUgZWRpdG9yIHdhcyBmb2N1c2VkLgogICAgICAgICB0aGlzLl9yZXNldENvbnRlbnQoKTsKLSAg ICB9LAorICAgIH0KIAotICAgIF9jb250ZW50Q2hhbmdlZDogZnVuY3Rpb24oY29kZU1pcnJvciwg Y2hhbmdlKQorICAgIF9jb250ZW50Q2hhbmdlZChjb2RlTWlycm9yLCBjaGFuZ2UpCiAgICAgewog ICAgICAgICAvLyBSZXR1cm4gZWFybHkgaWYgdGhlIHN0eWxlIGlzbid0IGVkaXRhYmxlLiBUaGlz IHN0aWxsIGNhbiBiZSBjYWxsZWQgd2hlbiByZWFkT25seSBpcyBzZXQgYmVjYXVzZQogICAgICAg ICAvLyBjbGlja2luZyBvbiBhIGNvbG9yIHN3YXRjaCBtb2RpZmllcyB0aGUgdGV4dC4KQEAgLTMw OSwxNSArMjk2LDE2IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRv ci5wcm90b3R5cGUgPSB7CiAgICAgICAgIC8vIFVzZSBhIHNob3J0IGRlbGF5IGZvciB1c2VyIGlu cHV0IHRvIGNvYWxlc2NlIG1vcmUgY2hhbmdlcyBiZWZvcmUgY29tbWl0dGluZy4gT3RoZXIgYWN0 aW9ucyBsaWtlCiAgICAgICAgIC8vIHVuZG8sIHJlZG8gYW5kIHBhc3RlIGFyZSBhdG9taWMgYW5k IHdvcmsgYmV0dGVyIHdpdGggYSB6ZXJvIGRlbGF5LiBDb2RlTWlycm9yIGlkZW50aWZpZXMgY2hh bmdlcyB0aGF0CiAgICAgICAgIC8vIGdldCBjb2FsZXNjZWQgaW4gdGhlIHVuZG8gc3RhY2sgd2l0 aCBhICIrIiBwcmVmaXggb24gdGhlIG9yaWdpbi4gVXNlIHRoYXQgdG8gc2V0IHRoZSBkZWxheSBm b3Igb3VyIGNvYWxlc2NpbmcuCi0gICAgICAgIGNvbnN0IGRlbGF5ID0gY2hhbmdlLm9yaWdpbiAm JiBjaGFuZ2Uub3JpZ2luLmNoYXJBdCgwKSA9PT0gIisiID8gV2ViSW5zcGVjdG9yLkNTU1N0eWxl RGVjbGFyYXRpb25UZXh0RWRpdG9yLkNvbW1pdENvYWxlc2NlRGVsYXkgOiAwOworICAgICAgICAv LyBGSVhNRTogdXNlIGNvbnN0IG9yIGxldAorICAgICAgICB2YXIgZGVsYXkgPSBjaGFuZ2Uub3Jp Z2luICYmIGNoYW5nZS5vcmlnaW4uY2hhckF0KDApID09PSAiKyIgPyBXZWJJbnNwZWN0b3IuQ1NT U3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IuQ29tbWl0Q29hbGVzY2VEZWxheSA6IDA7CiAKICAg ICAgICAgLy8gUmVzZXQgdGhlIHRpbWVvdXQgc28gcmFwaWQgY2hhbmdlcyBjb2FsZXNjZSBhZnRl ciBhIHNob3J0IGRlbGF5LgogICAgICAgICBpZiAodGhpcy5fY29tbWl0Q2hhbmdlc1RpbWVvdXQp CiAgICAgICAgICAgICBjbGVhclRpbWVvdXQodGhpcy5fY29tbWl0Q2hhbmdlc1RpbWVvdXQpOwog ICAgICAgICB0aGlzLl9jb21taXRDaGFuZ2VzVGltZW91dCA9IHNldFRpbWVvdXQodGhpcy5fY29t bWl0Q2hhbmdlcy5iaW5kKHRoaXMpLCBkZWxheSk7Ci0gICAgfSwKKyAgICB9CiAKLSAgICBfdXBk YXRlVGV4dE1hcmtlcnM6IGZ1bmN0aW9uKG5vbmF0b21pYykKKyAgICBfdXBkYXRlVGV4dE1hcmtl cnMobm9uYXRvbWljKQogICAgIHsKICAgICAgICAgZnVuY3Rpb24gdXBkYXRlKCkKICAgICAgICAg ewpAQCAtMzQ5LDcgKzMzNyw4IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4 dEVkaXRvci5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgICAgIGlmICghdGhpcy5fY29kZU1pcnJv ci5nZXRPcHRpb24oInJlYWRPbmx5IikpIHsKICAgICAgICAgICAgICAgICAvLyBNYXRjaGVzIGEg Y29tbWVudCBsaWtlOiAvKiAtd2Via2l0LWZvbzogYmFyOyAqLwotICAgICAgICAgICAgICAgIGNv bnN0IGNvbW1lbnRlZFByb3BlcnR5UmVnZXggPSAvXC9cKlxzKlstXHddK1xzKjpccypbXjtdKzs/ XHMqXCpcLy9nOworICAgICAgICAgICAgICAgIC8vIEZJWE1FOiB1c2UgY29uc3Qgb3IgbGV0Cisg ICAgICAgICAgICAgICAgdmFyIGNvbW1lbnRlZFByb3BlcnR5UmVnZXggPSAvXC9cKlxzKlstXHdd K1xzKjpccypbXjtdKzs/XHMqXCpcLy9nOwogCiAgICAgICAgICAgICAgICAgLy8gTG9vayBmb3Ig Y29tbWVudHMgdGhhdCBsb29rIGxpa2UgcHJvcGVydGllcyBhbmQgYWRkIGNoZWNrYm94ZXMgaW4g ZnJvbnQgb2YgdGhlbS4KICAgICAgICAgICAgICAgICB2YXIgbGluZUNvdW50ID0gdGhpcy5fY29k ZU1pcnJvci5saW5lQ291bnQoKTsKQEAgLTM4OCw5ICszNzcsOSBAQCBXZWJJbnNwZWN0b3IuQ1NT U3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IucHJvdG90eXBlID0gewogICAgICAgICAgICAgdXBk YXRlLmNhbGwodGhpcyk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHRoaXMuX2NvZGVNaXJy b3Iub3BlcmF0aW9uKHVwZGF0ZS5iaW5kKHRoaXMpKTsKLSAgICB9LAorICAgIH0KIAotICAgIF9j cmVhdGVDb2xvclN3YXRjaGVzOiBmdW5jdGlvbihub25hdG9taWMsIGxpbmVOdW1iZXIpCisgICAg X2NyZWF0ZUNvbG9yU3dhdGNoZXMobm9uYXRvbWljLCBsaW5lTnVtYmVyKQogICAgIHsKICAgICAg ICAgZnVuY3Rpb24gdXBkYXRlKCkKICAgICAgICAgewpAQCAtNDE5LDkgKzQwOCw5IEBAIFdlYklu c3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICB1cGRhdGUuY2FsbCh0aGlzKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgdGhp cy5fY29kZU1pcnJvci5vcGVyYXRpb24odXBkYXRlLmJpbmQodGhpcykpOwotICAgIH0sCisgICAg fQogCi0gICAgX3VwZGF0ZVRleHRNYXJrZXJGb3JQcm9wZXJ0eUlmTmVlZGVkOiBmdW5jdGlvbihw cm9wZXJ0eSkKKyAgICBfdXBkYXRlVGV4dE1hcmtlckZvclByb3BlcnR5SWZOZWVkZWQocHJvcGVy dHkpCiAgICAgewogICAgICAgICB2YXIgdGV4dE1hcmtlciA9IHByb3BlcnR5Ll9fcHJvcGVydHlU ZXh0TWFya2VyOwogICAgICAgICBjb25zb2xlLmFzc2VydCh0ZXh0TWFya2VyKTsKQEAgLTQzNCw5 ICs0MjMsOSBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IucHJv dG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIHRoaXMuX2NyZWF0ZVRl eHRNYXJrZXJGb3JQcm9wZXJ0eUlmTmVlZGVkKHJhbmdlLmZyb20sIHJhbmdlLnRvLCBwcm9wZXJ0 eSk7Ci0gICAgfSwKKyAgICB9CiAKLSAgICBfY3JlYXRlVGV4dE1hcmtlckZvclByb3BlcnR5SWZO ZWVkZWQ6IGZ1bmN0aW9uKGZyb20sIHRvLCBwcm9wZXJ0eSkKKyAgICBfY3JlYXRlVGV4dE1hcmtl ckZvclByb3BlcnR5SWZOZWVkZWQoZnJvbSwgdG8sIHByb3BlcnR5KQogICAgIHsKICAgICAgICAg aWYgKCF0aGlzLl9jb2RlTWlycm9yLmdldE9wdGlvbigicmVhZE9ubHkiKSkgewogICAgICAgICAg ICAgLy8gQ3JlYXRlIGEgbmV3IGNoZWNrYm94IGVsZW1lbnQgYW5kIG1hcmtlci4KQEAgLTQ5Myw5 ICs0ODIsOSBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IucHJv dG90eXBlID0gewogICAgICAgICBwcm9wZXJ0eS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5DU1NQcm9wZXJ0eS5FdmVudC5PdmVycmlkZGVuU3RhdHVzQ2hhbmdlZCwgdGhpcy5fcHJvcGVy dHlPdmVycmlkZGVuU3RhdHVzQ2hhbmdlZCwgdGhpcyk7CiAKICAgICAgICAgdGhpcy5fcmVtb3Zl Q2hlY2tib3hQbGFjZWhvbGRlcihmcm9tLmxpbmUpOwotICAgIH0sCisgICAgfQogCi0gICAgX2Ns ZWFyVGV4dE1hcmtlcnM6IGZ1bmN0aW9uKG5vbmF0b21pYywgYWxsKQorICAgIF9jbGVhclRleHRN YXJrZXJzKG5vbmF0b21pYywgYWxsKQogICAgIHsKICAgICAgICAgZnVuY3Rpb24gY2xlYXIoKQog ICAgICAgICB7CkBAIC01MjYsOSArNTE1LDkgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFy YXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGNsZWFyLmNhbGwodGhp cyk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHRoaXMuX2NvZGVNaXJyb3Iub3BlcmF0aW9u KGNsZWFyLmJpbmQodGhpcykpOwotICAgIH0sCisgICAgfQogCi0gICAgX2l0ZXJhdGVPdmVyUHJv cGVydGllczogZnVuY3Rpb24ob25seVZpc2libGVQcm9wZXJ0aWVzLCBjYWxsYmFjaykKKyAgICBf aXRlcmF0ZU92ZXJQcm9wZXJ0aWVzKG9ubHlWaXNpYmxlUHJvcGVydGllcywgY2FsbGJhY2spCiAg ICAgewogICAgICAgICB2YXIgcHJvcGVydGllcyA9IG9ubHlWaXNpYmxlUHJvcGVydGllcyA/IHRo aXMuX3N0eWxlLnZpc2libGVQcm9wZXJ0aWVzIDogdGhpcy5fc3R5bGUucHJvcGVydGllczsKIApA QCAtNTQ2LDkgKzUzNSw5IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVk aXRvci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBpZiAoY2FsbGJhY2suY2FsbCh0aGlzLCBw cm9wZXJ0aWVzW2ldLCBpID09PSBwcm9wZXJ0aWVzLmxlbmd0aCAtIDEpKQogICAgICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICB9Ci0gICAgfSwKKyAgICB9CiAKLSAgICBfcHJvcGVydHlDaGVj a2JveENoYW5nZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIF9wcm9wZXJ0eUNoZWNrYm94Q2hhbmdl ZChldmVudCkKICAgICB7CiAgICAgICAgIHZhciBwcm9wZXJ0eSA9IGV2ZW50LnRhcmdldC5fX2Nz c1Byb3BlcnR5OwogICAgICAgICBjb25zb2xlLmFzc2VydChwcm9wZXJ0eSk7CkBAIC01NzgsOSAr NTY3LDkgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3Rv dHlwZSA9IHsKICAgICAgICAgfQogCiAgICAgICAgIHRoaXMuX2NvZGVNaXJyb3Iub3BlcmF0aW9u KHVwZGF0ZS5iaW5kKHRoaXMpKTsKLSAgICB9LAorICAgIH0KIAotICAgIF9wcm9wZXJ0eUNvbW1l bnRDaGVja2JveENoYW5nZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIF9wcm9wZXJ0eUNvbW1lbnRD aGVja2JveENoYW5nZWQoZXZlbnQpCiAgICAgewogICAgICAgICB2YXIgY29tbWVudFRleHRNYXJr ZXIgPSBldmVudC50YXJnZXQuX19jb21tZW50VGV4dE1hcmtlcjsKICAgICAgICAgY29uc29sZS5h c3NlcnQoY29tbWVudFRleHRNYXJrZXIpOwpAQCAtNjEyLDkgKzYwMSw5IEBAIFdlYkluc3BlY3Rv ci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0K IAogICAgICAgICB0aGlzLl9jb2RlTWlycm9yLm9wZXJhdGlvbih1cGRhdGUuYmluZCh0aGlzKSk7 Ci0gICAgfSwKKyAgICB9CiAKLSAgICBfY29sb3JTd2F0Y2hDbGlja2VkOiBmdW5jdGlvbihldmVu dCkKKyAgICBfY29sb3JTd2F0Y2hDbGlja2VkKGV2ZW50KQogICAgIHsKICAgICAgICAgaWYgKHRo aXMuX2NvbG9yUGlja2VyUG9wb3ZlcikKICAgICAgICAgICAgIHJldHVybjsKQEAgLTcxNSwxNCAr NzA0LDE0IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90 b3R5cGUgPSB7CiAKICAgICAgICAgICAgIGNvbG9yUGlja2VyLmNvbG9yID0gY29sb3I7CiAgICAg ICAgIH0KLSAgICB9LAorICAgIH0KIAotICAgIF9wcm9wZXJ0eU92ZXJyaWRkZW5TdGF0dXNDaGFu Z2VkOiBmdW5jdGlvbihldmVudCkKKyAgICBfcHJvcGVydHlPdmVycmlkZGVuU3RhdHVzQ2hhbmdl ZChldmVudCkKICAgICB7CiAgICAgICAgIHRoaXMuX3VwZGF0ZVRleHRNYXJrZXJGb3JQcm9wZXJ0 eUlmTmVlZGVkKGV2ZW50LnRhcmdldCk7Ci0gICAgfSwKKyAgICB9CiAKLSAgICBfcHJvcGVydGll c0NoYW5nZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIF9wcm9wZXJ0aWVzQ2hhbmdlZChldmVudCkK ICAgICB7CiAgICAgICAgIC8vIERvbid0IHRyeSB0byB1cGRhdGUgdGhlIGRvY3VtZW50IHdoaWxl IGNvbXBsZXRpb25zIGFyZSBzaG93aW5nLiBEb2luZyBzbyB3aWxsIGNsZWFyCiAgICAgICAgIC8v IHRoZSBjb21wbGV0aW9uIGhpbnQgYW5kIHByZXZlbnQgZnVydGhlciBpbnRlcmFjdGlvbiB3aXRo IHRoZSBjb21wbGV0aW9uLgpAQCAtNzM4LDkgKzcyNyw5IEBAIFdlYkluc3BlY3Rvci5DU1NTdHls ZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3JlbW92 ZUVkaXRpbmdMaW5lQ2xhc3Nlc1Nvb24oKTsKIAogICAgICAgICB0aGlzLl91cGRhdGVUZXh0TWFy a2VycygpOwotICAgIH0sCisgICAgfQogCi0gICAgX21hcmtMaW5lc1dpdGhDaGVja2JveFBsYWNl aG9sZGVyOiBmdW5jdGlvbigpCisgICAgX21hcmtMaW5lc1dpdGhDaGVja2JveFBsYWNlaG9sZGVy KCkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9jb2RlTWlycm9yLmdldE9wdGlvbigicmVhZE9u bHkiKSkKICAgICAgICAgICAgIHJldHVybjsKQEAgLTc3Niw5ICs3NjUsOSBAQCBXZWJJbnNwZWN0 b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IucHJvdG90eXBlID0gewogICAgICAgICAg ICAgdmFyIHBsYWNlaG9sZGVyTWFyayA9IHRoaXMuX2NvZGVNaXJyb3Iuc2V0VW5pcXVlQm9va21h cmsocG9zaXRpb24sIHBsYWNlaG9sZGVyRWxlbWVudCk7CiAgICAgICAgICAgICBwbGFjZWhvbGRl ck1hcmsuX19jaGVja2JveFBsYWNlaG9sZGVyID0gdHJ1ZTsKICAgICAgICAgfQotICAgIH0sCisg ICAgfQogCi0gICAgX3JlbW92ZUNoZWNrYm94UGxhY2Vob2xkZXI6IGZ1bmN0aW9uKGxpbmVOdW1i ZXIpCisgICAgX3JlbW92ZUNoZWNrYm94UGxhY2Vob2xkZXIobGluZU51bWJlcikKICAgICB7CiAg ICAgICAgIHZhciBtYXJrcyA9IHRoaXMuX2NvZGVNaXJyb3IuZmluZE1hcmtzQXQoe2xpbmU6IGxp bmVOdW1iZXIsIGNoOiAwfSk7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbWFya3MubGVu Z3RoOyArK2kpIHsKQEAgLTc4OSw5ICs3NzgsOSBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNs YXJhdGlvblRleHRFZGl0b3IucHJvdG90eXBlID0gewogICAgICAgICAgICAgbWFyay5jbGVhcigp OwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgfSwKKyAgICB9CiAKLSAgICBf cmVzZXRDb250ZW50OiBmdW5jdGlvbigpCisgICAgX3Jlc2V0Q29udGVudCgpCiAgICAgewogICAg ICAgICBpZiAodGhpcy5fY29tbWl0Q2hhbmdlc1RpbWVvdXQpIHsKICAgICAgICAgICAgIGNsZWFy VGltZW91dCh0aGlzLl9jb21taXRDaGFuZ2VzVGltZW91dCk7CkBAIC05NTcsOSArOTQ2LDkgQEAg V2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsK ICAgICAgICAgdGhpcy5faWdub3JlQ29kZU1pcnJvckNvbnRlbnREaWRDaGFuZ2VFdmVudCA9IHRy dWU7CiAgICAgICAgIHRoaXMuX2NvZGVNaXJyb3Iub3BlcmF0aW9uKHVwZGF0ZS5iaW5kKHRoaXMp KTsKICAgICAgICAgZGVsZXRlIHRoaXMuX2lnbm9yZUNvZGVNaXJyb3JDb250ZW50RGlkQ2hhbmdl RXZlbnQ7Ci0gICAgfSwKKyAgICB9CiAKLSAgICBfdXBkYXRlSnVtcFRvU3ltYm9sVHJhY2tpbmdN b2RlOiBmdW5jdGlvbigpCisgICAgX3VwZGF0ZUp1bXBUb1N5bWJvbFRyYWNraW5nTW9kZSgpCiAg ICAgewogICAgICAgICB2YXIgb2xkSnVtcFRvU3ltYm9sVHJhY2tpbmdNb2RlRW5hYmxlZCA9IHRo aXMuX2p1bXBUb1N5bWJvbFRyYWNraW5nTW9kZUVuYWJsZWQ7CiAKQEAgLTk3Nyw5ICs5NjYsOSBA QCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IucHJvdG90eXBlID0g ewogICAgICAgICAgICAgICAgIHRoaXMuX3Rva2VuVHJhY2tpbmdDb250cm9sbGVyLmVuYWJsZWQg PSBmYWxzZTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgIH0sCisgICAgfQogCi0gICAg dG9rZW5UcmFja2luZ0NvbnRyb2xsZXJIaWdobGlnaHRlZFJhbmdlV2FzQ2xpY2tlZDogZnVuY3Rp b24odG9rZW5UcmFja2luZ0NvbnRyb2xsZXIpCisgICAgdG9rZW5UcmFja2luZ0NvbnRyb2xsZXJI aWdobGlnaHRlZFJhbmdlV2FzQ2xpY2tlZCh0b2tlblRyYWNraW5nQ29udHJvbGxlcikKICAgICB7 CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuX3N0eWxlLm93bmVyUnVsZS5zb3VyY2VDb2Rl TG9jYXRpb24pOwogICAgICAgICBpZiAoIXRoaXMuX3N0eWxlLm93bmVyUnVsZS5zb3VyY2VDb2Rl TG9jYXRpb24pCkBAIC0xMDA5LDEyICs5OTgsMTggQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVj bGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogCiAgICAgICAgIFdl Ykluc3BlY3Rvci5yZXNvdXJjZVNpZGViYXJQYW5lbC5zaG93U291cmNlQ29kZUxvY2F0aW9uKHNv dXJjZUNvZGVMb2NhdGlvbik7Ci0gICAgfSwKKyAgICB9CiAKLSAgICB0b2tlblRyYWNraW5nQ29u dHJvbGxlck5ld0hpZ2hsaWdodENhbmRpZGF0ZTogZnVuY3Rpb24odG9rZW5UcmFja2luZ0NvbnRy b2xsZXIsIGNhbmRpZGF0ZSkKKyAgICB0b2tlblRyYWNraW5nQ29udHJvbGxlck5ld0hpZ2hsaWdo dENhbmRpZGF0ZSh0b2tlblRyYWNraW5nQ29udHJvbGxlciwgY2FuZGlkYXRlKQogICAgIHsKICAg ICAgICAgdGhpcy5fdG9rZW5UcmFja2luZ0NvbnRyb2xsZXIuaGlnaGxpZ2h0UmFuZ2UoY2FuZGlk YXRlLmhvdmVyZWRUb2tlblJhbmdlKTsKICAgICB9CiB9OwogCi1XZWJJbnNwZWN0b3IuQ1NTU3R5 bGVEZWNsYXJhdGlvblRleHRFZGl0b3IucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rv ci5PYmplY3QucHJvdG90eXBlOworV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0 RWRpdG9yLlN0eWxlQ2xhc3NOYW1lID0gImNzcy1zdHlsZS10ZXh0LWVkaXRvciI7CitXZWJJbnNw ZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IuUmVhZE9ubHlTdHlsZUNsYXNzTmFt ZSA9ICJyZWFkLW9ubHkiOworV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRp dG9yLkNvbG9yU3dhdGNoRWxlbWVudFN0eWxlQ2xhc3NOYW1lID0gImNvbG9yLXN3YXRjaCI7CitX ZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IuQ2hlY2tib3hQbGFjZWhv bGRlckVsZW1lbnRTdHlsZUNsYXNzTmFtZSA9ICJjaGVja2JveC1wbGFjZWhvbGRlciI7CitXZWJJ bnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IuRWRpdGluZ0xpbmVTdHlsZUNs YXNzTmFtZSA9ICJlZGl0aW5nLWxpbmUiOworV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRp b25UZXh0RWRpdG9yLkNvbW1pdENvYWxlc2NlRGVsYXkgPSAyNTA7CitXZWJJbnNwZWN0b3IuQ1NT U3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IuUmVtb3ZlRWRpdGluZ0xpbmVDbGFzc2VzRGVsYXkg PSAyMDAwOwpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK