52896 2011-01-21 07:50:04 -0800 Web Inspector: eliminate SourceView and ScriptView classes 2011-01-24 03:23:08 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov abarth apavlov bweinstein eric joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 338056 0 podivilov 2011-01-21 07:50:04 -0800 We should eliminate SourceView and ScriptView classes since they delegate everything to SourceFrame. 338058 1 79740 podivilov 2011-01-21 07:51:28 -0800 Created attachment 79740 Patch. 338918 2 podivilov 2011-01-24 02:39:07 -0800 Committed r76497: <http://trac.webkit.org/changeset/76497> 338925 3 webkit.review.bot 2011-01-24 03:23:08 -0800 http://trac.webkit.org/changeset/76497 might have broken Qt Linux Release The following tests are not passing: inspector/debugger-autocontinue-on-syntax-error.html inspector/debugger-scripts.html inspector/storage-panel-dom-storage.html inspector/styles-add-blank-property.html 79740 2011-01-21 07:51:28 -0800 2011-01-21 08:17:36 -0800 Patch. patch text/plain 33491 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmZjhjOTY4Li44MjM1ZWUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsNDcg QEAKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBXZWIg SW5zcGVjdG9yOiBlbGltaW5hdGUgU291cmNlVmlldyBhbmQgU2NyaXB0VmlldyBjbGFzc2VzLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTI4OTYKKwor ICAgICAgICBTb3VyY2VWaWV3IGFuZCBTY3JpcHRWaWV3IGRlbGVnYXRlIGV2ZXJ5dGhpbmcgdG8g U291cmNlRnJhbWUgYW5kIHNob3VsZCBiZSBlbGltaW5hdGVkLgorCisgICAgICAgICogV2ViQ29y ZS5neXBpOgorICAgICAgICAqIFdlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvR29Ub0xpbmVEaWFsb2cuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuR29Ub0xpbmVEaWFsb2cucHJvdG90eXBlLl9oaWdobGlnaHRTZWxlY3RlZExpbmUp OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VWaWV3LmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5jcmVhdGVSZXNvdXJjZVZpZXcpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5yZXNvdXJjZVZpZXdUeXBlTWF0Y2hlc1Jlc291 cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZUNvbnRlbnRQcm92aWRlckZv clJlc291cmNlKTogIE1vdmVkIGZyb20gU291cmNlVmlldy4KKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291 cmNlc1BhbmVsLnByb3RvdHlwZS5zaG93KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJj ZXNQYW5lbC5wcm90b3R5cGUuX2FwcGx5RGlmZk1hcmt1cCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRnJhbWVSZXNvdXJjZVRyZWVFbGVtZW50LnByb3RvdHlwZS5fZXJyb3JzV2FybmluZ3NVcGRh dGVkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdFZpZXcuanM6IFJlbW92 ZWQuCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fc2NyaXB0U291cmNlQ2hh bmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fc291 cmNlRnJhbWVGb3JTY3JpcHRPclJlc291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3Jp cHRzUGFuZWwucHJvdG90eXBlLl9zaG93U2NyaXB0T3JSZXNvdXJjZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fc2V0UGF1c2VPbkV4Y2VwdGlvbnMpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX2Zvcm1hdFNjcmlw dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVDb250ZW50UHJvdmlkZXJGb3JT Y3JpcHQpOiBNb3ZlZCBmcm9tIFNjcmlwdFZpZXcuCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9Tb3VyY2VGcmFtZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLnNob3cpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5oaWRlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuaGFzQ29udGVudCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLl9jcmVhdGVUZXh0Vmlld2VyKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUucGVyZm9ybVNlYXJj aC5kb0ZpbmRTZWFyY2hNYXRjaGVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFt ZS5wcm90b3R5cGUucGVyZm9ybVNlYXJjaCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9Tb3VyY2VWaWV3LmpzOiBSZW1vdmVkLgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv V2ViS2l0LnFyYzoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1s OgorCisyMDExLTAxLTIxICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAgICAgIFdlYiBJ bnNwZWN0b3I6IG1vdmUgc2VhcmNoIGZ1bmN0aW9ucyBmcm9tIFNvdXJjZVZpZXcgdG8gU291cmNl RnJhbWUuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 Mjg5NQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkgYi9Tb3VyY2Uv V2ViQ29yZS9XZWJDb3JlLmd5cGkKaW5kZXggNTM0ZGRmMi4uMjk2ZTY3ZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu Z3lwaQpAQCAtNDcxMiw3ICs0NzEyLDYgQEAKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdEZvcm1hdHRlci5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRGb3JtYXR0ZXJXb3JrZXIuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9u dC1lbmQvU2NyaXB0c1BhbmVsLmpzJywKLSAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdFZpZXcuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvU2hvcnRj dXRzSGVscC5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9TZWN0aW9uLmpz JywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzJywKQEAgLTQ3 MjMsNyArNDcyMiw2IEBACiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VI VE1MVG9rZW5pemVyLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJj ZUphdmFTY3JpcHRUb2tlbml6ZXIuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1l bmQvU291cmNlVG9rZW5pemVyLmpzJywKLSAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5k L1NvdXJjZVZpZXcuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvU3RhdHVz QmFyQnV0dG9uLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1Np ZGViYXJQYW5lLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1N1bW1hcnlC YXIuanMnLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29y ZS52Y3Byb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagpp bmRleCA1YzMwNjk5Li40OTZmYjIzIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl LnZjcHJvai9XZWJDb3JlLnZjcHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJv ai9XZWJDb3JlLnZjcHJvagpAQCAtNjU2NDEsMTAgKzY1NjQxLDYgQEAKIAkJCQkJPgogCQkJCTwv RmlsZT4KIAkJCQk8RmlsZQotCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGluc3BlY3Rvclxmcm9udC1l bmRcU2NyaXB0Vmlldy5qcyIKLQkJCQkJPgotCQkJCTwvRmlsZT4KLQkJCQk8RmlsZQogCQkJCQlS ZWxhdGl2ZVBhdGg9Ii4uXGluc3BlY3Rvclxmcm9udC1lbmRcU2VjdGlvbi5qcyIKIAkJCQkJPgog CQkJCTwvRmlsZT4KQEAgLTY1Njg1LDEwICs2NTY4MSw2IEBACiAJCQkJCT4KIAkJCQk8L0ZpbGU+ CiAJCQkJPEZpbGUKLQkJCQkJUmVsYXRpdmVQYXRoPSIuLlxpbnNwZWN0b3JcZnJvbnQtZW5kXFNv dXJjZVZpZXcuanMiCi0JCQkJCT4KLQkJCQk8L0ZpbGU+Ci0JCQkJPEZpbGUKIAkJCQkJUmVsYXRp dmVQYXRoPSIuLlxpbnNwZWN0b3JcZnJvbnQtZW5kXFN0YXR1c0JhckJ1dHRvbi5qcyIKIAkJCQkJ PgogCQkJCTwvRmlsZT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvR29Ub0xpbmVEaWFsb2cuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0dvVG9MaW5lRGlhbG9nLmpzCmluZGV4IGM5NjM0NGMuLmYyNDYxNTkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvR29Ub0xpbmVEaWFsb2cuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Hb1RvTGluZURpYWxvZy5qcwpA QCAtNDUsNyArNDUsNyBAQCBXZWJJbnNwZWN0b3IuR29Ub0xpbmVEaWFsb2cgPSBmdW5jdGlvbih2 aWV3KQogICAgIHRoaXMuX2lucHV0ID0gZGlhbG9nV2luZG93LmNyZWF0ZUNoaWxkKCJpbnB1dCIp OwogICAgIHRoaXMuX2lucHV0LnNldEF0dHJpYnV0ZSgidHlwZSIsICJ0ZXh0Iik7CiAgICAgdGhp cy5faW5wdXQuc2V0QXR0cmlidXRlKCJzaXplIiwgNik7Ci0gICAgdmFyIGxpbmVzQ291bnQgPSB2 aWV3LnNvdXJjZUZyYW1lLnRleHRNb2RlbC5saW5lc0NvdW50OworICAgIHZhciBsaW5lc0NvdW50 ID0gdmlldy50ZXh0TW9kZWwubGluZXNDb3VudDsKICAgICBpZiAobGluZXNDb3VudCkKICAgICAg ICAgdGhpcy5faW5wdXQuc2V0QXR0cmlidXRlKCJ0aXRsZSIsIFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiMSAtICVkIiwgbGluZXNDb3VudCkpOwogICAgIHZhciBibHVySGFuZGxlciA9IHRoaXMuX29u Qmx1ci5iaW5kKHRoaXMpOwpAQCAtMTIwLDcgKzEyMCw3IEBAIFdlYkluc3BlY3Rvci5Hb1RvTGlu ZURpYWxvZy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciB2YWx1ZSA9IHRoaXMuX2lucHV0LnZh bHVlOwogICAgICAgICB2YXIgbGluZU51bWJlciA9IHBhcnNlSW50KHZhbHVlLCAxMCk7CiAgICAg ICAgIGlmICghaXNOYU4obGluZU51bWJlcikgJiYgbGluZU51bWJlciA+IDApIHsKLSAgICAgICAg ICAgIGxpbmVOdW1iZXIgPSBNYXRoLm1pbihsaW5lTnVtYmVyLCB0aGlzLl92aWV3LnNvdXJjZUZy YW1lLnRleHRNb2RlbC5saW5lc0NvdW50KTsKKyAgICAgICAgICAgIGxpbmVOdW1iZXIgPSBNYXRo Lm1pbihsaW5lTnVtYmVyLCB0aGlzLl92aWV3LnRleHRNb2RlbC5saW5lc0NvdW50KTsKICAgICAg ICAgICAgIHRoaXMuX3ZpZXcuaGlnaGxpZ2h0TGluZShsaW5lTnVtYmVyKTsKICAgICAgICAgfQog ICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2VWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZVZpZXcuanMKaW5kZXggYjY5MDk3ZC4uNWI0YjcwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMKQEAgLTUwLDcgKzUwLDExIEBA IFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcuY3JlYXRlUmVzb3VyY2VWaWV3ID0gZnVuY3Rpb24o cmVzb3VyY2UpCiAgICAgY2FzZSBXZWJJbnNwZWN0b3IucmVzb3VyY2VDYXRlZ29yaWVzLnN0eWxl c2hlZXRzOgogICAgIGNhc2UgV2ViSW5zcGVjdG9yLnJlc291cmNlQ2F0ZWdvcmllcy5zY3JpcHRz OgogICAgIGNhc2UgV2ViSW5zcGVjdG9yLnJlc291cmNlQ2F0ZWdvcmllcy54aHI6Ci0gICAgICAg IHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZVZpZXcocmVzb3VyY2UpOworICAgICAgICB2 YXIgY29udGVudFByb3ZpZGVyID0gbmV3IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZUNvbnRlbnRQ cm92aWRlckZvclJlc291cmNlKHJlc291cmNlKTsKKyAgICAgICAgdmFyIGlzU2NyaXB0ID0gcmVz b3VyY2UudHlwZSA9PT0gV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUuU2NyaXB0OworICAgICAg ICB2YXIgdmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUoY29udGVudFByb3ZpZGVy LCByZXNvdXJjZS51cmwsIGlzU2NyaXB0KTsKKyAgICAgICAgdmlldy5yZXNvdXJjZSA9IHJlc291 cmNlOworICAgICAgICByZXR1cm4gdmlldzsKICAgICBjYXNlIFdlYkluc3BlY3Rvci5yZXNvdXJj ZUNhdGVnb3JpZXMuaW1hZ2VzOgogICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5JbWFn ZVZpZXcocmVzb3VyY2UpOwogICAgIGNhc2UgV2ViSW5zcGVjdG9yLnJlc291cmNlQ2F0ZWdvcmll cy5mb250czoKQEAgLTY4LDcgKzcyLDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5yZXNv dXJjZVZpZXdUeXBlTWF0Y2hlc1Jlc291cmNlID0gZnVuY3Rpb24ocmVzb3VyY2UpCiAgICAgY2Fz ZSBXZWJJbnNwZWN0b3IucmVzb3VyY2VDYXRlZ29yaWVzLnN0eWxlc2hlZXRzOgogICAgIGNhc2Ug V2ViSW5zcGVjdG9yLnJlc291cmNlQ2F0ZWdvcmllcy5zY3JpcHRzOgogICAgIGNhc2UgV2ViSW5z cGVjdG9yLnJlc291cmNlQ2F0ZWdvcmllcy54aHI6Ci0gICAgICAgIHJldHVybiByZXNvdXJjZVZp ZXcuX19wcm90b19fID09PSBXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGU7CisgICAg ICAgIHJldHVybiByZXNvdXJjZVZpZXcuX19wcm90b19fID09PSBXZWJJbnNwZWN0b3IuU291cmNl RnJhbWUucHJvdG90eXBlOwogICAgIGNhc2UgV2ViSW5zcGVjdG9yLnJlc291cmNlQ2F0ZWdvcmll cy5pbWFnZXM6CiAgICAgICAgIHJldHVybiByZXNvdXJjZVZpZXcuX19wcm90b19fID09PSBXZWJJ bnNwZWN0b3IuSW1hZ2VWaWV3LnByb3RvdHlwZTsKICAgICBjYXNlIFdlYkluc3BlY3Rvci5yZXNv dXJjZUNhdGVnb3JpZXMuZm9udHM6CkBAIC0xMTUsMyArMTE5LDM3IEBAIFdlYkluc3BlY3Rvci5S ZXNvdXJjZVZpZXcuZXhpc3RpbmdSZXNvdXJjZVZpZXdGb3JSZXNvdXJjZSA9IGZ1bmN0aW9uKHJl c291cmNlKQogICAgICAgICByZXR1cm4gbnVsbDsKICAgICByZXR1cm4gcmVzb3VyY2UuX3Jlc291 cmNlc1ZpZXc7CiB9CisKKworV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lQ29udGVudFByb3ZpZGVy Rm9yUmVzb3VyY2UgPSBmdW5jdGlvbihyZXNvdXJjZSkKK3sKKyAgICBXZWJJbnNwZWN0b3IuU291 cmNlRnJhbWVDb250ZW50UHJvdmlkZXIuY2FsbCh0aGlzKTsKKyAgICB0aGlzLl9yZXNvdXJjZSA9 IHJlc291cmNlOworfQorCisvL1RoaXMgaXMgYSBtYXAgZnJvbSByZXNvdXJjZS50eXBlIHRvIG1p bWUgdHlwZXMKKy8vZm91bmQgaW4gV2ViSW5zcGVjdG9yLlNvdXJjZVRva2VuaXplci5SZWdpc3Ry eS4KK1dlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZUNvbnRlbnRQcm92aWRlckZvclJlc291cmNlLkRl ZmF1bHRNSU1FVHlwZUZvclJlc291cmNlVHlwZSA9IHsKKyAgICAwOiAidGV4dC9odG1sIiwKKyAg ICAxOiAidGV4dC9jc3MiLAorICAgIDQ6ICJ0ZXh0L2phdmFzY3JpcHQiCit9CisKK1dlYkluc3Bl Y3Rvci5Tb3VyY2VGcmFtZUNvbnRlbnRQcm92aWRlckZvclJlc291cmNlLnByb3RvdHlwZSA9IHsK KyAgICByZXF1ZXN0Q29udGVudDogZnVuY3Rpb24oY2FsbGJhY2spCisgICAgeworICAgICAgICBm dW5jdGlvbiBjb250ZW50TG9hZGVkKGNvbnRlbnQpCisgICAgICAgIHsKKyAgICAgICAgICAgIHZh ciBtaW1lVHlwZSA9IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZUNvbnRlbnRQcm92aWRlckZvclJl c291cmNlLkRlZmF1bHRNSU1FVHlwZUZvclJlc291cmNlVHlwZVt0aGlzLl9yZXNvdXJjZS50eXBl XSB8fCB0aGlzLl9yZXNvdXJjZS5taW1lVHlwZTsKKyAgICAgICAgICAgIGNhbGxiYWNrKG1pbWVU eXBlLCBjb250ZW50KTsKKyAgICAgICAgfQorICAgICAgICB0aGlzLl9yZXNvdXJjZS5yZXF1ZXN0 Q29udGVudChjb250ZW50TG9hZGVkLmJpbmQodGhpcykpOworICAgIH0sCisKKyAgICBzY3JpcHRz OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLmRlYnVnZ2Vy TW9kZWwuc2NyaXB0c0ZvclVSTCh0aGlzLl9yZXNvdXJjZS51cmwpOworICAgIH0KK30KKworV2Vi SW5zcGVjdG9yLlNvdXJjZUZyYW1lQ29udGVudFByb3ZpZGVyRm9yUmVzb3VyY2UucHJvdG90eXBl Ll9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZUNvbnRlbnRQcm92aWRlci5wcm90 b3R5cGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlc1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNv dXJjZXNQYW5lbC5qcwppbmRleCA3ZTFmY2MwLi42ZDljNmFmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKQEAgLTEwMiw3 ICsxMDIsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAg IHsKICAgICAgICAgV2ViSW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZS5zaG93LmNhbGwodGhpcyk7 CiAKLSAgICAgICAgaWYgKHRoaXMudmlzaWJsZVZpZXcgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3Iu UmVzb3VyY2VWaWV3KQorICAgICAgICBpZiAodGhpcy52aXNpYmxlVmlldy5yZXNvdXJjZSkKICAg ICAgICAgICAgIHRoaXMuX3Nob3dSZXNvdXJjZVZpZXcodGhpcy52aXNpYmxlVmlldy5yZXNvdXJj ZSk7CiAKICAgICAgICAgaWYgKHRoaXMuX2luaXRpYWxpemVkRGVmYXVsdFNlbGVjdGlvbikKQEAg LTM3OCw3ICszNzgsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0g ewogICAgICAgICB2YXIgdmlldyA9IFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcucmVzb3VyY2VW aWV3Rm9yUmVzb3VyY2UocmVzb3VyY2UpOwogCiAgICAgICAgIC8vIENvbnNpZGVyIHJlbmRlcmlu ZyBkaWZmIG1hcmt1cCBoZXJlLgotICAgICAgICBpZiAocmVzb3VyY2UuYmFzZVJldmlzaW9uICYm IHZpZXcgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuU291cmNlVmlldykgeworICAgICAgICBpZiAo cmVzb3VyY2UuYmFzZVJldmlzaW9uICYmIHZpZXcgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuU291 cmNlRnJhbWUpIHsKICAgICAgICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNrKGJhc2VDb250ZW50KQog ICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIGlmIChiYXNlQ29udGVudCkKQEAgLTQxMyw3 ICs0MTMsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAg ICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICAgICAgb2Zmc2V0ID0gaSAtIHJpZ2h0W2ldLnJv dzsKICAgICAgICAgfQotICAgICAgICB2aWV3LnNvdXJjZUZyYW1lLm1hcmtEaWZmKGRpZmZEYXRh KTsKKyAgICAgICAgdmlldy5tYXJrRGlmZihkaWZmRGF0YSk7CiAgICAgfSwKIAogICAgIHNob3dE YXRhYmFzZTogZnVuY3Rpb24oZGF0YWJhc2UsIHRhYmxlTmFtZSkKQEAgLTY5MCw3ICs2OTAsNyBA QCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB2YXIg dmlld3MgPSBbXTsKIAogICAgICAgICBjb25zdCB2aXNpYmxlVmlldyA9IHRoaXMudmlzaWJsZVZp ZXc7Ci0gICAgICAgIGlmICh2aXNpYmxlVmlldyBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5SZXNv dXJjZVZpZXcgJiYgdmlzaWJsZVZpZXcucGVyZm9ybVNlYXJjaCkKKyAgICAgICAgaWYgKHZpc2li bGVWaWV3LnBlcmZvcm1TZWFyY2gpCiAgICAgICAgICAgICB2aWV3cy5wdXNoKHZpc2libGVWaWV3 KTsKIAogICAgICAgICBmdW5jdGlvbiBjYWxsYmFjayhyZXNvdXJjZVRyZWVFbGVtZW50KQpAQCAt MTA3Niw3ICsxMDc2LDcgQEAgV2ViSW5zcGVjdG9yLkZyYW1lUmVzb3VyY2VUcmVlRWxlbWVudC5w cm90b3R5cGUgPSB7CiAKICAgICBfZXJyb3JzV2FybmluZ3NVcGRhdGVkOiBmdW5jdGlvbigpCiAg ICAgewotICAgICAgICAvLyBGSVhNRTogbW92ZSB0byB0aGUgU2NyaXB0L1NvdXJjZVZpZXcuCisg ICAgICAgIC8vIEZJWE1FOiBtb3ZlIHRvIHRoZSBTb3VyY2VGcmFtZS4KICAgICAgICAgaWYgKCF0 aGlzLl9yZXNvdXJjZS53YXJuaW5ncyAmJiAhdGhpcy5fcmVzb3VyY2UuZXJyb3JzKSB7CiAgICAg ICAgICAgICB2YXIgdmlldyA9IFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcuZXhpc3RpbmdSZXNv dXJjZVZpZXdGb3JSZXNvdXJjZSh0aGlzLl9yZXNvdXJjZSk7CiAgICAgICAgICAgICBpZiAodmll dyAmJiB2aWV3LmNsZWFyTWVzc2FnZXMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdFZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1NjcmlwdFZpZXcuanMKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGY2 MzFmY2MuLjAwMDAwMDAKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRWaWV3LmpzCisrKyAvZGV2L251bGwKQEAgLTEsOTYgKzAsMCBAQAotLyoKLSAqIENvcHly aWdodCAoQykgMjAwOCBBcHBsZSBJbmMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCi0gKgotICogUmVk aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3 aXRob3V0Ci0gKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMKLSAqIGFyZSBtZXQ6Ci0gKiAxLiBSZWRpc3RyaWJ1dGlvbnMg b2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy LgotICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRo ZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMg YW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKLSAqICAgIGRvY3VtZW50YXRpb24g YW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCi0g KgotICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIGBgQVMgSVMnJyBB TkQgQU5ZCi0gKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQg Tk9UIExJTUlURUQgVE8sIFRIRQotICogSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJ TElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCi0gKiBQVVJQT1NFIEFSRSBESVNDTEFJ TUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUgotICogQ09OVFJJQlVUT1JTIEJF IExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsCi0g KiBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9U IExJTUlURUQgVE8sCi0gKiBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJ Q0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IKLSAqIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVS UlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKLSAqIE9GIExJQUJJTElU WSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAotICogKElO Q0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBP RiBUSEUgVVNFCi0gKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBP U1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgotICovCi0KLVdlYkluc3BlY3Rvci5TY3JpcHRWaWV3 ID0gZnVuY3Rpb24oc2NyaXB0KQotewotICAgIFdlYkluc3BlY3Rvci5WaWV3LmNhbGwodGhpcyk7 Ci0KLSAgICB0aGlzLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygic2NyaXB0LXZpZXciKTsKLQotICAg IHZhciBjb250ZW50UHJvdmlkZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lQ29udGVu dFByb3ZpZGVyRm9yU2NyaXB0KHNjcmlwdCk7Ci0gICAgdGhpcy5zb3VyY2VGcmFtZSA9IG5ldyBX ZWJJbnNwZWN0b3IuU291cmNlRnJhbWUodGhpcy5lbGVtZW50LCBjb250ZW50UHJvdmlkZXIsICIi LCB0cnVlKTsKLX0KLQotV2ViSW5zcGVjdG9yLlNjcmlwdFZpZXcucHJvdG90eXBlID0gewotICAg IC8vIFRoZSBmb2xsb3dpbmcgbWV0aG9kcyBhcmUgcHVsbGVkIGZyb20gU291cmNlVmlldywgc2lu Y2UgdGhleSBhcmUKLSAgICAvLyBnZW5lcmljIGFuZCB3b3JrIHdpdGggU2NyaXB0VmlldyBqdXN0 IGZpbmUuCi0KLSAgICBzaG93OiBXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUuc2hv dywKLSAgICBoaWRlOiBXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUuaGlkZSwKLSAg ICByZXZlYWxMaW5lOiBXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUucmV2ZWFsTGlu ZSwKLSAgICBoaWdobGlnaHRMaW5lOiBXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUu aGlnaGxpZ2h0TGluZSwKLSAgICBhZGRNZXNzYWdlOiBXZWJJbnNwZWN0b3IuU291cmNlVmlldy5w cm90b3R5cGUuYWRkTWVzc2FnZSwKLSAgICBjbGVhck1lc3NhZ2VzOiBXZWJJbnNwZWN0b3IuU291 cmNlVmlldy5wcm90b3R5cGUuY2xlYXJNZXNzYWdlcywKLSAgICBzZWFyY2hDYW5jZWxlZDogV2Vi SW5zcGVjdG9yLlNvdXJjZVZpZXcucHJvdG90eXBlLnNlYXJjaENhbmNlbGVkLAotICAgIHBlcmZv cm1TZWFyY2g6IFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlwZS5wZXJmb3JtU2VhcmNo LAotICAgIGp1bXBUb0ZpcnN0U2VhcmNoUmVzdWx0OiBXZWJJbnNwZWN0b3IuU291cmNlVmlldy5w cm90b3R5cGUuanVtcFRvRmlyc3RTZWFyY2hSZXN1bHQsCi0gICAganVtcFRvTGFzdFNlYXJjaFJl c3VsdDogV2ViSW5zcGVjdG9yLlNvdXJjZVZpZXcucHJvdG90eXBlLmp1bXBUb0xhc3RTZWFyY2hS ZXN1bHQsCi0gICAganVtcFRvTmV4dFNlYXJjaFJlc3VsdDogV2ViSW5zcGVjdG9yLlNvdXJjZVZp ZXcucHJvdG90eXBlLmp1bXBUb05leHRTZWFyY2hSZXN1bHQsCi0gICAganVtcFRvUHJldmlvdXNT ZWFyY2hSZXN1bHQ6IFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlwZS5qdW1wVG9QcmV2 aW91c1NlYXJjaFJlc3VsdCwKLSAgICBzaG93aW5nRmlyc3RTZWFyY2hSZXN1bHQ6IFdlYkluc3Bl Y3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlwZS5zaG93aW5nRmlyc3RTZWFyY2hSZXN1bHQsCi0gICAg c2hvd2luZ0xhc3RTZWFyY2hSZXN1bHQ6IFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlw ZS5zaG93aW5nTGFzdFNlYXJjaFJlc3VsdCwKLSAgICBfanVtcFRvU2VhcmNoUmVzdWx0OiBXZWJJ bnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUuX2p1bXBUb1NlYXJjaFJlc3VsdCwKLSAgICBy ZXNpemU6IFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlwZS5yZXNpemUKLX0KLQotV2Vi SW5zcGVjdG9yLlNjcmlwdFZpZXcucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5W aWV3LnByb3RvdHlwZTsKLQotCi1XZWJJbnNwZWN0b3IuU291cmNlRnJhbWVDb250ZW50UHJvdmlk ZXJGb3JTY3JpcHQgPSBmdW5jdGlvbihzY3JpcHQpCi17Ci0gICAgV2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lQ29udGVudFByb3ZpZGVyLmNhbGwodGhpcyk7Ci0gICAgdGhpcy5fc2NyaXB0ID0gc2Ny aXB0OwotfQotCi1XZWJJbnNwZWN0b3IuU291cmNlRnJhbWVDb250ZW50UHJvdmlkZXJGb3JTY3Jp cHQucHJvdG90eXBlID0gewotICAgIHJlcXVlc3RDb250ZW50OiBmdW5jdGlvbihjYWxsYmFjaykK LSAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9zY3JpcHQuc291cmNlKSB7Ci0gICAgICAgICAgICBj YWxsYmFjaygidGV4dC9qYXZhc2NyaXB0IiwgdGhpcy5fc2NyaXB0LnNvdXJjZSk7Ci0gICAgICAg ICAgICByZXR1cm47Ci0gICAgICAgIH0KLQotICAgICAgICBmdW5jdGlvbiBkaWRSZXF1ZXN0U291 cmNlKGNvbnRlbnQpCi0gICAgICAgIHsKLSAgICAgICAgICAgIHZhciBzb3VyY2U7Ci0gICAgICAg ICAgICBpZiAoY29udGVudCkgewotICAgICAgICAgICAgICAgIHZhciBwcmVmaXggPSAiIjsKLSAg ICAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX3NjcmlwdC5zdGFydGluZ0xp bmUgLSAxOyArK2kpCi0gICAgICAgICAgICAgICAgICAgIHByZWZpeCArPSAiXG4iOwotICAgICAg ICAgICAgICAgIHNvdXJjZSA9IHByZWZpeCArIGNvbnRlbnQ7Ci0gICAgICAgICAgICB9IGVsc2UK LSAgICAgICAgICAgICAgICBzb3VyY2UgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIjxzb3VyY2Ug aXMgbm90IGF2YWlsYWJsZT4iKTsKLSAgICAgICAgICAgIGNhbGxiYWNrKCJ0ZXh0L2phdmFzY3Jp cHQiLCBzb3VyY2UpOwotICAgICAgICB9Ci0gICAgICAgIHRoaXMuX3NjcmlwdC5yZXF1ZXN0U291 cmNlKGRpZFJlcXVlc3RTb3VyY2UuYmluZCh0aGlzKSk7Ci0gICAgfSwKLQotICAgIHNjcmlwdHM6 IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiBbdGhpcy5fc2NyaXB0XTsKLSAgICB9 Ci19Ci0KLVdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZUNvbnRlbnRQcm92aWRlckZvclNjcmlwdC5w cm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lQ29udGVudFByb3Zp ZGVyLnByb3RvdHlwZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggYTc0ZjgwZC4uNjNhNDA4NSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAgLTI1OCwx MCArMjU4LDEwIEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAg ICAgICB2YXIgb2xkU291cmNlID0gZXZlbnQuZGF0YS5vbGRTb3VyY2U7CiAKICAgICAgICAgdmFy IHNjcmlwdCA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLnNjcmlwdEZvclNvdXJjZUlEKHNv dXJjZUlEKTsKLSAgICAgICAgdmFyIG9sZFZpZXcgPSBzY3JpcHQuX3NjcmlwdFZpZXc7CisgICAg ICAgIHZhciBvbGRWaWV3ID0gc2NyaXB0Ll9zb3VyY2VGcmFtZQogICAgICAgICBpZiAob2xkVmll dykgewotICAgICAgICAgICAgc2NyaXB0Ll9zY3JpcHRWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5T Y3JpcHRWaWV3KHNjcmlwdCk7Ci0gICAgICAgICAgICB0aGlzLnZpZXdSZWNyZWF0ZWQob2xkVmll dywgc2NyaXB0Ll9zY3JpcHRWaWV3KTsKKyAgICAgICAgICAgIGRlbGV0ZSBzY3JpcHQuX3NvdXJj ZUZyYW1lOworICAgICAgICAgICAgdGhpcy52aWV3UmVjcmVhdGVkKG9sZFZpZXcsIHRoaXMuX3Nv dXJjZUZyYW1lRm9yU2NyaXB0T3JSZXNvdXJjZShzY3JpcHQpKTsKICAgICAgICAgfQogICAgICAg ICBpZiAoc2NyaXB0LnJlc291cmNlKSB7CiAgICAgICAgICAgICB2YXIgcmV2ZXJ0SGFuZGxlID0g V2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuZWRpdFNjcmlwdFNvdXJjZS5iaW5kKFdlYkluc3Bl Y3Rvci5kZWJ1Z2dlck1vZGVsLCBzb3VyY2VJRCwgb2xkU291cmNlKTsKQEAgLTQ4NCw0MyArNDg0 LDE3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAg ICAgdGhpcy5zaWRlYmFyUGFuZXMuY2FsbHN0YWNrLmhhbmRsZVNob3J0Y3V0KGV2ZW50KTsKICAg ICB9LAogCi0gICAgc2NyaXB0Vmlld0ZvclNjcmlwdDogZnVuY3Rpb24oc2NyaXB0KQotICAgIHsK LSAgICAgICAgaWYgKCFzY3JpcHQpCi0gICAgICAgICAgICByZXR1cm4gbnVsbDsKLSAgICAgICAg aWYgKCFzY3JpcHQuX3NjcmlwdFZpZXcpCi0gICAgICAgICAgICBzY3JpcHQuX3NjcmlwdFZpZXcg PSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdFZpZXcoc2NyaXB0KTsKLSAgICAgICAgcmV0dXJuIHNj cmlwdC5fc2NyaXB0VmlldzsKLSAgICB9LAotCi0gICAgc291cmNlRnJhbWVGb3JTY3JpcHQ6IGZ1 bmN0aW9uKHNjcmlwdCkKLSAgICB7Ci0gICAgICAgIHZhciB2aWV3ID0gdGhpcy5zY3JpcHRWaWV3 Rm9yU2NyaXB0KHNjcmlwdCk7Ci0gICAgICAgIGlmICghdmlldykKLSAgICAgICAgICAgIHJldHVy biBudWxsOwotCi0gICAgICAgIC8vIFNldHRpbmcgdXAgdGhlIHNvdXJjZSBmcmFtZSByZXF1aXJl cyB0aGF0IHdlIGJlIGF0dGFjaGVkLgotICAgICAgICBpZiAoIXRoaXMuZWxlbWVudC5wYXJlbnRO b2RlKQotICAgICAgICAgICAgdGhpcy5hdHRhY2goKTsKLQotICAgICAgICByZXR1cm4gdmlldy5z b3VyY2VGcmFtZTsKLSAgICB9LAotCiAgICAgX3NvdXJjZUZyYW1lRm9yU2NyaXB0T3JSZXNvdXJj ZTogZnVuY3Rpb24oc2NyaXB0T3JSZXNvdXJjZSkKICAgICB7CisgICAgICAgIGlmIChzY3JpcHRP clJlc291cmNlLl9zb3VyY2VGcmFtZSkKKyAgICAgICAgICAgIHJldHVybiBzY3JpcHRPclJlc291 cmNlLl9zb3VyY2VGcmFtZTsKICAgICAgICAgaWYgKHNjcmlwdE9yUmVzb3VyY2UgaW5zdGFuY2Vv ZiBXZWJJbnNwZWN0b3IuUmVzb3VyY2UpCi0gICAgICAgICAgICByZXR1cm4gdGhpcy5fc291cmNl RnJhbWVGb3JSZXNvdXJjZShzY3JpcHRPclJlc291cmNlKTsKLSAgICAgICAgaWYgKHNjcmlwdE9y UmVzb3VyY2UgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuU2NyaXB0KQotICAgICAgICAgICAgcmV0 dXJuIHRoaXMuc291cmNlRnJhbWVGb3JTY3JpcHQoc2NyaXB0T3JSZXNvdXJjZSk7Ci0gICAgfSwK LQotICAgIF9zb3VyY2VGcmFtZUZvclJlc291cmNlOiBmdW5jdGlvbihyZXNvdXJjZSkKLSAgICB7 Ci0gICAgICAgIHZhciB2aWV3ID0gV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5yZXNvdXJjZVZp ZXdGb3JSZXNvdXJjZShyZXNvdXJjZSk7Ci0gICAgICAgIGlmICghdmlldykKLSAgICAgICAgICAg IHJldHVybiBudWxsOwotCi0gICAgICAgIHJldHVybiB2aWV3LnNvdXJjZUZyYW1lOworICAgICAg ICAgICAgc2NyaXB0T3JSZXNvdXJjZS5fc291cmNlRnJhbWUgPSBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VWaWV3LnJlc291cmNlVmlld0ZvclJlc291cmNlKHNjcmlwdE9yUmVzb3VyY2UpOworICAgICAg ICBlbHNlIGlmIChzY3JpcHRPclJlc291cmNlIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNjcmlw dCkgeworICAgICAgICAgICAgdmFyIGNvbnRlbnRQcm92aWRlciA9IG5ldyBXZWJJbnNwZWN0b3Iu U291cmNlRnJhbWVDb250ZW50UHJvdmlkZXJGb3JTY3JpcHQoc2NyaXB0T3JSZXNvdXJjZSk7Cisg ICAgICAgICAgICBzY3JpcHRPclJlc291cmNlLl9zb3VyY2VGcmFtZSA9IG5ldyBXZWJJbnNwZWN0 b3IuU291cmNlRnJhbWUoY29udGVudFByb3ZpZGVyLCBzY3JpcHRPclJlc291cmNlLnNvdXJjZVVS TCwgdHJ1ZSk7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIHNjcmlwdE9yUmVzb3VyY2UuX3Nv dXJjZUZyYW1lOwogICAgIH0sCiAKICAgICBfc2hvd1NjcmlwdE9yUmVzb3VyY2U6IGZ1bmN0aW9u KHNjcmlwdE9yUmVzb3VyY2UsIG9wdGlvbnMpCkBAIC01MzEsMTIgKzUwNSw3IEBAIFdlYkluc3Bl Y3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIXNjcmlwdE9yUmVz b3VyY2UpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdmFyIHZpZXc7Ci0gICAgICAg IGlmIChzY3JpcHRPclJlc291cmNlIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlJlc291cmNlKQot ICAgICAgICAgICAgdmlldyA9IFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcucmVzb3VyY2VWaWV3 Rm9yUmVzb3VyY2Uoc2NyaXB0T3JSZXNvdXJjZSk7Ci0gICAgICAgIGVsc2UgaWYgKHNjcmlwdE9y UmVzb3VyY2UgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuU2NyaXB0KQotICAgICAgICAgICAgdmll dyA9IHRoaXMuc2NyaXB0Vmlld0ZvclNjcmlwdChzY3JpcHRPclJlc291cmNlKTsKLQorICAgICAg ICB2YXIgdmlldyA9IHRoaXMuX3NvdXJjZUZyYW1lRm9yU2NyaXB0T3JSZXNvdXJjZShzY3JpcHRP clJlc291cmNlKTsKICAgICAgICAgaWYgKCF2aWV3KQogICAgICAgICAgICAgcmV0dXJuOwogCkBA IC03MzgsNyArNzA3LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgICAgICAgICAgICAgdGhpcy5fcGF1c2VPbkV4Y2VwdGlvbkJ1dHRvbi50aXRsZSA9IFdl Ykluc3BlY3Rvci5VSVN0cmluZygiUGF1c2Ugb24gYWxsIGV4Y2VwdGlvbnMuXG5DbGljayB0byBQ YXVzZSBvbiB1bmNhdWdodCBleGNlcHRpb25zLiIpOwogICAgICAgICAgICAgZWxzZSBpZiAocGF1 c2VPbkV4Y2VwdGlvbnNTdGF0ZSA9PSBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLlBhdXNlT25F eGNlcHRpb25zU3RhdGUuUGF1c2VPblVuY2F1Z2h0RXhjZXB0aW9ucykKICAgICAgICAgICAgICAg ICB0aGlzLl9wYXVzZU9uRXhjZXB0aW9uQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJQYXVzZSBvbiB1bmNhdWdodCBleGNlcHRpb25zLlxuQ2xpY2sgdG8gTm90IHBhdXNlIG9u IGV4Y2VwdGlvbnMuIik7Ci0gICAgCisKICAgICAgICAgICAgIHRoaXMuX3BhdXNlT25FeGNlcHRp b25CdXR0b24uc3RhdGUgPSBwYXVzZU9uRXhjZXB0aW9uc1N0YXRlOwogICAgICAgICAgICAgV2Vi SW5zcGVjdG9yLnNldHRpbmdzLnBhdXNlT25FeGNlcHRpb25TdGF0ZSA9IHBhdXNlT25FeGNlcHRp b25zU3RhdGU7CiAgICAgICAgIH0KQEAgLTgyNCw4ICs3OTMsOCBAQCBXZWJJbnNwZWN0b3IuU2Ny aXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIF9mb3JtYXRTY3JpcHQ6IGZ1bmN0aW9uKCkK ICAgICB7Ci0gICAgICAgIGlmICh0aGlzLnZpc2libGVWaWV3ICYmIHRoaXMudmlzaWJsZVZpZXcu c291cmNlRnJhbWUpCi0gICAgICAgICAgICB0aGlzLnZpc2libGVWaWV3LnNvdXJjZUZyYW1lLmZv cm1hdFNvdXJjZSgpOworICAgICAgICBpZiAodGhpcy52aXNpYmxlVmlldykKKyAgICAgICAgICAg IHRoaXMudmlzaWJsZVZpZXcuZm9ybWF0U291cmNlKCk7CiAgICAgfSwKIAogICAgIF9lbmFibGVE ZWJ1Z2dpbmc6IGZ1bmN0aW9uKCkKQEAgLTEwNDMsMyArMTAxMiw0MSBAQCBXZWJJbnNwZWN0b3Iu U2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKIH0KIAogV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5l bC5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZTsKKwor CitXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVDb250ZW50UHJvdmlkZXJGb3JTY3JpcHQgPSBmdW5j dGlvbihzY3JpcHQpCit7CisgICAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lQ29udGVudFByb3Zp ZGVyLmNhbGwodGhpcyk7CisgICAgdGhpcy5fc2NyaXB0ID0gc2NyaXB0OworfQorCitXZWJJbnNw ZWN0b3IuU291cmNlRnJhbWVDb250ZW50UHJvdmlkZXJGb3JTY3JpcHQucHJvdG90eXBlID0gewor ICAgIHJlcXVlc3RDb250ZW50OiBmdW5jdGlvbihjYWxsYmFjaykKKyAgICB7CisgICAgICAgIGlm ICh0aGlzLl9zY3JpcHQuc291cmNlKSB7CisgICAgICAgICAgICBjYWxsYmFjaygidGV4dC9qYXZh c2NyaXB0IiwgdGhpcy5fc2NyaXB0LnNvdXJjZSk7CisgICAgICAgICAgICByZXR1cm47CisgICAg ICAgIH0KKworICAgICAgICBmdW5jdGlvbiBkaWRSZXF1ZXN0U291cmNlKGNvbnRlbnQpCisgICAg ICAgIHsKKyAgICAgICAgICAgIHZhciBzb3VyY2U7CisgICAgICAgICAgICBpZiAoY29udGVudCkg eworICAgICAgICAgICAgICAgIHZhciBwcmVmaXggPSAiIjsKKyAgICAgICAgICAgICAgICBmb3Ig KHZhciBpID0gMDsgaSA8IHRoaXMuX3NjcmlwdC5zdGFydGluZ0xpbmUgLSAxOyArK2kpCisgICAg ICAgICAgICAgICAgICAgIHByZWZpeCArPSAiXG4iOworICAgICAgICAgICAgICAgIHNvdXJjZSA9 IHByZWZpeCArIGNvbnRlbnQ7CisgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAgICBz b3VyY2UgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIjxzb3VyY2UgaXMgbm90IGF2YWlsYWJsZT4i KTsKKyAgICAgICAgICAgIGNhbGxiYWNrKCJ0ZXh0L2phdmFzY3JpcHQiLCBzb3VyY2UpOworICAg ICAgICB9CisgICAgICAgIHRoaXMuX3NjcmlwdC5yZXF1ZXN0U291cmNlKGRpZFJlcXVlc3RTb3Vy Y2UuYmluZCh0aGlzKSk7CisgICAgfSwKKworICAgIHNjcmlwdHM6IGZ1bmN0aW9uKCkKKyAgICB7 CisgICAgICAgIHJldHVybiBbdGhpcy5fc2NyaXB0XTsKKyAgICB9Cit9CisKK1dlYkluc3BlY3Rv ci5Tb3VyY2VGcmFtZUNvbnRlbnRQcm92aWRlckZvclNjcmlwdC5wcm90b3R5cGUuX19wcm90b19f ID0gV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lQ29udGVudFByb3ZpZGVyLnByb3RvdHlwZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCmlu ZGV4IDkzM2Y1NDguLmNlMzUzMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcwpAQCAtMjgsMTcgKzI4LDIyIEBACiAgKiBPRiBUSElT IFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFN QUdFLgogICovCiAKLVdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZSA9IGZ1bmN0aW9uKHBhcmVudEVs ZW1lbnQsIGNvbnRlbnRQcm92aWRlciwgdXJsLCBpc1NjcmlwdCkKK1dlYkluc3BlY3Rvci5Tb3Vy Y2VGcmFtZSA9IGZ1bmN0aW9uKGNvbnRlbnRQcm92aWRlciwgdXJsLCBpc1NjcmlwdCkKIHsKLSAg ICB0aGlzLl9wYXJlbnRFbGVtZW50ID0gcGFyZW50RWxlbWVudDsKKyAgICBXZWJJbnNwZWN0b3Iu Vmlldy5jYWxsKHRoaXMpOworCisgICAgdGhpcy5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoInNjcmlw dC12aWV3Iik7CisKICAgICB0aGlzLl9jb250ZW50UHJvdmlkZXIgPSBjb250ZW50UHJvdmlkZXI7 CiAgICAgdGhpcy5fdXJsID0gdXJsOwogICAgIHRoaXMuX2lzU2NyaXB0ID0gaXNTY3JpcHQ7CiAK LQogICAgIHRoaXMuX3RleHRNb2RlbCA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1vZGVs KCk7CiAgICAgdGhpcy5fdGV4dE1vZGVsLnJlcGxhY2VUYWJzV2l0aFNwYWNlcyA9IHRydWU7CiAK KyAgICB0aGlzLl9jdXJyZW50U2VhcmNoUmVzdWx0SW5kZXggPSAtMTsKKyAgICB0aGlzLl9zZWFy Y2hSZXN1bHRzID0gW107CisKICAgICB0aGlzLl9tZXNzYWdlcyA9IFtdOwogICAgIHRoaXMuX3Jv d01lc3NhZ2VzID0ge307CiAgICAgdGhpcy5fbWVzc2FnZUJ1YmJsZXMgPSB7fTsKQEAgLTQ4LDMx ICs1Myw0MyBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUgPSBmdW5jdGlvbihwYXJlbnRFbGVt ZW50LCBjb250ZW50UHJvdmlkZXIsIHVybCwgaXNTY3JpcAogCiBXZWJJbnNwZWN0b3IuU291cmNl RnJhbWUucHJvdG90eXBlID0gewogCi0gICAgc2V0IHZpc2libGUodmlzaWJsZSkKKyAgICBzaG93 OiBmdW5jdGlvbihwYXJlbnRFbGVtZW50KQogICAgIHsKKyAgICAgICAgV2ViSW5zcGVjdG9yLlZp ZXcucHJvdG90eXBlLnNob3cuY2FsbCh0aGlzLCBwYXJlbnRFbGVtZW50KTsKKwogICAgICAgICBp ZiAoIXRoaXMuX2NvbnRlbnRSZXF1ZXN0ZWQpIHsKICAgICAgICAgICAgIHRoaXMuX2NvbnRlbnRS ZXF1ZXN0ZWQgPSB0cnVlOwogICAgICAgICAgICAgdGhpcy5fY29udGVudFByb3ZpZGVyLnJlcXVl c3RDb250ZW50KHRoaXMuX2NyZWF0ZVRleHRWaWV3ZXIuYmluZCh0aGlzKSk7CiAgICAgICAgIH0K IAotICAgICAgICBpZiAodmlzaWJsZSkgewotICAgICAgICAgICAgaWYgKHRoaXMuX3RleHRWaWV3 ZXIgJiYgdGhpcy5fc2Nyb2xsVG9wKQorICAgICAgICBpZiAodGhpcy5fdGV4dFZpZXdlcikgewor ICAgICAgICAgICAgaWYgKHRoaXMuX3Njcm9sbFRvcCkKICAgICAgICAgICAgICAgICB0aGlzLl90 ZXh0Vmlld2VyLmVsZW1lbnQuc2Nyb2xsVG9wID0gdGhpcy5fc2Nyb2xsVG9wOwotICAgICAgICAg ICAgaWYgKHRoaXMuX3RleHRWaWV3ZXIgJiYgdGhpcy5fc2Nyb2xsTGVmdCkKKyAgICAgICAgICAg IGlmICh0aGlzLl9zY3JvbGxMZWZ0KQogICAgICAgICAgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIu ZWxlbWVudC5zY3JvbGxMZWZ0ID0gdGhpcy5fc2Nyb2xsTGVmdDsKLSAgICAgICAgICAgIGlmICh0 aGlzLl90ZXh0Vmlld2VyKQotICAgICAgICAgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIucmVzaXpl KCk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICB0aGlzLl9oaWRlUG9wdXAoKTsKLSAg ICAgICAgICAgIHRoaXMuX2NsZWFyTGluZUhpZ2hsaWdodCgpOwotICAgICAgICAgICAgaWYgKHRo aXMuX3RleHRWaWV3ZXIpIHsKLSAgICAgICAgICAgICAgICB0aGlzLl9zY3JvbGxUb3AgPSB0aGlz Ll90ZXh0Vmlld2VyLmVsZW1lbnQuc2Nyb2xsVG9wOwotICAgICAgICAgICAgICAgIHRoaXMuX3Nj cm9sbExlZnQgPSB0aGlzLl90ZXh0Vmlld2VyLmVsZW1lbnQuc2Nyb2xsTGVmdDsKLSAgICAgICAg ICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLmZyZWVDYWNoZWRFbGVtZW50cygpOwotICAgICAgICAg ICAgfQorICAgICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5yZXNpemUoKTsKKyAgICAgICAgfQor ICAgIH0sCisKKyAgICBoaWRlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBXZWJJbnNwZWN0 b3IuVmlldy5wcm90b3R5cGUuaGlkZS5jYWxsKHRoaXMpOworCisgICAgICAgIHRoaXMuX2hpZGVQ b3B1cCgpOworICAgICAgICB0aGlzLl9jbGVhckxpbmVIaWdobGlnaHQoKTsKKworICAgICAgICBp ZiAodGhpcy5fdGV4dFZpZXdlcikgeworICAgICAgICAgICAgdGhpcy5fc2Nyb2xsVG9wID0gdGhp cy5fdGV4dFZpZXdlci5lbGVtZW50LnNjcm9sbFRvcDsKKyAgICAgICAgICAgIHRoaXMuX3Njcm9s bExlZnQgPSB0aGlzLl90ZXh0Vmlld2VyLmVsZW1lbnQuc2Nyb2xsTGVmdDsKKyAgICAgICAgICAg IHRoaXMuX3RleHRWaWV3ZXIuZnJlZUNhY2hlZEVsZW1lbnRzKCk7CiAgICAgICAgIH0KICAgICB9 LAogCisgICAgaGFzQ29udGVudDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRy dWU7CisgICAgfSwKKwogICAgIG1hcmtEaWZmOiBmdW5jdGlvbihkaWZmRGF0YSkKICAgICB7CiAg ICAgICAgIGlmICh0aGlzLl9kaWZmTGluZXMgJiYgdGhpcy5fdGV4dFZpZXdlcikKQEAgLTE2Niw3 ICsxODMsNyBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAg ICBlbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlbW92ZSIsIHRoaXMuX21vdXNlTW92ZS5i aW5kKHRoaXMpLCB0cnVlKTsKICAgICAgICAgZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJzY3Jv bGwiLCB0aGlzLl9zY3JvbGwuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAgICAgIGVsZW1lbnQuYWRk RXZlbnRMaXN0ZW5lcigiZGJsY2xpY2siLCB0aGlzLl9kb3VibGVDbGljay5iaW5kKHRoaXMpLCB0 cnVlKTsKLSAgICAgICAgdGhpcy5fcGFyZW50RWxlbWVudC5hcHBlbmRDaGlsZChlbGVtZW50KTsK KyAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKGVsZW1lbnQpOwogCiAgICAgICAgIHRo aXMuX3RleHRWaWV3ZXIuYmVnaW5VcGRhdGVzKCk7CiAKQEAgLTI0MCw3ICsyNTcsNyBAQCBXZWJJ bnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIC8vIFNp bGVudCBjYXRjaC4KICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgY2FsbGJhY2sodGhpcy5f c2VhcmNoUmVzdWx0cy5sZW5ndGgpOworICAgICAgICAgICAgY2FsbGJhY2sodGhpcywgdGhpcy5f c2VhcmNoUmVzdWx0cy5sZW5ndGgpOwogICAgICAgICB9CiAKICAgICAgICAgaWYgKHRoaXMuX3Rl eHRWaWV3ZXIpCkBAIC05MTAsNyArOTI3LDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnBy b3RvdHlwZSA9IHsKICAgICB9CiB9CiAKLVdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5 cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLk9iamVjdC5wcm90b3R5cGU7CitXZWJJbnNwZWN0 b3IuU291cmNlRnJhbWUucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5WaWV3LnBy b3RvdHlwZTsKIAogCiBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVDb250ZW50UHJvdmlkZXIgPSBm dW5jdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NvdXJjZVZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJj ZVZpZXcuanMKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGEyZTc5ODIuLjAwMDAwMDAK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VWaWV3LmpzCisr KyAvZGV2L251bGwKQEAgLTEsMTcxICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDcs IDIwMDggQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqCi0gKiBSZWRpc3RyaWJ1 dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQK LSAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dp bmcgY29uZGl0aW9ucwotICogYXJlIG1ldDoKLSAqCi0gKiAxLiAgUmVkaXN0cmlidXRpb25zIG9m IHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIu Ci0gKiAyLiAgUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRo ZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCi0gKiAgICAgZG9jdW1lbnRhdGlv biBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4K LSAqIDMuICBOZWl0aGVyIHRoZSBuYW1lIG9mIEFwcGxlIENvbXB1dGVyLCBJbmMuICgiQXBwbGUi KSBub3IgdGhlIG5hbWVzIG9mCi0gKiAgICAgaXRzIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0 byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZAotICogICAgIGZyb20gdGhpcyBz b2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KLSAqCi0g KiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIEFORCBJVFMgQ09OVFJJQlVUT1JT ICJBUyBJUyIgQU5EIEFOWQotICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAotICogV0FSUkFOVElFUyBPRiBN RVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRQot ICogRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgT1IgSVRTIENPTlRSSUJVVE9S UyBCRSBMSUFCTEUgRk9SIEFOWQotICogRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BF Q0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMKLSAqIChJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBT RVJWSUNFUzsKLSAqIExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJ TlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORAotICogT04gQU5ZIFRIRU9SWSBPRiBMSUFC SUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKLSAq IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBP VVQgT0YgVEhFIFVTRSBPRgotICogVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRI RSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KLSAqLwotCi1XZWJJbnNwZWN0b3IuU291cmNl VmlldyA9IGZ1bmN0aW9uKHJlc291cmNlKQotewotICAgIFdlYkluc3BlY3Rvci5SZXNvdXJjZVZp ZXcuY2FsbCh0aGlzLCByZXNvdXJjZSk7Ci0KLSAgICB0aGlzLmVsZW1lbnQuYWRkU3R5bGVDbGFz cygic291cmNlIik7Ci0KLSAgICB2YXIgY29udGVudFByb3ZpZGVyID0gbmV3IFdlYkluc3BlY3Rv ci5Tb3VyY2VGcmFtZUNvbnRlbnRQcm92aWRlckZvclJlc291cmNlKHJlc291cmNlKTsKLSAgICB2 YXIgaXNTY3JpcHQgPSByZXNvdXJjZS50eXBlID09PSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlw ZS5TY3JpcHQ7Ci0gICAgdGhpcy5zb3VyY2VGcmFtZSA9IG5ldyBXZWJJbnNwZWN0b3IuU291cmNl RnJhbWUodGhpcy5lbGVtZW50LCBjb250ZW50UHJvdmlkZXIsIHJlc291cmNlLnVybCwgaXNTY3Jp cHQpOwotfQotCi1XZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUgPSB7Ci0gICAgc2hv dzogZnVuY3Rpb24ocGFyZW50RWxlbWVudCkKLSAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5W aWV3LnByb3RvdHlwZS5zaG93LmNhbGwodGhpcywgcGFyZW50RWxlbWVudCk7Ci0gICAgICAgIHRo aXMuc291cmNlRnJhbWUudmlzaWJsZSA9IHRydWU7Ci0gICAgfSwKLQotICAgIGhpZGU6IGZ1bmN0 aW9uKCkKLSAgICB7Ci0gICAgICAgIHRoaXMuc291cmNlRnJhbWUudmlzaWJsZSA9IGZhbHNlOwot ICAgICAgICBXZWJJbnNwZWN0b3IuVmlldy5wcm90b3R5cGUuaGlkZS5jYWxsKHRoaXMpOwotICAg IH0sCi0KLSAgICByZXNpemU6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHRoaXMuc291cmNl RnJhbWUucmVzaXplKCk7Ci0gICAgfSwKLQotICAgIGdldCBzY3JvbGxUb3AoKQotICAgIHsKLSAg ICAgICAgcmV0dXJuIHRoaXMuc291cmNlRnJhbWUuc2Nyb2xsVG9wOwotICAgIH0sCi0KLSAgICBz ZXQgc2Nyb2xsVG9wKHNjcm9sbFRvcCkKLSAgICB7Ci0gICAgICAgIHRoaXMuc291cmNlRnJhbWUu c2Nyb2xsVG9wID0gc2Nyb2xsVG9wOwotICAgIH0sCi0KLSAgICBoYXNDb250ZW50OiBmdW5jdGlv bigpCi0gICAgewotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9LAotCi0gICAgLy8gVGhlIHJl c3Qgb2YgdGhlIG1ldGhvZHMgaW4gdGhpcyBwcm90b3R5cGUgbmVlZCB0byBiZSBnZW5lcmljIGVu b3VnaCB0byB3b3JrIHdpdGggYSBTY3JpcHRWaWV3LgotICAgIC8vIFRoZSBTY3JpcHRWaWV3IHBy b3RvdHlwZSBwdWxscyB0aGVzZSBtZXRob2RzIGludG8gaXQncyBwcm90b3R5cGUgdG8gYXZvaWQg ZHVwbGljYXRlIGNvZGUuCi0KLSAgICBzZWFyY2hDYW5jZWxlZDogZnVuY3Rpb24oKQotICAgIHsK LSAgICAgICAgdGhpcy5zb3VyY2VGcmFtZS5zZWFyY2hDYW5jZWxlZCgpOwotICAgIH0sCi0KLSAg ICBwZXJmb3JtU2VhcmNoOiBmdW5jdGlvbihxdWVyeSwgZmluaXNoZWRDYWxsYmFjaykKLSAgICB7 Ci0gICAgICAgIHRoaXMuc291cmNlRnJhbWUucGVyZm9ybVNlYXJjaChxdWVyeSwgZmluaXNoZWRD YWxsYmFjay5iaW5kKG51bGwsIHRoaXMpKTsKLSAgICB9LAotCi0gICAganVtcFRvRmlyc3RTZWFy Y2hSZXN1bHQ6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHRoaXMuc291cmNlRnJhbWUuanVt cFRvRmlyc3RTZWFyY2hSZXN1bHQoKTsKLSAgICB9LAotCi0gICAganVtcFRvTGFzdFNlYXJjaFJl c3VsdDogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgdGhpcy5zb3VyY2VGcmFtZS5qdW1wVG9M YXN0U2VhcmNoUmVzdWx0KCk7Ci0gICAgfSwKLQotICAgIGp1bXBUb05leHRTZWFyY2hSZXN1bHQ6 IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHRoaXMuc291cmNlRnJhbWUuanVtcFRvTmV4dFNl YXJjaFJlc3VsdCgpOwotICAgIH0sCi0KLSAgICBqdW1wVG9QcmV2aW91c1NlYXJjaFJlc3VsdDog ZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgdGhpcy5zb3VyY2VGcmFtZS5qdW1wVG9QcmV2aW91 c1NlYXJjaFJlc3VsdCgpOwotICAgIH0sCi0KLSAgICBzaG93aW5nRmlyc3RTZWFyY2hSZXN1bHQ6 IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHRoaXMuc291cmNlRnJhbWUuc2hvd2luZ0ZpcnN0 U2VhcmNoUmVzdWx0KCk7Ci0gICAgfSwKLQotICAgIHNob3dpbmdMYXN0U2VhcmNoUmVzdWx0OiBm dW5jdGlvbigpCi0gICAgewotICAgICAgICB0aGlzLnNvdXJjZUZyYW1lLnNob3dpbmdMYXN0U2Vh cmNoUmVzdWx0KCk7Ci0gICAgfSwKLQotICAgIHJldmVhbExpbmU6IGZ1bmN0aW9uKGxpbmVOdW1i ZXIpCi0gICAgewotICAgICAgICB0aGlzLnNvdXJjZUZyYW1lLnJldmVhbExpbmUobGluZU51bWJl cik7Ci0gICAgfSwKLQotICAgIGhpZ2hsaWdodExpbmU6IGZ1bmN0aW9uKGxpbmVOdW1iZXIpCi0g ICAgewotICAgICAgICB0aGlzLnNvdXJjZUZyYW1lLmhpZ2hsaWdodExpbmUobGluZU51bWJlcik7 Ci0gICAgfSwKLQotICAgIGFkZE1lc3NhZ2U6IGZ1bmN0aW9uKG1zZykKLSAgICB7Ci0gICAgICAg IHRoaXMuc291cmNlRnJhbWUuYWRkTWVzc2FnZShtc2cpOwotICAgIH0sCi0KLSAgICBjbGVhck1l c3NhZ2VzOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICB0aGlzLnNvdXJjZUZyYW1lLmNsZWFy TWVzc2FnZXMoKTsKLSAgICB9Ci19Ci0KLVdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlw ZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3LnByb3RvdHlwZTsKLQotCi1X ZWJJbnNwZWN0b3IuU291cmNlRnJhbWVDb250ZW50UHJvdmlkZXJGb3JSZXNvdXJjZSA9IGZ1bmN0 aW9uKHJlc291cmNlKQotewotICAgIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZUNvbnRlbnRQcm92 aWRlci5jYWxsKHRoaXMpOwotICAgIHRoaXMuX3Jlc291cmNlID0gcmVzb3VyY2U7Ci19Ci0KLS8v VGhpcyBpcyBhIG1hcCBmcm9tIHJlc291cmNlLnR5cGUgdG8gbWltZSB0eXBlcwotLy9mb3VuZCBp biBXZWJJbnNwZWN0b3IuU291cmNlVG9rZW5pemVyLlJlZ2lzdHJ5LgotV2ViSW5zcGVjdG9yLlNv dXJjZUZyYW1lQ29udGVudFByb3ZpZGVyRm9yUmVzb3VyY2UuRGVmYXVsdE1JTUVUeXBlRm9yUmVz b3VyY2VUeXBlID0gewotIDA6ICJ0ZXh0L2h0bWwiLAotIDE6ICJ0ZXh0L2NzcyIsCi0gNDogInRl eHQvamF2YXNjcmlwdCIKLX0KLQotV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lQ29udGVudFByb3Zp ZGVyRm9yUmVzb3VyY2UucHJvdG90eXBlID0gewotICAgIHJlcXVlc3RDb250ZW50OiBmdW5jdGlv bihjYWxsYmFjaykKLSAgICB7Ci0gICAgICAgIGZ1bmN0aW9uIGNvbnRlbnRMb2FkZWQoY29udGVu dCkKLSAgICAgICAgewotICAgICAgICAgICAgdmFyIG1pbWVUeXBlID0gV2ViSW5zcGVjdG9yLlNv dXJjZUZyYW1lQ29udGVudFByb3ZpZGVyRm9yUmVzb3VyY2UuRGVmYXVsdE1JTUVUeXBlRm9yUmVz b3VyY2VUeXBlW3RoaXMuX3Jlc291cmNlLnR5cGVdIHx8IHRoaXMuX3Jlc291cmNlLm1pbWVUeXBl OwotICAgICAgICAgICAgY2FsbGJhY2sobWltZVR5cGUsIGNvbnRlbnQpOwotICAgICAgICB9Ci0g ICAgICAgIHRoaXMuX3Jlc291cmNlLnJlcXVlc3RDb250ZW50KGNvbnRlbnRMb2FkZWQuYmluZCh0 aGlzKSk7Ci0gICAgfSwKLQotICAgIHNjcmlwdHM6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAg IHJldHVybiBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5zY3JpcHRzRm9yVVJMKHRoaXMuX3Jl c291cmNlLnVybCk7Ci0gICAgfQotfQotCi1XZWJJbnNwZWN0b3IuU291cmNlRnJhbWVDb250ZW50 UHJvdmlkZXJGb3JSZXNvdXJjZS5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlNv dXJjZUZyYW1lQ29udGVudFByb3ZpZGVyLnByb3RvdHlwZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYwppbmRleCBlZGMxODYxLi5lODQwMWU0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjCkBAIC04NCw3 ICs4NCw2IEBACiAgICAgPGZpbGU+U2NyaXB0Rm9ybWF0dGVyLmpzPC9maWxlPgogICAgIDxmaWxl PlNjcmlwdEZvcm1hdHRlcldvcmtlci5qczwvZmlsZT4KICAgICA8ZmlsZT5TY3JpcHRzUGFuZWwu anM8L2ZpbGU+Ci0gICAgPGZpbGU+U2NyaXB0Vmlldy5qczwvZmlsZT4KICAgICA8ZmlsZT5TZWN0 aW9uLmpzPC9maWxlPgogICAgIDxmaWxlPlNldHRpbmdzLmpzPC9maWxlPgogICAgIDxmaWxlPlNo b3J0Y3V0c0hlbHAuanM8L2ZpbGU+CkBAIC05NSw3ICs5NCw2IEBACiAgICAgPGZpbGU+U291cmNl SFRNTFRva2VuaXplci5qczwvZmlsZT4KICAgICA8ZmlsZT5Tb3VyY2VKYXZhU2NyaXB0VG9rZW5p emVyLmpzPC9maWxlPgogICAgIDxmaWxlPlNvdXJjZVRva2VuaXplci5qczwvZmlsZT4KLSAgICA8 ZmlsZT5Tb3VyY2VWaWV3LmpzPC9maWxlPgogICAgIDxmaWxlPlN0YXR1c0JhckJ1dHRvbi5qczwv ZmlsZT4KICAgICA8ZmlsZT5TdHlsZXNTaWRlYmFyUGFuZS5qczwvZmlsZT4KICAgICA8ZmlsZT5T dW1tYXJ5QmFyLmpzPC9maWxlPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvaW5zcGVjdG9yLmh0bWwKaW5kZXggMGUwYjllOS4uYWZmODU3MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbAorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sCkBAIC0xMDEs NiArMTAxLDggQEAgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIg c3JjPSJFbGVtZW50c1BhbmVsLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQv amF2YXNjcmlwdCIgc3JjPSJOZXR3b3JrUGFuZWwuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQg dHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IkluamVjdGVkRmFrZVdvcmtlci5qcyI+PC9zY3Jp cHQ+CisgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iU291cmNlRnJhbWUu anMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlJl c291cmNlVmlldy5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3Jp cHQiIHNyYz0iU2NyaXB0c1BhbmVsLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRl eHQvamF2YXNjcmlwdCIgc3JjPSJSZXNvdXJjZXNQYW5lbC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNj cmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iUHJvZmlsZXNQYW5lbC5qcyI+PC9zY3Jp cHQ+CkBAIC0xMjAsOCArMTIyLDYgQEAgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9G IFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAgICA8c2NyaXB0IHR5cGU9InRleHQv amF2YXNjcmlwdCIgc3JjPSJSZXNvdXJjZUNvb2tpZXNWaWV3LmpzIj48L3NjcmlwdD4KICAgICA8 c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJSZXNvdXJjZVRpbWluZ1ZpZXcuanMi Pjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9Ik5ldHdv cmtJdGVtVmlldy5qcyI+PC9zY3JpcHQ+Ci0gICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3Jp cHQiIHNyYz0iUmVzb3VyY2VWaWV3LmpzIj48L3NjcmlwdD4KLSAgICA8c2NyaXB0IHR5cGU9InRl eHQvamF2YXNjcmlwdCIgc3JjPSJTb3VyY2VGcmFtZS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlw dCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iU2NyaXB0Rm9ybWF0dGVyLmpzIj48L3Njcmlw dD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJET01TeW50YXhIaWdo bGlnaHRlci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQi IHNyYz0iVGV4dEVkaXRvck1vZGVsLmpzIj48L3NjcmlwdD4KQEAgLTEzMSwxMiArMTMxLDEwIEBA IFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VD SCBEQU1BR0UuCiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iU291cmNl Q1NTVG9rZW5pemVyLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNj cmlwdCIgc3JjPSJTb3VyY2VIVE1MVG9rZW5pemVyLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0 IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJTb3VyY2VKYXZhU2NyaXB0VG9rZW5pemVyLmpz Ij48L3NjcmlwdD4KLSAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJTb3Vy Y2VWaWV3LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIg c3JjPSJGb250Vmlldy5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFz Y3JpcHQiIHNyYz0iSW1hZ2VWaWV3LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRl eHQvamF2YXNjcmlwdCIgc3JjPSJEYXRhYmFzZVRhYmxlVmlldy5qcyI+PC9zY3JpcHQ+CiAgICAg PHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iRGF0YWJhc2VRdWVyeVZpZXcuanMi Pjwvc2NyaXB0PgotICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlNjcmlw dFZpZXcuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBz cmM9IlByb2ZpbGVEYXRhR3JpZFRyZWUuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0i dGV4dC9qYXZhc2NyaXB0IiBzcmM9IkJvdHRvbVVwUHJvZmlsZURhdGFHcmlkVHJlZS5qcyI+PC9z Y3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iVG9wRG93blBy b2ZpbGVEYXRhR3JpZFRyZWUuanMiPjwvc2NyaXB0Pgo=