50029 2010-11-24 09:00:35 -0800 Web Inspector: place local modifications to under original resource nodes in the resource panel. 2010-11-24 11:07:44 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman abarth apavlov bweinstein eric joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 313322 0 pfeldman 2010-11-24 09:00:35 -0800 Patch to follow. 313340 1 74769 pfeldman 2010-11-24 09:29:35 -0800 Created attachment 74769 [PATCH] Proposed change. 313352 2 74769 yurys 2010-11-24 09:50:11 -0800 Comment on attachment 74769 [PATCH] Proposed change. View in context: https://bugs.webkit.org/attachment.cgi?id=74769&action=review > WebCore/inspector/front-end/Resource.js:639 > + overrideContent: function(content) This method should be renamed to setInitialContent > WebCore/inspector/front-end/SourceView.js:151 > + this.resource.content = newContent; Move this line to _editLineComplete. > WebCore/inspector/front-end/SourceView.js:155 > + _editLineComplete: function(scrollTop) scrollTop is not used. 313362 3 pfeldman 2010-11-24 10:06:48 -0800 M WebCore/ChangeLog M WebCore/English.lproj/localizedStrings.js M WebCore/inspector/Inspector.idl M WebCore/inspector/InspectorController.cpp M WebCore/inspector/InspectorResourceAgent.cpp M WebCore/inspector/InspectorResourceAgent.h M WebCore/inspector/front-end/CSSStyleModel.js M WebCore/inspector/front-end/NetworkPanel.js M WebCore/inspector/front-end/Resource.js M WebCore/inspector/front-end/ResourceManager.js M WebCore/inspector/front-end/ResourcesPanel.js M WebCore/inspector/front-end/SourceFrame.js M WebCore/inspector/front-end/SourceView.js M WebCore/inspector/front-end/StylesSidebarPane.js Committed r72684 313393 4 webkit.review.bot 2010-11-24 11:07:44 -0800 http://trac.webkit.org/changeset/72684 might have broken Leopard Intel Release (Tests) 74769 2010-11-24 09:29:35 -0800 2010-11-24 09:50:11 -0800 [PATCH] Proposed change. local_changes text/plain 19757 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODhhYjdjMS4uM2MxM2JlYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw1MCBAQAorMjAxMC0xMS0yNCAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBwbGFjZSBsb2NhbCBtb2RpZmljYXRp b25zIHRvIHVuZGVyIG9yaWdpbmFsCisgICAgICAgIHJlc291cmNlIG5vZGVzIGluIHRoZSByZXNv dXJjZSBwYW5lbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTUwMDI5CisKKyAgICAgICAgKiBFbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBlLnNldFJ1bGVTZWxlY3Rvcik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90b3R5cGUuYWRkUnVsZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90b3R5cGUuX3N0eWxlU2hl ZXRDaGFuZ2VkLmNhbGxiYWNrKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVs LnByb3RvdHlwZS5fc3R5bGVTaGVldENoYW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNT U1N0eWxlRGVjbGFyYXRpb24ucHJvdG90eXBlLmluc2VydFByb3BlcnR5QXQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkNTU1Byb3BlcnR5LnByb3RvdHlwZS5zZXRUZXh0KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5DU1NQcm9wZXJ0eS5wcm90b3R5cGUuc2V0RGlzYWJsZWQuY2FsbGJhY2spOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1Byb3BlcnR5LnByb3RvdHlwZS5zZXREaXNhYmxlZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldC5wcm90b3R5cGUuc2V0VGV4dCk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZS5yZWZyZXNoUmVzb3VyY2UpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLnNldCBjb250ZW50KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuZ2V0IGNvbnRlbnRUaW1lc3RhbXApOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5vdmVycmlkZUNvbnRlbnQpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VNYW5hZ2VyLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlJlc291cmNlTWFuYWdlci5wcm90b3R5cGUuc2V0T3ZlcnJpZGVDb250ZW50 KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUucmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5faW5uZXJTaG93Vmlldyk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRnJhbWVSZXNvdXJjZVRyZWVFbGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5GcmFtZVJlc291cmNlVHJlZUVsZW1lbnQucHJvdG90eXBlLl9lcnJvcnNXYXJuaW5nc1VwZGF0 ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZyYW1lUmVzb3VyY2VUcmVlRWxlbWVudC5wcm90 b3R5cGUuX2NvbnRlbnRDaGFuZ2VkLmVsc2UuZmluaXNoZWQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkZyYW1lUmVzb3VyY2VUcmVlRWxlbWVudC5wcm90b3R5cGUuX2NvbnRlbnRDaGFuZ2VkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVJldmlzaW9uVHJlZUVsZW1lbnQpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLmdldCBzY3JvbGxUb3ApOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5zZXQgc2Nyb2xsVG9wKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUuZ2V0IHNjcm9sbFRvcCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUuc2V0IHNjcm9sbFRvcCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUuX2VkaXRMaW5lKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlwZS5fZWRpdExpbmVDb21wbGV0ZSk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlKToKKwogMjAx MC0xMS0yNCAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBDc2FiYSBPc3p0cm9nb27DoWMuCmRpZmYgLS1naXQgYS9XZWJDb3JlL0Vu Z2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1dlYkNvcmUvRW5nbGlzaC5scHJvai9s b2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IGIxOTFhYTcuLjVlMzljNjQgMTAwNjQ0CkJpbmFyeSBm aWxlcyBhL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGFuZCBiL1dl YkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGRpZmZlcgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanMgYi9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qcwppbmRleCA1NTMwZjU3Li40YjZj ZmIyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2Rl bC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qcwpA QCAtMTE5LDcgKzExOSw3IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVsLnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgIHZhciBkb2VzQWZmZWN0U2VsZWN0ZWROb2RlID0gKHNlbGVjdGVkTm9k ZUlkcy5pbmRleE9mKG5vZGVJZCkgPj0gMCk7CiAgICAgICAgICAgICB2YXIgcnVsZSA9IFdlYklu c3BlY3Rvci5DU1NSdWxlLnBhcnNlUGF5bG9hZChydWxlUGF5bG9hZCk7CiAgICAgICAgICAgICBz dWNjZXNzQ2FsbGJhY2socnVsZSwgZG9lc0FmZmVjdFNlbGVjdGVkTm9kZSk7Ci0gICAgICAgICAg ICB0aGlzLl9zdHlsZVNoZWV0Q2hhbmdlZChydWxlLmlkLnN0eWxlU2hlZXRJZCk7CisgICAgICAg ICAgICB0aGlzLl9zdHlsZVNoZWV0Q2hhbmdlZChydWxlLmlkLnN0eWxlU2hlZXRJZCwgdHJ1ZSk7 CiAgICAgICAgIH0KIAogICAgICAgICBmdW5jdGlvbiBjYWxsYmFjayhub2RlSWQsIHN1Y2Nlc3ND YWxsYmFjaywgZmFpbHVyZUNhbGxiYWNrLCBuZXdTZWxlY3RvciwgcnVsZVBheWxvYWQpCkBAIC0x NDAsNyArMTQwLDcgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBlID0gewog ICAgICAgICAgICAgdmFyIGRvZXNBZmZlY3RTZWxlY3RlZE5vZGUgPSAoc2VsZWN0ZWROb2RlSWRz LmluZGV4T2Yobm9kZUlkKSA+PSAwKTsKICAgICAgICAgICAgIHZhciBydWxlID0gV2ViSW5zcGVj dG9yLkNTU1J1bGUucGFyc2VQYXlsb2FkKHJ1bGVQYXlsb2FkKTsKICAgICAgICAgICAgIHN1Y2Nl c3NDYWxsYmFjayhydWxlLCBkb2VzQWZmZWN0U2VsZWN0ZWROb2RlKTsKLSAgICAgICAgICAgIHRo aXMuX3N0eWxlU2hlZXRDaGFuZ2VkKHJ1bGUuaWQuc3R5bGVTaGVldElkKTsKKyAgICAgICAgICAg IHRoaXMuX3N0eWxlU2hlZXRDaGFuZ2VkKHJ1bGUuaWQuc3R5bGVTaGVldElkLCB0cnVlKTsKICAg ICAgICAgfQogCiAgICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNrKHN1Y2Nlc3NDYWxsYmFjaywgZmFp bHVyZUNhbGxiYWNrLCBzZWxlY3RvciwgcnVsZVBheWxvYWQpCkBAIC0xNTUsOSArMTU1LDE4IEBA IFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgSW5zcGVj dG9yQmFja2VuZC5hZGRSdWxlMihub2RlSWQsIHNlbGVjdG9yLCBjYWxsYmFjay5iaW5kKHRoaXMs IHN1Y2Nlc3NDYWxsYmFjaywgZmFpbHVyZUNhbGxiYWNrLCBzZWxlY3RvcikpOwogICAgIH0sCiAK LSAgICBfc3R5bGVTaGVldENoYW5nZWQ6IGZ1bmN0aW9uKHN0eWxlU2hlZXRJZCkKKyAgICBfc3R5 bGVTaGVldENoYW5nZWQ6IGZ1bmN0aW9uKHN0eWxlU2hlZXRJZCwgbWFqb3JDaGFuZ2UpCiAgICAg ewotICAgICAgICAvLyBGSVhNRTogdXNlIEluc3BlY3RvckJhY2tlbmQuZ2V0U3R5bGVTaGVldFRl eHQyIGhlcmU7CisgICAgICAgIGlmICghbWFqb3JDaGFuZ2UgfHwgIXN0eWxlU2hlZXRJZCkKKyAg ICAgICAgICAgIHJldHVybjsKKworICAgICAgICBmdW5jdGlvbiBjYWxsYmFjayhocmVmLCBjb250 ZW50KQorICAgICAgICB7CisgICAgICAgICAgICB2YXIgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3Iu cmVzb3VyY2VNYW5hZ2VyLnJlc291cmNlRm9yVVJMKGhyZWYpOworICAgICAgICAgICAgaWYgKHJl c291cmNlKQorICAgICAgICAgICAgICAgIHJlc291cmNlLmNvbnRlbnQgPSBjb250ZW50OworICAg ICAgICB9CisgICAgICAgIEluc3BlY3RvckJhY2tlbmQuZ2V0U3R5bGVTaGVldFRleHQyKHN0eWxl U2hlZXRJZCwgY2FsbGJhY2spOwogICAgIH0KIH0KIApAQCAtMzIzLDcgKzMzMiw3IEBAIFdlYklu c3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAg ICB1c2VyQ2FsbGJhY2sobnVsbCk7CiAgICAgICAgICAgICBlbHNlIHsKICAgICAgICAgICAgICAg ICB1c2VyQ2FsbGJhY2soV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb24ucGFyc2VQYXls b2FkKHBheWxvYWQpKTsKLSAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuY3NzTW9kZWwuX3N0 eWxlU2hlZXRDaGFuZ2VkKHRoaXMuaWQuc3R5bGVTaGVldElkKTsKKyAgICAgICAgICAgICAgICBX ZWJJbnNwZWN0b3IuY3NzTW9kZWwuX3N0eWxlU2hlZXRDaGFuZ2VkKHRoaXMuaWQuc3R5bGVTaGVl dElkLCB0cnVlKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCkBAIC00MzMsNyArNDQyLDcg QEAgV2ViSW5zcGVjdG9yLkNTU1Byb3BlcnR5LnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAg Ly8gUmVwbGFjZXMgInByb3BlcnR5TmFtZTogcHJvcGVydHlWYWx1ZSBbIWltcG9ydGFudF07IiBp biB0aGUgc3R5bGVzaGVldCBieSBhbiBhcmJpdHJhcnkgcHJvcGVydHlUZXh0LgotICAgIHNldFRl eHQ6IGZ1bmN0aW9uKHByb3BlcnR5VGV4dCwgdXNlckNhbGxiYWNrKQorICAgIHNldFRleHQ6IGZ1 bmN0aW9uKHByb3BlcnR5VGV4dCwgbWFqb3JDaGFuZ2UsIHVzZXJDYWxsYmFjaykKICAgICB7CiAg ICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNrKHN0eWxlUGF5bG9hZCkKICAgICAgICAgewpAQCAtNDQ3 LDcgKzQ1Niw3IEBAIFdlYkluc3BlY3Rvci5DU1NQcm9wZXJ0eS5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICBlbHNlIHsKICAgICAgICAgICAgICAgICB2YXIgc3R5bGUgPSBXZWJJbnNwZWN0b3Iu Q1NTU3R5bGVEZWNsYXJhdGlvbi5wYXJzZVBheWxvYWQoc3R5bGVQYXlsb2FkKTsKICAgICAgICAg ICAgICAgICB1c2VyQ2FsbGJhY2soc3R5bGUpOwotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5jc3NNb2RlbC5fc3R5bGVTaGVldENoYW5nZWQoc3R5bGUuaWQuc3R5bGVTaGVldElkKTsKKyAg ICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuY3NzTW9kZWwuX3N0eWxlU2hlZXRDaGFuZ2VkKHN0 eWxlLmlkLnN0eWxlU2hlZXRJZCwgbWFqb3JDaGFuZ2UpOwogICAgICAgICAgICAgfQogICAgICAg ICB9CiAKQEAgLTQ4MCw3ICs0ODksNyBAQCBXZWJJbnNwZWN0b3IuQ1NTUHJvcGVydHkucHJvdG90 eXBlID0gewogICAgICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAgICAgdmFyIHN0eWxlID0g V2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb24ucGFyc2VQYXlsb2FkKHN0eWxlUGF5bG9h ZCk7CiAgICAgICAgICAgICAgICAgdXNlckNhbGxiYWNrKHN0eWxlKTsKLSAgICAgICAgICAgICAg ICBXZWJJbnNwZWN0b3IuY3NzTW9kZWwuX3N0eWxlU2hlZXRDaGFuZ2VkKHRoaXMub3duZXJTdHls ZS5pZC5zdHlsZVNoZWV0SWQpOworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5jc3NNb2Rl bC5fc3R5bGVTaGVldENoYW5nZWQodGhpcy5vd25lclN0eWxlLmlkLnN0eWxlU2hlZXRJZCwgZmFs c2UpOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAKQEAgLTUzMiw3ICs1NDEsNyBAQCBXZWJJ bnNwZWN0b3IuQ1NTU3R5bGVTaGVldC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgdXNl ckNhbGxiYWNrKG51bGwpOwogICAgICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAgICAgdXNl ckNhbGxiYWNrKG5ldyBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldChzdHlsZVNoZWV0UGF5bG9h ZCkpOwotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5jc3NNb2RlbC5fc3R5bGVTaGVldENo YW5nZWQodGhpcy5pZCk7CisgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmNzc01vZGVsLl9z dHlsZVNoZWV0Q2hhbmdlZCh0aGlzLmlkLCB0cnVlKTsKICAgICAgICAgICAgIH0KICAgICAgICAg fQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVs LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwppbmRleCA1 ZWYxMDk0Li44NGRlNTQ4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv TmV0d29ya1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3Jr UGFuZWwuanMKQEAgLTc5Niw2ICs3OTYsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnBy b3RvdHlwZSA9IHsKIAogICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLlJlc291cmNlTWFuYWdlci5y ZXNvdXJjZVZpZXdUeXBlTWF0Y2hlc1Jlc291cmNlKHJlc291cmNlLCByZXNvdXJjZS5fcmVzb3Vy Y2VzVmlldykpCiAgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgdmFyIG5ld1ZpZXcgPSBX ZWJJbnNwZWN0b3IuUmVzb3VyY2VNYW5hZ2VyLmNyZWF0ZVJlc291cmNlVmlldyhyZXNvdXJjZSk7 CiAKICAgICAgICAgdmFyIG9sZFZpZXcgPSByZXNvdXJjZS5fcmVzb3VyY2VzVmlldzsKZGlmZiAt LWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcyBiL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcwppbmRleCA3OTk5N2RiLi4yNzk5OGU0IDEw MDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKKysrIGIv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzCkBAIC02MjUsNiArNjI1LDE5 IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAKICAgICBzZXQgY29udGVu dChjb250ZW50KQogICAgIHsKKyAgICAgICAgdmFyIGRhdGEgPSB7IG9sZENvbnRlbnQ6IHRoaXMu X2NvbnRlbnQsIG9sZENvbnRlbnRUaW1lc3RhbXA6IHRoaXMuX2NvbnRlbnRUaW1lc3RhbXAgfTsK KyAgICAgICAgdGhpcy5fY29udGVudCA9IGNvbnRlbnQ7CisgICAgICAgIHRoaXMuX2NvbnRlbnRU aW1lc3RhbXAgPSBuZXcgRGF0ZSgpOworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3Rl bmVycygiY29udGVudC1jaGFuZ2VkIiwgZGF0YSk7CisgICAgfSwKKworICAgIGdldCBjb250ZW50 VGltZXN0YW1wKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9jb250ZW50VGltZXN0YW1w OworICAgIH0sCisKKyAgICBvdmVycmlkZUNvbnRlbnQ6IGZ1bmN0aW9uKGNvbnRlbnQpCisgICAg ewogICAgICAgICB0aGlzLl9jb250ZW50ID0gY29udGVudDsKICAgICB9LAogCmRpZmYgLS1naXQg YS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VNYW5hZ2VyLmpzIGIvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlTWFuYWdlci5qcwppbmRleCA0YmFmOGY4Li45 YTNjOThhIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VN YW5hZ2VyLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZU1hbmFn ZXIuanMKQEAgLTI1Myw3ICsyNTMsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VNYW5hZ2VyLnBy b3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICByZXNvdXJjZS50eXBl ID0gV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGVbdHlwZV07Ci0gICAgICAgIHJlc291cmNlLmNv bnRlbnQgPSBzb3VyY2VTdHJpbmc7CisgICAgICAgIHJlc291cmNlLm92ZXJyaWRlQ29udGVudChz b3VyY2VTdHJpbmcpOwogICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnJlc291cmNlcy5yZWZy ZXNoUmVzb3VyY2UocmVzb3VyY2UpOwogICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLm5ldHdv cmsucmVmcmVzaFJlc291cmNlKHJlc291cmNlKTsKICAgICB9LApkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IDY5MTEyMDcuLjAyYTRlMjMgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwor KysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKQEAgLTU2 LDEwICs1Niw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbCA9IGZ1bmN0aW9uKGRhdGFi YXNlKQogICAgIHRoaXMuYXBwbGljYXRpb25DYWNoZUxpc3RUcmVlRWxlbWVudCA9IG5ldyBXZWJJ bnNwZWN0b3IuU3RvcmFnZUNhdGVnb3J5VHJlZUVsZW1lbnQodGhpcywgV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJBcHBsaWNhdGlvbiBDYWNoZSIpLCAiQXBwbGljYXRpb25DYWNoZSIsICJhcHBsaWNh dGlvbi1jYWNoZS1zdG9yYWdlLXRyZWUtaXRlbSIpOwogICAgIHRoaXMuc2lkZWJhclRyZWUuYXBw ZW5kQ2hpbGQodGhpcy5hcHBsaWNhdGlvbkNhY2hlTGlzdFRyZWVFbGVtZW50KTsKIAotICAgIHRo aXMubG9jYWxseU1vZGlmaWVkTGlzdFRyZWVFbGVtZW50ID0gbmV3IFdlYkluc3BlY3Rvci5TdG9y YWdlQ2F0ZWdvcnlUcmVlRWxlbWVudCh0aGlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxvY2Fs bHkgTW9kaWZpZWQiKSwgIkxvY2FsbHlNb2RpZmllZCIsICJmcmFtZS1zdG9yYWdlLXRyZWUtaXRl bSIpOwotICAgIHRoaXMuc2lkZWJhclRyZWUuYXBwZW5kQ2hpbGQodGhpcy5sb2NhbGx5TW9kaWZp ZWRMaXN0VHJlZUVsZW1lbnQpOwotICAgIHRoaXMubG9jYWxseU1vZGlmaWVkTGlzdFRyZWVFbGVt ZW50LmhpZGRlbiA9IHRydWU7Ci0KICAgICBpZiAoUHJlZmVyZW5jZXMuZmlsZVN5c3RlbUVuYWJs ZWQpIHsKICAgICAgICAgdGhpcy5maWxlU3lzdGVtTGlzdFRyZWVFbGVtZW50ID0gbmV3IFdlYklu c3BlY3Rvci5TdG9yYWdlQ2F0ZWdvcnlUcmVlRWxlbWVudCh0aGlzLCBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIkZpbGUgU3lzdGVtIiksICJGaWxlU3lzdGVtIiwgImZpbGUtc3lzdGVtLXN0b3JhZ2Ut dHJlZS1pdGVtIik7CiAgICAgICAgIHRoaXMuc2lkZWJhclRyZWUuYXBwZW5kQ2hpbGQodGhpcy5m aWxlU3lzdGVtTGlzdFRyZWVFbGVtZW50KTsKQEAgLTc4LDcgKzc0LDYgQEAgV2ViSW5zcGVjdG9y LlJlc291cmNlc1BhbmVsID0gZnVuY3Rpb24oZGF0YWJhc2UpCiAgICAgdGhpcy5fY29va2llVmll d3MgPSB7fTsKICAgICB0aGlzLl9vcmlnaW5zID0ge307CiAgICAgdGhpcy5fZG9tYWlucyA9IHt9 OwotICAgIHRoaXMuX2xvY2FsbHlNb2RpZmllZFJlc291cmNlcyA9IHt9OwogCiAgICAgdGhpcy5z aWRlYmFyRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZW1vdmUiLCB0aGlzLl9vbm1vdXNl bW92ZS5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgdGhpcy5zaWRlYmFyRWxlbWVudC5hZGRFdmVu dExpc3RlbmVyKCJtb3VzZW91dCIsIHRoaXMuX29ubW91c2VvdXQuYmluZCh0aGlzKSwgZmFsc2Up OwpAQCAtMTQ5LDcgKzE0NCw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5 cGUgPSB7CiAgICAgICAgIHRoaXMuX2RvbVN0b3JhZ2UgPSBbXTsKIAogICAgICAgICB0aGlzLl9j b29raWVWaWV3cyA9IHt9OwotICAgICAgICB0aGlzLl9sb2NhbGx5TW9kaWZpZWRSZXNvdXJjZXMg PSB7fTsKICAgICAgICAgdGhpcy5fZmlsZVN5c3RlbVZpZXcgPSBudWxsOwogICAgICAgICAKICAg ICAgICAgdGhpcy5fYXBwbGljYXRpb25DYWNoZVZpZXcgPSBudWxsOwpAQCAtMTYwLDcgKzE1NCw2 IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRo aXMuc2Vzc2lvblN0b3JhZ2VMaXN0VHJlZUVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICAg ICAgdGhpcy5jb29raWVMaXN0VHJlZUVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICAgICAg dGhpcy5hcHBsaWNhdGlvbkNhY2hlTGlzdFRyZWVFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7Ci0g ICAgICAgIHRoaXMubG9jYWxseU1vZGlmaWVkTGlzdFRyZWVFbGVtZW50LnJlbW92ZUNoaWxkcmVu KCk7CiAgICAgICAgIGlmIChQcmVmZXJlbmNlcy5maWxlU3lzdGVtRW5hYmxlZCkKICAgICAgICAg ICAgIHRoaXMuZmlsZVN5c3RlbUxpc3RUcmVlRWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOwogICAg ICAgICB0aGlzLnN0b3JhZ2VWaWV3cy5yZW1vdmVDaGlsZHJlbigpOwpAQCAtMzExLDIwICszMDQs NiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAg ICAgdGhpcy5zZXNzaW9uU3RvcmFnZUxpc3RUcmVlRWxlbWVudC5hcHBlbmRDaGlsZChkb21TdG9y YWdlVHJlZUVsZW1lbnQpOwogICAgIH0sCiAKLSAgICBhZGRMb2NhbGx5TW9kaWZpZWRSZXZpc2lv bjogZnVuY3Rpb24odXJsLCByZXNvdXJjZVR5cGUsIGNvbnRlbnQpCi0gICAgewotICAgICAgICB0 aGlzLmxvY2FsbHlNb2RpZmllZExpc3RUcmVlRWxlbWVudC5oaWRkZW4gPSBmYWxzZTsKLQotICAg ICAgICB2YXIgbmV3UmV2aXNpb24gPSBuZXcgV2ViSW5zcGVjdG9yLkxvY2FsbHlNb2RpZmllZFJl dmlzaW9uVHJlZUVsZW1lbnQodGhpcywgdXJsLCByZXNvdXJjZVR5cGUsIGNvbnRlbnQpOwotICAg ICAgICB2YXIgbGFzdFJldmlzaW9uID0gdGhpcy5fbG9jYWxseU1vZGlmaWVkUmVzb3VyY2VzW3Vy bF07Ci0gICAgICAgIHRoaXMuX2xvY2FsbHlNb2RpZmllZFJlc291cmNlc1t1cmxdID0gbmV3UmV2 aXNpb247Ci0KLSAgICAgICAgaWYgKGxhc3RSZXZpc2lvbikKLSAgICAgICAgICAgIGxhc3RSZXZp c2lvbi5iZWNvbWVMb2dFbnRyeShuZXdSZXZpc2lvbik7Ci0gICAgICAgIGVsc2UKLSAgICAgICAg ICAgIHRoaXMubG9jYWxseU1vZGlmaWVkTGlzdFRyZWVFbGVtZW50LmFwcGVuZENoaWxkKG5ld1Jl dmlzaW9uKTsKLSAgICB9LAotCiAgICAgc2VsZWN0RGF0YWJhc2U6IGZ1bmN0aW9uKGRhdGFiYXNl SWQpCiAgICAgewogICAgICAgICB2YXIgZGF0YWJhc2U7CkBAIC00NzIsNyArNDUxLDcgQEAgV2Vi SW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICBfaW5uZXJTaG93Vmll dzogZnVuY3Rpb24odmlldykKICAgICB7CiAgICAgICAgIGlmICh0aGlzLnZpc2libGVWaWV3KQot ICAgICAgICAgICAgdGhpcy52aXNpYmxlVmlldy5kZXRhY2goKTsKKyAgICAgICAgICAgIHRoaXMu dmlzaWJsZVZpZXcuaGlkZSgpOwogCiAgICAgICAgIHZpZXcuc2hvdyh0aGlzLnN0b3JhZ2VWaWV3 cyk7CiAgICAgICAgIHRoaXMudmlzaWJsZVZpZXcgPSB2aWV3OwpAQCAtOTYwLDYgKzkzOSw3IEBA IFdlYkluc3BlY3Rvci5GcmFtZVJlc291cmNlVHJlZUVsZW1lbnQgPSBmdW5jdGlvbihzdG9yYWdl UGFuZWwsIHJlc291cmNlKQogICAgIFdlYkluc3BlY3Rvci5CYXNlU3RvcmFnZVRyZWVFbGVtZW50 LmNhbGwodGhpcywgc3RvcmFnZVBhbmVsLCByZXNvdXJjZSwgcmVzb3VyY2UuZGlzcGxheU5hbWUs ICJyZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbSByZXNvdXJjZXMtY2F0ZWdvcnktIiArIHJlc291 cmNlLmNhdGVnb3J5Lm5hbWUpOwogICAgIHRoaXMuX3Jlc291cmNlID0gcmVzb3VyY2U7CiAgICAg dGhpcy5fcmVzb3VyY2UuYWRkRXZlbnRMaXN0ZW5lcigiZXJyb3JzLXdhcm5pbmdzLXVwZGF0ZWQi LCB0aGlzLl9lcnJvcnNXYXJuaW5nc1VwZGF0ZWQsIHRoaXMpOworICAgIHRoaXMuX3Jlc291cmNl LmFkZEV2ZW50TGlzdGVuZXIoImNvbnRlbnQtY2hhbmdlZCIsIHRoaXMuX2NvbnRlbnRDaGFuZ2Vk LCB0aGlzKTsKICAgICB0aGlzLnRvb2x0aXAgPSByZXNvdXJjZS51cmw7CiB9CiAKQEAgLTEwNzAs NiArMTA1MCw0NCBAQCBXZWJJbnNwZWN0b3IuRnJhbWVSZXNvdXJjZVRyZWVFbGVtZW50LnByb3Rv dHlwZSA9IHsKIAogICAgICAgICBpZiAodGhpcy5fcmVzb3VyY2UuZXJyb3JzKQogICAgICAgICAg ICAgdGhpcy5fYnViYmxlRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJlcnJvciIpOworICAgIH0sCisK KyAgICBfY29udGVudENoYW5nZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdmFy IHJldmlzaW9uUmVzb3VyY2UgPSBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlKG51bGwsIHRoaXMu X3Jlc291cmNlLnVybCk7CisgICAgICAgIHJldmlzaW9uUmVzb3VyY2UudHlwZSA9IHRoaXMuX3Jl c291cmNlLnR5cGU7CisgICAgICAgIHJldmlzaW9uUmVzb3VyY2UubG9hZGVyID0gdGhpcy5fcmVz b3VyY2UubG9hZGVyOworICAgICAgICBpZiAodGhpcy5fcmVzb3VyY2UuZmluaXNoZWQpCisgICAg ICAgICAgICByZXZpc2lvblJlc291cmNlLmZpbmlzaGVkID0gdHJ1ZTsKKyAgICAgICAgZWxzZSB7 CisgICAgICAgICAgICBmdW5jdGlvbiBmaW5pc2hlZCgpCisgICAgICAgICAgICB7CisgICAgICAg ICAgICAgICAgcmV2aXNpb25SZXNvdXJjZS5maW5pc2hlZCA9IHRydWU7CisgICAgICAgICAgICB9 CisgICAgICAgICAgICB0aGlzLl9yZXNvdXJjZS5hZGRFdmVudExpc3RlbmVyKCJmaW5pc2hlZCIs IGZpbmlzaGVkKTsKKyAgICAgICAgfQorICAgICAgICBpZiAoZXZlbnQuZGF0YS5vbGRDb250ZW50 KQorICAgICAgICAgICAgcmV2aXNpb25SZXNvdXJjZS5vdmVycmlkZUNvbnRlbnQoZXZlbnQuZGF0 YS5vbGRDb250ZW50KTsKKyAgICAgICAgdGhpcy5pbnNlcnRDaGlsZChuZXcgV2ViSW5zcGVjdG9y LlJlc291cmNlUmV2aXNpb25UcmVlRWxlbWVudCh0aGlzLl9zdG9yYWdlUGFuZWwsIHJldmlzaW9u UmVzb3VyY2UsIGV2ZW50LmRhdGEub2xkQ29udGVudFRpbWVzdGFtcCksIDApOworCisgICAgICAg IHZhciBvbGRWaWV3ID0gdGhpcy5fcmVzb3VyY2UuX3Jlc291cmNlc1ZpZXc7CisgICAgICAgIGlm IChvbGRWaWV3KSB7CisgICAgICAgICAgICB2YXIgc2Nyb2xsVG9wID0gb2xkVmlldy5zY3JvbGxU b3A7CisgICAgICAgICAgICB2YXIgbmV3VmlldyA9IFdlYkluc3BlY3Rvci5SZXNvdXJjZU1hbmFn ZXIuY3JlYXRlUmVzb3VyY2VWaWV3KHRoaXMuX3Jlc291cmNlKTsKKyAgICAgICAgICAgIHZhciBv bGRWaWV3UGFyZW50Tm9kZSA9IG9sZFZpZXcudmlzaWJsZSA/IG9sZFZpZXcuZWxlbWVudC5wYXJl bnROb2RlIDogbnVsbDsKKworICAgICAgICAgICAgdGhpcy5fcmVzb3VyY2UuX3Jlc291cmNlc1Zp ZXcuZGV0YWNoKCk7CisgICAgICAgICAgICBkZWxldGUgdGhpcy5fcmVzb3VyY2UuX3Jlc291cmNl c1ZpZXc7CisgICAgICAgICAgICB0aGlzLl9yZXNvdXJjZS5fcmVzb3VyY2VzVmlldyA9IG5ld1Zp ZXc7CisKKyAgICAgICAgICAgIGlmIChvbGRWaWV3UGFyZW50Tm9kZSkKKyAgICAgICAgICAgICAg ICBuZXdWaWV3LnNob3cob2xkVmlld1BhcmVudE5vZGUpOworCisgICAgICAgICAgICBpZiAob2xk VmlldyA9PT0gdGhpcy5fc3RvcmFnZVBhbmVsLnZpc2libGVWaWV3KQorICAgICAgICAgICAgICAg IHRoaXMuX3N0b3JhZ2VQYW5lbC52aXNpYmxlVmlldyA9IG5ld1ZpZXc7CisgICAgICAgICAgICBp ZiAoc2Nyb2xsVG9wKQorICAgICAgICAgICAgICAgIG5ld1ZpZXcuc2Nyb2xsVG9wID0gc2Nyb2xs VG9wOworICAgICAgICB9CiAgICAgfQogfQogCkBAIC0xMTk3LDQ0ICsxMjE1LDE2IEBAIFdlYklu c3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogfQogV2Vi SW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVUcmVlRWxlbWVudC5wcm90b3R5cGUuX19wcm90b19f ID0gV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJvdG90eXBlOwogCi1XZWJJ bnNwZWN0b3IuTG9jYWxseU1vZGlmaWVkUmV2aXNpb25UcmVlRWxlbWVudCA9IGZ1bmN0aW9uKHN0 b3JhZ2VQYW5lbCwgdXJsLCByZXNvdXJjZVR5cGUsIGNvbnRlbnQpCitXZWJJbnNwZWN0b3IuUmVz b3VyY2VSZXZpc2lvblRyZWVFbGVtZW50ID0gZnVuY3Rpb24oc3RvcmFnZVBhbmVsLCByZXNvdXJj ZSwgdGltZXN0YW1wKQogewotICAgIHZhciByZXNvdXJjZSA9IG5ldyBXZWJJbnNwZWN0b3IuUmVz b3VyY2UobnVsbCwgdXJsKTsKLSAgICByZXNvdXJjZS50eXBlID0gcmVzb3VyY2VUeXBlOwotICAg IHJlc291cmNlLmNvbnRlbnQgPSBjb250ZW50OwotCi0gICAgdmFyIHRpbWVzdGFtcCA9IG5ldyBE YXRlKCk7Ci0gICAgV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQuY2FsbCh0aGlz LCBzdG9yYWdlUGFuZWwsIG51bGwsIHJlc291cmNlLmRpc3BsYXlOYW1lLCAicmVzb3VyY2Utc2lk ZWJhci10cmVlLWl0ZW0gcmVzb3VyY2VzLWNhdGVnb3J5LSIgKyByZXNvdXJjZS5jYXRlZ29yeS5u YW1lKTsKLSAgICB0aGlzLnRvb2x0aXAgPSByZXNvdXJjZS51cmw7Ci0gICAgdGhpcy50aW1lc3Rh bXAgPSB0aW1lc3RhbXA7CisgICAgdmFyIHRpdGxlID0gdGltZXN0YW1wID8gdGltZXN0YW1wLnRv TG9jYWxlVGltZVN0cmluZygpIDogIihvcmlnaW5hbCkiOworICAgIFdlYkluc3BlY3Rvci5CYXNl U3RvcmFnZVRyZWVFbGVtZW50LmNhbGwodGhpcywgc3RvcmFnZVBhbmVsLCBudWxsLCB0aXRsZSwg InJlc291cmNlLXNpZGViYXItdHJlZS1pdGVtIHJlc291cmNlcy1jYXRlZ29yeS0iICsgcmVzb3Vy Y2UuY2F0ZWdvcnkubmFtZSk7CisgICAgaWYgKHRpbWVzdGFtcCkKKyAgICAgICAgdGhpcy50b29s dGlwID0gdGltZXN0YW1wLnRvTG9jYWxlU3RyaW5nKCk7CiAgICAgdGhpcy5fcmVzb3VyY2UgPSBy ZXNvdXJjZTsKIH0KIAotV2ViSW5zcGVjdG9yLkxvY2FsbHlNb2RpZmllZFJldmlzaW9uVHJlZUVs ZW1lbnQucHJvdG90eXBlID0gewotICAgIGJlY29tZUxvZ0VudHJ5OiBmdW5jdGlvbihuZXdSZXZp c2lvbikKLSAgICB7Ci0gICAgICAgIHZhciBvbGRDaGlsZHJlbiA9IHRoaXMuY2hpbGRyZW4uc2xp Y2UoKTsKLSAgICAgICAgdmFyIG9sZEV4cGFuZGVkID0gdGhpcy5leHBhbmRlZDsKLSAgICAgICAg dmFyIG9sZEluZGV4ID0gdGhpcy5wYXJlbnQuY2hpbGRyZW4uaW5kZXhPZih0aGlzKTsKLQotICAg ICAgICB0aGlzLnJlbW92ZUNoaWxkcmVuKCk7Ci0gICAgICAgIHRoaXMudGl0bGVUZXh0ID0gdGhp cy50aW1lc3RhbXAudG9Mb2NhbGVUaW1lU3RyaW5nKCk7Ci0gICAgICAgIHRoaXMudG9Mb2NhbGVT dHJpbmcoKTsKLSAgICAgICAgdGhpcy5oYXNDaGlsZHJlbiA9IGZhbHNlOwotCi0gICAgICAgIHRo aXMucGFyZW50Lmluc2VydENoaWxkKG5ld1JldmlzaW9uLCBvbGRJbmRleCk7Ci0gICAgICAgIHRo aXMucGFyZW50LnJlbW92ZUNoaWxkKHRoaXMpOwotCi0gICAgICAgIGNvbnN0IG9uZU1pbnV0ZSA9 IDEwMDAgKiA2MDsKLSAgICAgICAgaWYgKG5ld1JldmlzaW9uLnRpbWVzdGFtcCAtIHRoaXMudGlt ZXN0YW1wID4gb25lTWludXRlKQotICAgICAgICAgICAgbmV3UmV2aXNpb24uYXBwZW5kQ2hpbGQo dGhpcyk7Ci0KLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBvbGRDaGlsZHJlbi5sZW5ndGg7 ICsraSkKLSAgICAgICAgICAgIG5ld1JldmlzaW9uLmFwcGVuZENoaWxkKG9sZENoaWxkcmVuW2ld KTsKLSAgICAgICAgaWYgKG9sZEV4cGFuZGVkKQotICAgICAgICAgICAgbmV3UmV2aXNpb24uZXhw YW5kKCk7Ci0gICAgfSwKLQorV2ViSW5zcGVjdG9yLlJlc291cmNlUmV2aXNpb25UcmVlRWxlbWVu dC5wcm90b3R5cGUgPSB7CiAgICAgb25hdHRhY2g6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAg IFdlYkluc3BlY3Rvci5CYXNlU3RvcmFnZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbmF0dGFjaC5j YWxsKHRoaXMpOwpAQCAtMTI1NSw3ICsxMjQ1LDggQEAgV2ViSW5zcGVjdG9yLkxvY2FsbHlNb2Rp ZmllZFJldmlzaW9uVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdHJ1 ZTsKICAgICB9CiB9Ci1XZWJJbnNwZWN0b3IuTG9jYWxseU1vZGlmaWVkUmV2aXNpb25UcmVlRWxl bWVudC5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVs ZW1lbnQucHJvdG90eXBlOworCitXZWJJbnNwZWN0b3IuUmVzb3VyY2VSZXZpc2lvblRyZWVFbGVt ZW50LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxl bWVudC5wcm90b3R5cGU7CiAKIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtVHJlZUVsZW1lbnQgPSBm dW5jdGlvbihzdG9yYWdlUGFuZWwsIG9yaWdpbikKIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Tb3VyY2VGcmFtZS5qcwppbmRleCA0YjM5MWFjLi42NmEwMDA1IDEwMDY0NAotLS0gYS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKKysrIGIvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCkBAIC0xNjEsNiArMTYxLDE3IEBAIFdl Ykluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlz Ll90ZXh0TW9kZWw7CiAgICAgfSwKIAorICAgIGdldCBzY3JvbGxUb3AoKQorICAgIHsKKyAgICAg ICAgcmV0dXJuIHRoaXMuX3RleHRWaWV3ZXIgPyB0aGlzLl90ZXh0Vmlld2VyLmVsZW1lbnQuc2Ny b2xsVG9wIDogMDsKKyAgICB9LAorCisgICAgc2V0IHNjcm9sbFRvcChzY3JvbGxUb3ApCisgICAg eworICAgICAgICBpZiAodGhpcy5fdGV4dFZpZXdlcikKKyAgICAgICAgICAgIHRoaXMuX3RleHRW aWV3ZXIuZWxlbWVudC5zY3JvbGxUb3AgPSBzY3JvbGxUb3A7CisgICAgfSwKKwogICAgIGhpZ2hs aWdodExpbmU6IGZ1bmN0aW9uKGxpbmUpCiAgICAgewogICAgICAgICBpZiAodGhpcy5fdGV4dFZp ZXdlcikKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VWaWV3 LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVZpZXcuanMKaW5kZXggOWZm NDZlMC4uYTY5YmY2OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nv dXJjZVZpZXcuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVZpZXcu anMKQEAgLTcwLDYgKzcwLDE2IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgIHRoaXMuc291cmNlRnJhbWUucmVzaXplKCk7CiAgICAgfSwKIAorICAg IGdldCBzY3JvbGxUb3AoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuc291cmNlRnJhbWUu c2Nyb2xsVG9wOworICAgIH0sCisKKyAgICBzZXQgc2Nyb2xsVG9wKHNjcm9sbFRvcCkKKyAgICB7 CisgICAgICAgIHRoaXMuc291cmNlRnJhbWUuc2Nyb2xsVG9wID0gc2Nyb2xsVG9wOworICAgIH0s CisKICAgICBzZXR1cFNvdXJjZUZyYW1lSWZOZWVkZWQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAg ICAgIGlmICghdGhpcy5fZnJhbWVOZWVkc1NldHVwKQpAQCAtMTM3LDEyICsxNDcsMTMgQEAgV2Vi SW5zcGVjdG9yLlNvdXJjZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICB9CiAKICAgICAgICAg dmFyIGxpbmVzQ291bnRUb1NoaWZ0ID0gbmV3Q29udGVudC5zcGxpdCgiXG4iKS5sZW5ndGggLSAx OwotICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMuZWRpdFNjcmlwdFNvdXJjZSh0 aGlzLl9zb3VyY2VJREZvckxpbmUobGluZSksIGxpbmVzLmpvaW4oIlxuIiksIGxpbmUsIGxpbmVz Q291bnRUb1NoaWZ0LCB0aGlzLl9lZGl0TGluZUNvbXBsZXRlLmJpbmQodGhpcyksIGNhbmNlbEVk aXRpbmdDYWxsYmFjayk7CisgICAgICAgIHZhciBuZXdDb250ZW50ID0gbGluZXMuam9pbigiXG4i KTsKKyAgICAgICAgdGhpcy5yZXNvdXJjZS5jb250ZW50ID0gbmV3Q29udGVudDsKKyAgICAgICAg V2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzLmVkaXRTY3JpcHRTb3VyY2UodGhpcy5fc291cmNl SURGb3JMaW5lKGxpbmUpLCBuZXdDb250ZW50LCBsaW5lLCBsaW5lc0NvdW50VG9TaGlmdCwgdGhp cy5fZWRpdExpbmVDb21wbGV0ZS5iaW5kKHRoaXMpLCBjYW5jZWxFZGl0aW5nQ2FsbGJhY2spOwog ICAgIH0sCiAKLSAgICBfZWRpdExpbmVDb21wbGV0ZTogZnVuY3Rpb24obmV3Qm9keSkKKyAgICBf ZWRpdExpbmVDb21wbGV0ZTogZnVuY3Rpb24oc2Nyb2xsVG9wKQogICAgIHsKLSAgICAgICAgdGhp cy5zb3VyY2VGcmFtZS51cGRhdGVDb250ZW50KG5ld0JvZHkpOwogICAgIH0sCiAKICAgICBfc291 cmNlSURGb3JMaW5lOiBmdW5jdGlvbihsaW5lKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCmluZGV4IDBhZWM2NjkuLmRmOGI3MzAgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwor KysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKQEAg LTE3NzEsNyArMTc3MSw3IEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQu cHJvdG90eXBlID0gewogICAgICAgICAvLyBGSVhNRTogdGhpcyBkb2VzIG5vdCBoYW5kbGUgdHJh aWxpbmcgY29tbWVudHMuCiAgICAgICAgIGlmIChzdHlsZVRleHQubGVuZ3RoICYmICEvO1xzKiQv LnRlc3Qoc3R5bGVUZXh0KSkKICAgICAgICAgICAgIHN0eWxlVGV4dCArPSAiOyI7Ci0gICAgICAg IHRoaXMucHJvcGVydHkuc2V0VGV4dChzdHlsZVRleHQsIGNhbGxiYWNrLmJpbmQodGhpcykpOwor ICAgICAgICB0aGlzLnByb3BlcnR5LnNldFRleHQoc3R5bGVUZXh0LCB1cGRhdGVJbnRlcmZhY2Us IGNhbGxiYWNrLmJpbmQodGhpcykpOwogICAgIH0KIH0KIAo=