113486 2013-03-28 00:59:50 -0700 Web Inspector: [Network] Split business logic and presentation for initiator column. 2013-04-02 22:58:50 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 eustas eustas apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 865221 0 eustas 2013-03-28 00:59:50 -0700 Currently business logic and presentation are mixed. This prevents making cell renderer static and applying viewport rendering, because initiator sorting function depends on data written when cell is rendered. In this patch initiator information is extracted in separate method. 865269 1 195505 eustas 2013-03-28 02:14:55 -0700 Created attachment 195505 Patch 865285 2 195505 pfeldman 2013-03-28 02:48:56 -0700 Comment on attachment 195505 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195505&action=review > Source/WebCore/inspector/front-end/NetworkPanel.js:2475 > + var aInitiator = WebInspector.NetworkDataGridNode.buildInitiatorInfo(a._request); You are creating it while sorting. 865294 3 195505 eustas 2013-03-28 03:01:10 -0700 Comment on attachment 195505 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195505&action=review >> Source/WebCore/inspector/front-end/NetworkPanel.js:2475 >> + var aInitiator = WebInspector.NetworkDataGridNode.buildInitiatorInfo(a._request); > > You are creating it while sorting. In first (unpublished) version of patch I've created/cached it in NetworkRequest. But I thought you wouldn't accept it. So, would you like if initiatorInfo will be cached in NetworkRequest instance? 866023 4 195705 eustas 2013-03-29 00:51:06 -0700 Created attachment 195705 Patch 868447 5 195705 webkit.review.bot 2013-04-02 22:58:46 -0700 Comment on attachment 195705 Patch Clearing flags on attachment: 195705 Committed r147519: <http://trac.webkit.org/changeset/147519> 868448 6 webkit.review.bot 2013-04-02 22:58:50 -0700 All reviewed patches have been landed. Closing bug. 195505 2013-03-28 02:14:55 -0700 2013-03-29 00:51:01 -0700 Patch bug-113486-20130328131452.patch text/plain 10447 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MDczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmE2YWZlOGZjMTM4Njhj Nzc2YTVmN2IxNjVlMjZjN2YzNjcxOTkzYS4uYWM4ZTM4ZjZmNjM1OTllMDhmYjZkZWVmZDFhZDE1 OGIzZmExNTJlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAzLTI4ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtOZXR3b3JrXSBTcGxpdCBidXNpbmVzcyBsb2dpYyBhbmQgcHJlc2VudGF0aW9uIGZv ciBpbml0aWF0b3IgY29sdW1uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTEzNDg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQ3VycmVudGx5IGJ1c2luZXNzIGxvZ2ljIGFuZCBwcmVzZW50YXRpb24gYXJl IG1peGVkLgorICAgICAgICBUaGlzIHByZXZlbnRzIG1ha2luZyBjZWxsIHJlbmRlcmVyIHN0YXRp YyBhbmQgYXBwbHlpbmcKKyAgICAgICAgdmlld3BvcnQgcmVuZGVyaW5nLCBiZWNhdXNlIGluaXRp YXRvciBzb3J0aW5nIGZ1bmN0aW9uCisgICAgICAgIGRlcGVuZHMgb24gZGF0YSB3cml0dGVuIHdo ZW4gY2VsbCBpcyByZW5kZXJlZC4KKworICAgICAgICBJbiB0aGlzIHBhdGNoIGluaXRpYXRvciBp bmZvcm1hdGlvbiBpcyBleHRyYWN0ZWQgdG8gc2VwYXJhdGUgbWV0aG9kLgorCisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuTmV0d29ya0RhdGFHcmlkTm9kZS5wcm90b3R5cGUuX3JlZnJlc2hJbml0aWF0b3JDZWxsKToK KyAgICAgICAgUmVtb3ZlZCBidXNpbmVzcyBsb2dpYy4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5O ZXR3b3JrRGF0YUdyaWROb2RlLmJ1aWxkSW5pdGlhdG9ySW5mbyk6CisgICAgICAgIEV4dHJhY3Rl ZCBidXNpbmVzcyBsb2dpYyBmcm9tIHJlZnJlc2hJbml0aWF0b3JDZWxsLgorICAgICAgICAoV2Vi SW5zcGVjdG9yLk5ldHdvcmtEYXRhR3JpZE5vZGUuSW5pdGlhdG9yQ29tcGFyYXRvcik6CisgICAg ICAgIFVzZSBidWlsZEluaXRpYXRvckluZm8uCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9OZXR3b3JrUmVxdWVzdC5qczoKKyAgICAgICAgUmVtb3ZlZCBlbnVtIHRoYXIgZHVwbGljYXRl cyBwcm90b2NvbCBlbnVtLgorCiAyMDEzLTAzLTI3ICBLZWlzaGkgSGF0dG9yaSAgPGtlaXNoaUB3 ZWJraXQub3JnPgogCiAgICAgICAgIERyYWdnaW5nIHRvIGVkZ2Ugc2hvdWxkIGFsd2F5cyBzbmFw IHRvIG1pbi9tYXguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL05ldHdvcmtQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv TmV0d29ya1BhbmVsLmpzCmluZGV4IDk3Y2NjMDg4NTBjNGZiNDAxMGQ5ZWE1MThhZWVkZTE5NzE5 YmFlNjIuLjM1MGRkZjdkMzkzYWU4YzkwN2VhMjdlMzAyOGYyOGMwYWZlMGYyZDEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCkBA IC0yMDA4LDYgKzIwMDgsMTQgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtEYXRhR3JpZE5vZGUgPSBm dW5jdGlvbihwYXJlbnRWaWV3LCByZXF1ZXN0KQogICAgIHRoaXMuX3JlcXVlc3QgPSByZXF1ZXN0 OwogfQogCisvKiogQGVudW0ge3N0cmluZ30gKi8KK1dlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdy aWROb2RlLkluaXRpYXRvclR5cGUgPSB7CisgICAgT3RoZXI6ICJvdGhlciIsCisgICAgUGFyc2Vy OiAicGFyc2VyIiwKKyAgICBSZWRpcmVjdDogInJlZGlyZWN0IiwKKyAgICBTY3JpcHQ6ICJzY3Jp cHQiCit9OworCiBXZWJJbnNwZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9kZS5wcm90b3R5cGUgPSB7 CiAgICAgY3JlYXRlQ2VsbHM6IGZ1bmN0aW9uKCkKICAgICB7CkBAIC0yMjM2LDU1ICsyMjQ0LDQw IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdyaWROb2RlLnByb3RvdHlwZSA9IHsKIAogICAg IF9yZWZyZXNoSW5pdGlhdG9yQ2VsbDogZnVuY3Rpb24oKQogICAgIHsKKyAgICAgICAgdGhpcy5f aW5pdGlhdG9yQ2VsbC5yZW1vdmVDaGlsZHJlbigpOwogICAgICAgICB0aGlzLl9pbml0aWF0b3JD ZWxsLnJlbW92ZVN0eWxlQ2xhc3MoIm5ldHdvcmstZGltLWNlbGwiKTsKICAgICAgICAgdGhpcy5f aW5pdGlhdG9yQ2VsbC5yZW1vdmVTdHlsZUNsYXNzKCJuZXR3b3JrLXNjcmlwdC1pbml0aWF0ZWQi KTsKICAgICAgICAgZGVsZXRlIHRoaXMuX2luaXRpYXRvckNlbGwucmVxdWVzdDsKLSAgICAgICAg dGhpcy5faW5pdGlhdG9yQ2VsbC50aXRsZSA9ICIiOwotICAgICAgICB0aGlzLl9kaXNwbGF5ZWRJ bml0aWF0b3JVUkwgPSAiIjsKLSAgICAgICAgdGhpcy5fZGlzcGxheWVkSW5pdGlhdG9yTGluZU51 bWJlciA9IC1JbmZpbml0eTsKLSAgICAgICAgdGhpcy5fZGlzcGxheWVkSW5pdGlhdG9yVHlwZSA9 ICIiOwotCi0gICAgICAgIHZhciBpbml0aWF0b3IgPSB0aGlzLl9yZXF1ZXN0LmluaXRpYXRvcjsK LSAgICAgICAgdmFyIGluaXRpYXRvclR5cGVzID0gV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0 LkluaXRpYXRvclR5cGU7Ci0gICAgICAgIGlmICgoaW5pdGlhdG9yICYmIGluaXRpYXRvci50eXBl ICE9PSBpbml0aWF0b3JUeXBlcy5PdGhlcikgfHwgdGhpcy5fcmVxdWVzdC5yZWRpcmVjdFNvdXJj ZSkgewotICAgICAgICAgICAgdGhpcy5faW5pdGlhdG9yQ2VsbC5yZW1vdmVDaGlsZHJlbigpOwot ICAgICAgICAgICAgdmFyIHJlZGlyZWN0U291cmNlID0gdGhpcy5fcmVxdWVzdC5yZWRpcmVjdFNv dXJjZTsKLSAgICAgICAgICAgIGlmIChyZWRpcmVjdFNvdXJjZSkgewotICAgICAgICAgICAgICAg IHRoaXMuX2luaXRpYXRvckNlbGwudGl0bGUgPSByZWRpcmVjdFNvdXJjZS51cmw7Ci0gICAgICAg ICAgICAgICAgdGhpcy5faW5pdGlhdG9yQ2VsbC5hcHBlbmRDaGlsZChXZWJJbnNwZWN0b3IubGlu a2lmeVJlcXVlc3RBc05vZGUocmVkaXJlY3RTb3VyY2UpKTsKLSAgICAgICAgICAgICAgICB0aGlz Ll9kaXNwbGF5ZWRJbml0aWF0b3JUeXBlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZWRpcmVj dCIpOwotICAgICAgICAgICAgICAgIHRoaXMuX2FwcGVuZFN1YnRpdGxlKHRoaXMuX2luaXRpYXRv ckNlbGwsIHRoaXMuX2Rpc3BsYXllZEluaXRpYXRvclR5cGUpOwotICAgICAgICAgICAgICAgIHRo aXMuX2Rpc3BsYXllZEluaXRpYXRvclVSTCA9IHJlZGlyZWN0U291cmNlLnVybDsKLSAgICAgICAg ICAgIH0gZWxzZSBpZiAoaW5pdGlhdG9yLnR5cGUgPT09IGluaXRpYXRvclR5cGVzLlNjcmlwdCkg ewotICAgICAgICAgICAgICAgIHZhciB0b3BGcmFtZSA9IGluaXRpYXRvci5zdGFja1RyYWNlWzBd OwotICAgICAgICAgICAgICAgIC8vIFRoaXMgY291bGQgaGFwcGVuIHdoZW4gcmVxdWVzdCBsb2Fk aW5nIHdhcyB0cmlnZ2VyZWQgYnkgY29uc29sZS4KLSAgICAgICAgICAgICAgICBpZiAoIXRvcEZy YW1lLnVybCkgewotICAgICAgICAgICAgICAgICAgICB0aGlzLl9pbml0aWF0b3JDZWxsLmFkZFN0 eWxlQ2xhc3MoIm5ldHdvcmstZGltLWNlbGwiKTsKLSAgICAgICAgICAgICAgICAgICAgdGhpcy5f ZGlzcGxheWVkSW5pdGlhdG9yVHlwZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiT3RoZXIiKTsK LSAgICAgICAgICAgICAgICAgICAgdGhpcy5faW5pdGlhdG9yQ2VsbC5zZXRUZXh0QW5kVGl0bGUo dGhpcy5fZGlzcGxheWVkSW5pdGlhdG9yVHlwZSk7Ci0gICAgICAgICAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgdmFyIHVybEVsZW1lbnQgPSB0 aGlzLl9wYXJlbnRWaWV3Ll9saW5raWZpZXIubGlua2lmeUxvY2F0aW9uKHRvcEZyYW1lLnVybCwg dG9wRnJhbWUubGluZU51bWJlciAtIDEsIDApOwotICAgICAgICAgICAgICAgIHVybEVsZW1lbnQu dGl0bGUgPSAiIjsKLSAgICAgICAgICAgICAgICB0aGlzLl9pbml0aWF0b3JDZWxsLmFwcGVuZENo aWxkKHVybEVsZW1lbnQpOwotICAgICAgICAgICAgICAgIHRoaXMuX2Rpc3BsYXllZEluaXRpYXRv clR5cGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNjcmlwdCIpOwotICAgICAgICAgICAgICAg IHRoaXMuX2FwcGVuZFN1YnRpdGxlKHRoaXMuX2luaXRpYXRvckNlbGwsIHRoaXMuX2Rpc3BsYXll ZEluaXRpYXRvclR5cGUpOwotICAgICAgICAgICAgICAgIHRoaXMuX2luaXRpYXRvckNlbGwuYWRk U3R5bGVDbGFzcygibmV0d29yay1zY3JpcHQtaW5pdGlhdGVkIik7Ci0gICAgICAgICAgICAgICAg dGhpcy5faW5pdGlhdG9yQ2VsbC5yZXF1ZXN0ID0gdGhpcy5fcmVxdWVzdDsKLSAgICAgICAgICAg ICAgICB0aGlzLl9kaXNwbGF5ZWRJbml0aWF0b3JVUkwgPSBXZWJJbnNwZWN0b3IuZGlzcGxheU5h bWVGb3JVUkwodG9wRnJhbWUudXJsKTsKLSAgICAgICAgICAgICAgICB0aGlzLl9kaXNwbGF5ZWRJ bml0aWF0b3JMaW5lTnVtYmVyID0gdG9wRnJhbWUubGluZU51bWJlcjsKLSAgICAgICAgICAgIH0g ZWxzZSB7IC8vIGluaXRpYXRvci50eXBlID09PSBpbml0aWF0b3JUeXBlcy5QYXJzZXIKLSAgICAg ICAgICAgICAgICB0aGlzLl9pbml0aWF0b3JDZWxsLnRpdGxlID0gaW5pdGlhdG9yLnVybCArICI6 IiArIGluaXRpYXRvci5saW5lTnVtYmVyOwotICAgICAgICAgICAgICAgIHRoaXMuX2luaXRpYXRv ckNlbGwuYXBwZW5kQ2hpbGQoV2ViSW5zcGVjdG9yLmxpbmtpZnlSZXNvdXJjZUFzTm9kZShpbml0 aWF0b3IudXJsLCBpbml0aWF0b3IubGluZU51bWJlciAtIDEpKTsKLSAgICAgICAgICAgICAgICB0 aGlzLl9kaXNwbGF5ZWRJbml0aWF0b3JUeXBlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQYXJz ZXIiKTsKLSAgICAgICAgICAgICAgICB0aGlzLl9hcHBlbmRTdWJ0aXRsZSh0aGlzLl9pbml0aWF0 b3JDZWxsLCB0aGlzLl9kaXNwbGF5ZWRJbml0aWF0b3JUeXBlKTsKLSAgICAgICAgICAgICAgICB0 aGlzLl9kaXNwbGF5ZWRJbml0aWF0b3JVUkwgPSBXZWJJbnNwZWN0b3IuZGlzcGxheU5hbWVGb3JV UkwoaW5pdGlhdG9yLnVybCk7Ci0gICAgICAgICAgICAgICAgdGhpcy5fZGlzcGxheWVkSW5pdGlh dG9yTGluZU51bWJlciA9IGluaXRpYXRvci5saW5lTnVtYmVyOwotICAgICAgICAgICAgfQotICAg ICAgICB9IGVsc2UgeworCisgICAgICAgIHZhciByZXF1ZXN0ID0gdGhpcy5fcmVxdWVzdDsKKyAg ICAgICAgdmFyIGluaXRpYXRvciA9IFdlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdyaWROb2RlLmJ1 aWxkSW5pdGlhdG9ySW5mbyhyZXF1ZXN0KTsKKworICAgICAgICBzd2l0Y2ggKGluaXRpYXRvci50 eXBlKSB7CisgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLk5ldHdvcmtEYXRhR3JpZE5vZGUuSW5p dGlhdG9yVHlwZS5QYXJzZXI6CisgICAgICAgICAgICB0aGlzLl9pbml0aWF0b3JDZWxsLnRpdGxl ID0gaW5pdGlhdG9yLnVybCArICI6IiArIGluaXRpYXRvci5saW5lTnVtYmVyOworICAgICAgICAg ICAgdGhpcy5faW5pdGlhdG9yQ2VsbC5hcHBlbmRDaGlsZChXZWJJbnNwZWN0b3IubGlua2lmeVJl c291cmNlQXNOb2RlKGluaXRpYXRvci51cmwsIGluaXRpYXRvci5saW5lTnVtYmVyIC0gMSkpOwor ICAgICAgICAgICAgdGhpcy5fYXBwZW5kU3VidGl0bGUodGhpcy5faW5pdGlhdG9yQ2VsbCwgV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJQYXJzZXIiKSk7CisgICAgICAgICAgICBicmVhazsKKworICAg ICAgICBjYXNlIFdlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdyaWROb2RlLkluaXRpYXRvclR5cGUu UmVkaXJlY3Q6CisgICAgICAgICAgICB0aGlzLl9pbml0aWF0b3JDZWxsLnRpdGxlID0gaW5pdGlh dG9yLnVybDsKKyAgICAgICAgICAgIHRoaXMuX2luaXRpYXRvckNlbGwuYXBwZW5kQ2hpbGQoV2Vi SW5zcGVjdG9yLmxpbmtpZnlSZXF1ZXN0QXNOb2RlKHJlcXVlc3QucmVkaXJlY3RTb3VyY2UpKTsK KyAgICAgICAgICAgIHRoaXMuX2FwcGVuZFN1YnRpdGxlKHRoaXMuX2luaXRpYXRvckNlbGwsIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiUmVkaXJlY3QiKSk7CisgICAgICAgICAgICBicmVhazsKKwor ICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdyaWROb2RlLkluaXRpYXRvclR5 cGUuU2NyaXB0OgorICAgICAgICAgICAgdmFyIHVybEVsZW1lbnQgPSB0aGlzLl9wYXJlbnRWaWV3 Ll9saW5raWZpZXIubGlua2lmeUxvY2F0aW9uKGluaXRpYXRvci51cmwsIGluaXRpYXRvci5saW5l TnVtYmVyIC0gMSwgMCk7CisgICAgICAgICAgICB1cmxFbGVtZW50LnRpdGxlID0gIiI7CisgICAg ICAgICAgICB0aGlzLl9pbml0aWF0b3JDZWxsLmFwcGVuZENoaWxkKHVybEVsZW1lbnQpOworICAg ICAgICAgICAgdGhpcy5fYXBwZW5kU3VidGl0bGUodGhpcy5faW5pdGlhdG9yQ2VsbCwgV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJTY3JpcHQiKSk7CisgICAgICAgICAgICB0aGlzLl9pbml0aWF0b3JD ZWxsLmFkZFN0eWxlQ2xhc3MoIm5ldHdvcmstc2NyaXB0LWluaXRpYXRlZCIpOworICAgICAgICAg ICAgdGhpcy5faW5pdGlhdG9yQ2VsbC5yZXF1ZXN0ID0gcmVxdWVzdDsKKyAgICAgICAgICAgIGJy ZWFrOworCisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICB0aGlzLl9pbml0aWF0b3JDZWxs LnRpdGxlID0gIiI7CiAgICAgICAgICAgICB0aGlzLl9pbml0aWF0b3JDZWxsLmFkZFN0eWxlQ2xh c3MoIm5ldHdvcmstZGltLWNlbGwiKTsKLSAgICAgICAgICAgIHRoaXMuX2Rpc3BsYXllZEluaXRp YXRvclR5cGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk90aGVyIik7Ci0gICAgICAgICAgICB0 aGlzLl9pbml0aWF0b3JDZWxsLnNldFRleHRBbmRUaXRsZSh0aGlzLl9kaXNwbGF5ZWRJbml0aWF0 b3JUeXBlKTsKKyAgICAgICAgICAgIHRoaXMuX2luaXRpYXRvckNlbGwuc2V0VGV4dEFuZFRpdGxl KFdlYkluc3BlY3Rvci5VSVN0cmluZygiT3RoZXIiKSk7CiAgICAgICAgIH0KICAgICB9LAogCkBA IC0yNDMwLDYgKzI0MjMsMjggQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtEYXRhR3JpZE5vZGUucHJv dG90eXBlID0gewogICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZS5wcm90 b3R5cGUKIH0KIAorLyoqCisgKiBAcGFyYW0geyFXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3R9 IHJlcXVlc3QKKyAqIEByZXR1cm4ge3t0eXBlOiBXZWJJbnNwZWN0b3IuTmV0d29ya0RhdGFHcmlk Tm9kZS5Jbml0aWF0b3JUeXBlLCB1cmw6IHN0cmluZywgbGluZU51bWJlcjogbnVtYmVyfX0KKyAq LworV2ViSW5zcGVjdG9yLk5ldHdvcmtEYXRhR3JpZE5vZGUuYnVpbGRJbml0aWF0b3JJbmZvID0g ZnVuY3Rpb24ocmVxdWVzdCkKK3sKKyAgICBpZiAocmVxdWVzdC5yZWRpcmVjdFNvdXJjZSkKKyAg ICAgICAgcmV0dXJuIHt0eXBlOiBXZWJJbnNwZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9kZS5Jbml0 aWF0b3JUeXBlLlJlZGlyZWN0LCB1cmw6IHJlcXVlc3QucmVkaXJlY3RTb3VyY2UudXJsLCBsaW5l TnVtYmVyOiAtSW5maW5pdHl9OworCisgICAgdmFyIGluaXRpYXRvciA9IHJlcXVlc3QuaW5pdGlh dG9yOworICAgIGlmIChpbml0aWF0b3IpIHsKKyAgICAgICAgaWYgKGluaXRpYXRvci50eXBlID09 PSBOZXR3b3JrQWdlbnQuSW5pdGlhdG9yVHlwZS5QYXJzZXIpCisgICAgICAgICAgICByZXR1cm4g e3R5cGU6IFdlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdyaWROb2RlLkluaXRpYXRvclR5cGUuUGFy c2VyLCB1cmw6IGluaXRpYXRvci51cmwsIGxpbmVOdW1iZXI6IGluaXRpYXRvci5saW5lTnVtYmVy fTsKKyAgICAgICAgaWYgKGluaXRpYXRvci50eXBlID09PSBOZXR3b3JrQWdlbnQuSW5pdGlhdG9y VHlwZS5TY3JpcHQpIHsKKyAgICAgICAgICAgIHZhciB0b3BGcmFtZSA9IGluaXRpYXRvci5zdGFj a1RyYWNlWzBdOworICAgICAgICAgICAgaWYgKHRvcEZyYW1lLnVybCkKKyAgICAgICAgICAgICAg ICByZXR1cm4ge3R5cGU6IFdlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdyaWROb2RlLkluaXRpYXRv clR5cGUuU2NyaXB0LCB1cmw6IHRvcEZyYW1lLnVybCwgbGluZU51bWJlcjogdG9wRnJhbWUubGlu ZU51bWJlcn07CisgICAgICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4ge3R5cGU6IFdlYkluc3Bl Y3Rvci5OZXR3b3JrRGF0YUdyaWROb2RlLkluaXRpYXRvclR5cGUuT3RoZXIsIHVybDogIiIsIGxp bmVOdW1iZXI6IC1JbmZpbml0eX07Cit9CiAKIFdlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdyaWRO b2RlLk5hbWVDb21wYXJhdG9yID0gZnVuY3Rpb24oYSwgYikKIHsKQEAgLTI0NTcsMTkgKzI0NzIs MjQgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtEYXRhR3JpZE5vZGUuU2l6ZUNvbXBhcmF0b3IgPSBm dW5jdGlvbihhLCBiKQogCiBXZWJJbnNwZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9kZS5Jbml0aWF0 b3JDb21wYXJhdG9yID0gZnVuY3Rpb24oYSwgYikKIHsKLSAgICBpZiAoYS5fZGlzcGxheWVkSW5p dGlhdG9yVHlwZSA8IGIuX2Rpc3BsYXllZEluaXRpYXRvclR5cGUpCisgICAgdmFyIGFJbml0aWF0 b3IgPSBXZWJJbnNwZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9kZS5idWlsZEluaXRpYXRvckluZm8o YS5fcmVxdWVzdCk7CisgICAgdmFyIGJJbml0aWF0b3IgPSBXZWJJbnNwZWN0b3IuTmV0d29ya0Rh dGFHcmlkTm9kZS5idWlsZEluaXRpYXRvckluZm8oYi5fcmVxdWVzdCk7CisKKyAgICBpZiAoYUlu aXRpYXRvci50eXBlIDwgYkluaXRpYXRvci50eXBlKQogICAgICAgICByZXR1cm4gLTE7Ci0gICAg aWYgKGEuX2Rpc3BsYXllZEluaXRpYXRvclR5cGUgPiBiLl9kaXNwbGF5ZWRJbml0aWF0b3JUeXBl KQorICAgIGlmIChhSW5pdGlhdG9yLnR5cGUgPiBiSW5pdGlhdG9yLnR5cGUpCiAgICAgICAgIHJl dHVybiAxOwogCi0gICAgaWYgKGEuX2Rpc3BsYXllZEluaXRpYXRvclVSTCA8IGIuX2Rpc3BsYXll ZEluaXRpYXRvclVSTCkKKyAgICB2YXIgYUluaXRpYXRvclVSTCA9IFdlYkluc3BlY3Rvci5kaXNw bGF5TmFtZUZvclVSTChhSW5pdGlhdG9yLnVybCk7CisgICAgdmFyIGJJbml0aWF0b3JVUkwgPSBX ZWJJbnNwZWN0b3IuZGlzcGxheU5hbWVGb3JVUkwoYkluaXRpYXRvci51cmwpOworICAgIGlmIChh SW5pdGlhdG9yVVJMIDwgYkluaXRpYXRvclVSTCkKICAgICAgICAgcmV0dXJuIC0xOwotICAgIGlm IChhLl9kaXNwbGF5ZWRJbml0aWF0b3JVUkwgPiBiLl9kaXNwbGF5ZWRJbml0aWF0b3JVUkwpCisg ICAgaWYgKGFJbml0aWF0b3JVUkwgPiBiSW5pdGlhdG9yVVJMKQogICAgICAgICByZXR1cm4gMTsK IAotICAgIGlmIChhLl9kaXNwbGF5ZWRJbml0aWF0b3JMaW5lTnVtYmVyIDwgYi5fZGlzcGxheWVk SW5pdGlhdG9yTGluZU51bWJlcikKKyAgICBpZiAoYUluaXRpYXRvci5saW5lTnVtYmVyIDwgYklu aXRpYXRvci5saW5lTnVtYmVyKQogICAgICAgICByZXR1cm4gLTE7Ci0gICAgaWYgKGEuX2Rpc3Bs YXllZEluaXRpYXRvckxpbmVOdW1iZXIgPiBiLl9kaXNwbGF5ZWRJbml0aWF0b3JMaW5lTnVtYmVy KQorICAgIGlmIChhSW5pdGlhdG9yLmxpbmVOdW1iZXIgPiBiSW5pdGlhdG9yLmxpbmVOdW1iZXIp CiAgICAgICAgIHJldHVybiAxOwogCiAgICAgcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtSZXF1ZXN0LmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUmVxdWVzdC5qcwppbmRleCA5OGIxY2Vm YWRlZDlmOWQ1NmIwMzcyN2QyODdmYmZkNjY0YjdjMDBjLi44ZmM5YzVmOTg1ZjhjNGQ1ZmFlMGFh MDhkN2ZlNzA5MDJjYzExOWFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL05ldHdvcmtSZXF1ZXN0LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvTmV0d29ya1JlcXVlc3QuanMKQEAgLTY3LDEyICs2Nyw2IEBAIFdlYkluc3Bl Y3Rvci5OZXR3b3JrUmVxdWVzdC5FdmVudHMgPSB7CiAgICAgUmVzcG9uc2VIZWFkZXJzQ2hhbmdl ZDogIlJlc3BvbnNlSGVhZGVyc0NoYW5nZWQiLAogfQogCi1XZWJJbnNwZWN0b3IuTmV0d29ya1Jl cXVlc3QuSW5pdGlhdG9yVHlwZSA9IHsKLSAgICBQYXJzZXI6ICJwYXJzZXIiLAotICAgIFNjcmlw dDogInNjcmlwdCIsCi0gICAgT3RoZXI6ICJvdGhlciIsCi19Ci0KIC8qKiBAdHlwZWRlZiB7e25h bWU6IHN0cmluZywgdmFsdWU6IHN0cmluZ319ICovCiBXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVl c3QuTmFtZVZhbHVlOwogCg== 195705 2013-03-29 00:51:06 -0700 2013-04-02 22:58:46 -0700 Patch bug-113486-20130329115102.patch text/plain 10249 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODE5ZTk0MWI1NzRjOTZj MjBmMThmNmZmODI2OTcxYTRiZmIxMzhiZS4uMjVlYzJlZTVmYzBjODBkNmEzZTkwNzRjNzVlMDhj NWQ5ODU1ZmI3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTAzLTI4ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtOZXR3b3JrXSBTcGxpdCBidXNpbmVzcyBsb2dpYyBhbmQgcHJlc2VudGF0aW9uIGZv ciBpbml0aWF0b3IgY29sdW1uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTEzNDg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQ3VycmVudGx5IGJ1c2luZXNzIGxvZ2ljIGFuZCBwcmVzZW50YXRpb24gYXJl IG1peGVkLgorICAgICAgICBUaGlzIHByZXZlbnRzIG1ha2luZyBjZWxsIHJlbmRlcmVyIHN0YXRp YyBhbmQgYXBwbHlpbmcKKyAgICAgICAgdmlld3BvcnQgcmVuZGVyaW5nLCBiZWNhdXNlIGluaXRp YXRvciBzb3J0aW5nIGZ1bmN0aW9uCisgICAgICAgIGRlcGVuZHMgb24gZGF0YSB3cml0dGVuIHdo ZW4gY2VsbCBpcyByZW5kZXJlZC4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0 d29ya1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtEYXRhR3JpZE5vZGUu cHJvdG90eXBlLl9yZWZyZXNoSW5pdGlhdG9yQ2VsbCk6CisgICAgICAgIFJlbW92ZWQgYnVzaW5l c3MgbG9naWMuIFVzZSAiaW5pdGlhdG9ySW5mbyIuCisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0 d29ya0RhdGFHcmlkTm9kZS5Jbml0aWF0b3JDb21wYXJhdG9yKToKKyAgICAgICAgVXNlICJpbml0 aWF0b3JJbmZvIi4KKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtSZXF1ZXN0 LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0LnByb3RvdHlwZS5pbml0 aWF0b3JJbmZvKToKKyAgICAgICAgRXh0cmFjdGVkIGJ1c2luZXNzIGxvZ2ljIGZyb20gInJlZnJl c2hJbml0aWF0b3JDZWxsIi4KKwogMjAxMy0wMy0yOSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjE0MzEwMik6IElnbm9yZSB0YWJsZSBjZWxs J3MgaGVpZ2h0IGF0dHJpYnV0ZSB3aGVuIGNoZWNraW5nIGlmIGNvbnRhaW5pbmcgYmxvY2sgaGFz IGF1dG8gaGVpZ2h0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9OZXR3b3JrUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L05ldHdvcmtQYW5lbC5qcwppbmRleCA5N2NjYzA4ODUwYzRmYjQwMTBkOWVhNTE4YWVlZGUxOTcx OWJhZTYyLi41NmEyN2YxNzAwOGUzYmIyMjhhNTE2MmIwYWM0YWJkODc4MDY3NmZjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwpA QCAtMjIzNiw1NSArMjIzNiw0MCBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9kZS5w cm90b3R5cGUgPSB7CiAKICAgICBfcmVmcmVzaEluaXRpYXRvckNlbGw6IGZ1bmN0aW9uKCkKICAg ICB7CisgICAgICAgIHRoaXMuX2luaXRpYXRvckNlbGwucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICAg ICAgdGhpcy5faW5pdGlhdG9yQ2VsbC5yZW1vdmVTdHlsZUNsYXNzKCJuZXR3b3JrLWRpbS1jZWxs Iik7CiAgICAgICAgIHRoaXMuX2luaXRpYXRvckNlbGwucmVtb3ZlU3R5bGVDbGFzcygibmV0d29y ay1zY3JpcHQtaW5pdGlhdGVkIik7CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9pbml0aWF0b3JDZWxs LnJlcXVlc3Q7Ci0gICAgICAgIHRoaXMuX2luaXRpYXRvckNlbGwudGl0bGUgPSAiIjsKLSAgICAg ICAgdGhpcy5fZGlzcGxheWVkSW5pdGlhdG9yVVJMID0gIiI7Ci0gICAgICAgIHRoaXMuX2Rpc3Bs YXllZEluaXRpYXRvckxpbmVOdW1iZXIgPSAtSW5maW5pdHk7Ci0gICAgICAgIHRoaXMuX2Rpc3Bs YXllZEluaXRpYXRvclR5cGUgPSAiIjsKLQotICAgICAgICB2YXIgaW5pdGlhdG9yID0gdGhpcy5f cmVxdWVzdC5pbml0aWF0b3I7Ci0gICAgICAgIHZhciBpbml0aWF0b3JUeXBlcyA9IFdlYkluc3Bl Y3Rvci5OZXR3b3JrUmVxdWVzdC5Jbml0aWF0b3JUeXBlOwotICAgICAgICBpZiAoKGluaXRpYXRv ciAmJiBpbml0aWF0b3IudHlwZSAhPT0gaW5pdGlhdG9yVHlwZXMuT3RoZXIpIHx8IHRoaXMuX3Jl cXVlc3QucmVkaXJlY3RTb3VyY2UpIHsKLSAgICAgICAgICAgIHRoaXMuX2luaXRpYXRvckNlbGwu cmVtb3ZlQ2hpbGRyZW4oKTsKLSAgICAgICAgICAgIHZhciByZWRpcmVjdFNvdXJjZSA9IHRoaXMu X3JlcXVlc3QucmVkaXJlY3RTb3VyY2U7Ci0gICAgICAgICAgICBpZiAocmVkaXJlY3RTb3VyY2Up IHsKLSAgICAgICAgICAgICAgICB0aGlzLl9pbml0aWF0b3JDZWxsLnRpdGxlID0gcmVkaXJlY3RT b3VyY2UudXJsOwotICAgICAgICAgICAgICAgIHRoaXMuX2luaXRpYXRvckNlbGwuYXBwZW5kQ2hp bGQoV2ViSW5zcGVjdG9yLmxpbmtpZnlSZXF1ZXN0QXNOb2RlKHJlZGlyZWN0U291cmNlKSk7Ci0g ICAgICAgICAgICAgICAgdGhpcy5fZGlzcGxheWVkSW5pdGlhdG9yVHlwZSA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiUmVkaXJlY3QiKTsKLSAgICAgICAgICAgICAgICB0aGlzLl9hcHBlbmRTdWJ0 aXRsZSh0aGlzLl9pbml0aWF0b3JDZWxsLCB0aGlzLl9kaXNwbGF5ZWRJbml0aWF0b3JUeXBlKTsK LSAgICAgICAgICAgICAgICB0aGlzLl9kaXNwbGF5ZWRJbml0aWF0b3JVUkwgPSByZWRpcmVjdFNv dXJjZS51cmw7Ci0gICAgICAgICAgICB9IGVsc2UgaWYgKGluaXRpYXRvci50eXBlID09PSBpbml0 aWF0b3JUeXBlcy5TY3JpcHQpIHsKLSAgICAgICAgICAgICAgICB2YXIgdG9wRnJhbWUgPSBpbml0 aWF0b3Iuc3RhY2tUcmFjZVswXTsKLSAgICAgICAgICAgICAgICAvLyBUaGlzIGNvdWxkIGhhcHBl biB3aGVuIHJlcXVlc3QgbG9hZGluZyB3YXMgdHJpZ2dlcmVkIGJ5IGNvbnNvbGUuCi0gICAgICAg ICAgICAgICAgaWYgKCF0b3BGcmFtZS51cmwpIHsKLSAgICAgICAgICAgICAgICAgICAgdGhpcy5f aW5pdGlhdG9yQ2VsbC5hZGRTdHlsZUNsYXNzKCJuZXR3b3JrLWRpbS1jZWxsIik7Ci0gICAgICAg ICAgICAgICAgICAgIHRoaXMuX2Rpc3BsYXllZEluaXRpYXRvclR5cGUgPSBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIk90aGVyIik7Ci0gICAgICAgICAgICAgICAgICAgIHRoaXMuX2luaXRpYXRvckNl bGwuc2V0VGV4dEFuZFRpdGxlKHRoaXMuX2Rpc3BsYXllZEluaXRpYXRvclR5cGUpOwotICAgICAg ICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAg IHZhciB1cmxFbGVtZW50ID0gdGhpcy5fcGFyZW50Vmlldy5fbGlua2lmaWVyLmxpbmtpZnlMb2Nh dGlvbih0b3BGcmFtZS51cmwsIHRvcEZyYW1lLmxpbmVOdW1iZXIgLSAxLCAwKTsKLSAgICAgICAg ICAgICAgICB1cmxFbGVtZW50LnRpdGxlID0gIiI7Ci0gICAgICAgICAgICAgICAgdGhpcy5faW5p dGlhdG9yQ2VsbC5hcHBlbmRDaGlsZCh1cmxFbGVtZW50KTsKLSAgICAgICAgICAgICAgICB0aGlz Ll9kaXNwbGF5ZWRJbml0aWF0b3JUeXBlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTY3JpcHQi KTsKLSAgICAgICAgICAgICAgICB0aGlzLl9hcHBlbmRTdWJ0aXRsZSh0aGlzLl9pbml0aWF0b3JD ZWxsLCB0aGlzLl9kaXNwbGF5ZWRJbml0aWF0b3JUeXBlKTsKLSAgICAgICAgICAgICAgICB0aGlz Ll9pbml0aWF0b3JDZWxsLmFkZFN0eWxlQ2xhc3MoIm5ldHdvcmstc2NyaXB0LWluaXRpYXRlZCIp OwotICAgICAgICAgICAgICAgIHRoaXMuX2luaXRpYXRvckNlbGwucmVxdWVzdCA9IHRoaXMuX3Jl cXVlc3Q7Ci0gICAgICAgICAgICAgICAgdGhpcy5fZGlzcGxheWVkSW5pdGlhdG9yVVJMID0gV2Vi SW5zcGVjdG9yLmRpc3BsYXlOYW1lRm9yVVJMKHRvcEZyYW1lLnVybCk7Ci0gICAgICAgICAgICAg ICAgdGhpcy5fZGlzcGxheWVkSW5pdGlhdG9yTGluZU51bWJlciA9IHRvcEZyYW1lLmxpbmVOdW1i ZXI7Ci0gICAgICAgICAgICB9IGVsc2UgeyAvLyBpbml0aWF0b3IudHlwZSA9PT0gaW5pdGlhdG9y VHlwZXMuUGFyc2VyCi0gICAgICAgICAgICAgICAgdGhpcy5faW5pdGlhdG9yQ2VsbC50aXRsZSA9 IGluaXRpYXRvci51cmwgKyAiOiIgKyBpbml0aWF0b3IubGluZU51bWJlcjsKLSAgICAgICAgICAg ICAgICB0aGlzLl9pbml0aWF0b3JDZWxsLmFwcGVuZENoaWxkKFdlYkluc3BlY3Rvci5saW5raWZ5 UmVzb3VyY2VBc05vZGUoaW5pdGlhdG9yLnVybCwgaW5pdGlhdG9yLmxpbmVOdW1iZXIgLSAxKSk7 Ci0gICAgICAgICAgICAgICAgdGhpcy5fZGlzcGxheWVkSW5pdGlhdG9yVHlwZSA9IFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiUGFyc2VyIik7Ci0gICAgICAgICAgICAgICAgdGhpcy5fYXBwZW5kU3Vi dGl0bGUodGhpcy5faW5pdGlhdG9yQ2VsbCwgdGhpcy5fZGlzcGxheWVkSW5pdGlhdG9yVHlwZSk7 Ci0gICAgICAgICAgICAgICAgdGhpcy5fZGlzcGxheWVkSW5pdGlhdG9yVVJMID0gV2ViSW5zcGVj dG9yLmRpc3BsYXlOYW1lRm9yVVJMKGluaXRpYXRvci51cmwpOwotICAgICAgICAgICAgICAgIHRo aXMuX2Rpc3BsYXllZEluaXRpYXRvckxpbmVOdW1iZXIgPSBpbml0aWF0b3IubGluZU51bWJlcjsK LSAgICAgICAgICAgIH0KLSAgICAgICAgfSBlbHNlIHsKKworICAgICAgICB2YXIgcmVxdWVzdCA9 IHRoaXMuX3JlcXVlc3Q7CisgICAgICAgIHZhciBpbml0aWF0b3IgPSByZXF1ZXN0LmluaXRpYXRv ckluZm8oKTsKKworICAgICAgICBzd2l0Y2ggKGluaXRpYXRvci50eXBlKSB7CisgICAgICAgIGNh c2UgV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0LkluaXRpYXRvclR5cGUuUGFyc2VyOgorICAg ICAgICAgICAgdGhpcy5faW5pdGlhdG9yQ2VsbC50aXRsZSA9IGluaXRpYXRvci51cmwgKyAiOiIg KyBpbml0aWF0b3IubGluZU51bWJlcjsKKyAgICAgICAgICAgIHRoaXMuX2luaXRpYXRvckNlbGwu YXBwZW5kQ2hpbGQoV2ViSW5zcGVjdG9yLmxpbmtpZnlSZXNvdXJjZUFzTm9kZShpbml0aWF0b3Iu dXJsLCBpbml0aWF0b3IubGluZU51bWJlciAtIDEpKTsKKyAgICAgICAgICAgIHRoaXMuX2FwcGVu ZFN1YnRpdGxlKHRoaXMuX2luaXRpYXRvckNlbGwsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiUGFy c2VyIikpOworICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3Iu TmV0d29ya1JlcXVlc3QuSW5pdGlhdG9yVHlwZS5SZWRpcmVjdDoKKyAgICAgICAgICAgIHRoaXMu X2luaXRpYXRvckNlbGwudGl0bGUgPSBpbml0aWF0b3IudXJsOworICAgICAgICAgICAgdGhpcy5f aW5pdGlhdG9yQ2VsbC5hcHBlbmRDaGlsZChXZWJJbnNwZWN0b3IubGlua2lmeVJlcXVlc3RBc05v ZGUocmVxdWVzdC5yZWRpcmVjdFNvdXJjZSkpOworICAgICAgICAgICAgdGhpcy5fYXBwZW5kU3Vi dGl0bGUodGhpcy5faW5pdGlhdG9yQ2VsbCwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZWRpcmVj dCIpKTsKKyAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLk5l dHdvcmtSZXF1ZXN0LkluaXRpYXRvclR5cGUuU2NyaXB0OgorICAgICAgICAgICAgdmFyIHVybEVs ZW1lbnQgPSB0aGlzLl9wYXJlbnRWaWV3Ll9saW5raWZpZXIubGlua2lmeUxvY2F0aW9uKGluaXRp YXRvci51cmwsIGluaXRpYXRvci5saW5lTnVtYmVyIC0gMSwgMCk7CisgICAgICAgICAgICB1cmxF bGVtZW50LnRpdGxlID0gIiI7CisgICAgICAgICAgICB0aGlzLl9pbml0aWF0b3JDZWxsLmFwcGVu ZENoaWxkKHVybEVsZW1lbnQpOworICAgICAgICAgICAgdGhpcy5fYXBwZW5kU3VidGl0bGUodGhp cy5faW5pdGlhdG9yQ2VsbCwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTY3JpcHQiKSk7CisgICAg ICAgICAgICB0aGlzLl9pbml0aWF0b3JDZWxsLmFkZFN0eWxlQ2xhc3MoIm5ldHdvcmstc2NyaXB0 LWluaXRpYXRlZCIpOworICAgICAgICAgICAgdGhpcy5faW5pdGlhdG9yQ2VsbC5yZXF1ZXN0ID0g cmVxdWVzdDsKKyAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgIGRlZmF1bHQ6CisgICAgICAg ICAgICB0aGlzLl9pbml0aWF0b3JDZWxsLnRpdGxlID0gIiI7CiAgICAgICAgICAgICB0aGlzLl9p bml0aWF0b3JDZWxsLmFkZFN0eWxlQ2xhc3MoIm5ldHdvcmstZGltLWNlbGwiKTsKLSAgICAgICAg ICAgIHRoaXMuX2Rpc3BsYXllZEluaXRpYXRvclR5cGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmco Ik90aGVyIik7Ci0gICAgICAgICAgICB0aGlzLl9pbml0aWF0b3JDZWxsLnNldFRleHRBbmRUaXRs ZSh0aGlzLl9kaXNwbGF5ZWRJbml0aWF0b3JUeXBlKTsKKyAgICAgICAgICAgIHRoaXMuX2luaXRp YXRvckNlbGwuc2V0VGV4dEFuZFRpdGxlKFdlYkluc3BlY3Rvci5VSVN0cmluZygiT3RoZXIiKSk7 CiAgICAgICAgIH0KICAgICB9LAogCkBAIC0yNDU3LDE5ICsyNDQyLDIyIEBAIFdlYkluc3BlY3Rv ci5OZXR3b3JrRGF0YUdyaWROb2RlLlNpemVDb21wYXJhdG9yID0gZnVuY3Rpb24oYSwgYikKIAog V2ViSW5zcGVjdG9yLk5ldHdvcmtEYXRhR3JpZE5vZGUuSW5pdGlhdG9yQ29tcGFyYXRvciA9IGZ1 bmN0aW9uKGEsIGIpCiB7Ci0gICAgaWYgKGEuX2Rpc3BsYXllZEluaXRpYXRvclR5cGUgPCBiLl9k aXNwbGF5ZWRJbml0aWF0b3JUeXBlKQorICAgIHZhciBhSW5pdGlhdG9yID0gYS5fcmVxdWVzdC5p bml0aWF0b3JJbmZvKCk7CisgICAgdmFyIGJJbml0aWF0b3IgPSBiLl9yZXF1ZXN0LmluaXRpYXRv ckluZm8oKTsKKworICAgIGlmIChhSW5pdGlhdG9yLnR5cGUgPCBiSW5pdGlhdG9yLnR5cGUpCiAg ICAgICAgIHJldHVybiAtMTsKLSAgICBpZiAoYS5fZGlzcGxheWVkSW5pdGlhdG9yVHlwZSA+IGIu X2Rpc3BsYXllZEluaXRpYXRvclR5cGUpCisgICAgaWYgKGFJbml0aWF0b3IudHlwZSA+IGJJbml0 aWF0b3IudHlwZSkKICAgICAgICAgcmV0dXJuIDE7CiAKLSAgICBpZiAoYS5fZGlzcGxheWVkSW5p dGlhdG9yVVJMIDwgYi5fZGlzcGxheWVkSW5pdGlhdG9yVVJMKQorICAgIGlmIChhSW5pdGlhdG9y LnNvdXJjZSA8IGJJbml0aWF0b3Iuc291cmNlKQogICAgICAgICByZXR1cm4gLTE7Ci0gICAgaWYg KGEuX2Rpc3BsYXllZEluaXRpYXRvclVSTCA+IGIuX2Rpc3BsYXllZEluaXRpYXRvclVSTCkKKyAg ICBpZiAoYUluaXRpYXRvci5zb3VyY2UgPiBiSW5pdGlhdG9yLnNvdXJjZSkKICAgICAgICAgcmV0 dXJuIDE7CiAKLSAgICBpZiAoYS5fZGlzcGxheWVkSW5pdGlhdG9yTGluZU51bWJlciA8IGIuX2Rp c3BsYXllZEluaXRpYXRvckxpbmVOdW1iZXIpCisgICAgaWYgKGFJbml0aWF0b3IubGluZU51bWJl ciA8IGJJbml0aWF0b3IubGluZU51bWJlcikKICAgICAgICAgcmV0dXJuIC0xOwotICAgIGlmIChh Ll9kaXNwbGF5ZWRJbml0aWF0b3JMaW5lTnVtYmVyID4gYi5fZGlzcGxheWVkSW5pdGlhdG9yTGlu ZU51bWJlcikKKyAgICBpZiAoYUluaXRpYXRvci5saW5lTnVtYmVyID4gYkluaXRpYXRvci5saW5l TnVtYmVyKQogICAgICAgICByZXR1cm4gMTsKIAogICAgIHJldHVybiAwOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUmVxdWVzdC5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1JlcXVlc3QuanMKaW5kZXgg OThiMWNlZmFkZWQ5ZjlkNTZiMDM3MjdkMjg3ZmJmZDY2NGI3YzAwYy4uMTY1N2QxNTE0ZDQ5ZGFh NmJmODk0ZjczNTFjMTBlZjY2YmEzMmFlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUmVxdWVzdC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtSZXF1ZXN0LmpzCkBAIC02NywxMCArNjcsMTIgQEAg V2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0LkV2ZW50cyA9IHsKICAgICBSZXNwb25zZUhlYWRl cnNDaGFuZ2VkOiAiUmVzcG9uc2VIZWFkZXJzQ2hhbmdlZCIsCiB9CiAKKy8qKiBAZW51bSB7c3Ry aW5nfSAqLwogV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0LkluaXRpYXRvclR5cGUgPSB7Ci0g ICAgUGFyc2VyOiAicGFyc2VyIiwKLSAgICBTY3JpcHQ6ICJzY3JpcHQiLAogICAgIE90aGVyOiAi b3RoZXIiLAorICAgIFBhcnNlcjogInBhcnNlciIsCisgICAgUmVkaXJlY3Q6ICJyZWRpcmVjdCIs CisgICAgU2NyaXB0OiAic2NyaXB0IgogfQogCiAvKiogQHR5cGVkZWYge3tuYW1lOiBzdHJpbmcs IHZhbHVlOiBzdHJpbmd9fSAqLwpAQCAtNDUzLDYgKzQ1NSw3IEBAIFdlYkluc3BlY3Rvci5OZXR3 b3JrUmVxdWVzdC5wcm90b3R5cGUgPSB7CiAgICAgc2V0IHJlZGlyZWN0U291cmNlKHgpCiAgICAg ewogICAgICAgICB0aGlzLl9yZWRpcmVjdFNvdXJjZSA9IHg7CisgICAgICAgIGRlbGV0ZSB0aGlz Ll9pbml0aWF0b3JJbmZvOwogICAgIH0sCiAKICAgICAvKioKQEAgLTg3NSw2ICs4NzgsNDAgQEAg V2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0LnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAg LyoqCisgICAgICogQHJldHVybiB7e3R5cGU6IFdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5J bml0aWF0b3JUeXBlLCB1cmw6IHN0cmluZywgc291cmNlOiBzdHJpbmcsIGxpbmVOdW1iZXI6IG51 bWJlcn19CisgICAgICovCisgICAgaW5pdGlhdG9ySW5mbzogZnVuY3Rpb24oKQorICAgIHsKKyAg ICAgICAgaWYgKHRoaXMuX2luaXRpYXRvckluZm8pCisgICAgICAgICAgICByZXR1cm4gdGhpcy5f aW5pdGlhdG9ySW5mbzsKKworICAgICAgICB2YXIgdHlwZSA9IFdlYkluc3BlY3Rvci5OZXR3b3Jr UmVxdWVzdC5Jbml0aWF0b3JUeXBlLk90aGVyOworICAgICAgICB2YXIgdXJsID0gIiI7CisgICAg ICAgIHZhciBsaW5lTnVtYmVyID0gLUluZmluaXR5OworCisgICAgICAgIGlmICh0aGlzLnJlZGly ZWN0U291cmNlKSB7CisgICAgICAgICAgICB0eXBlID0gV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1 ZXN0LkluaXRpYXRvclR5cGUuUmVkaXJlY3Q7CisgICAgICAgICAgICB1cmwgPSB0aGlzLnJlZGly ZWN0U291cmNlLnVybDsKKyAgICAgICAgfSBlbHNlIGlmICh0aGlzLmluaXRpYXRvcikgeworICAg ICAgICAgICAgaWYgKHRoaXMuaW5pdGlhdG9yLnR5cGUgPT09IE5ldHdvcmtBZ2VudC5Jbml0aWF0 b3JUeXBlLlBhcnNlcikgeworICAgICAgICAgICAgICAgIHR5cGUgPSBXZWJJbnNwZWN0b3IuTmV0 d29ya1JlcXVlc3QuSW5pdGlhdG9yVHlwZS5QYXJzZXI7CisgICAgICAgICAgICAgICAgdXJsID0g dGhpcy5pbml0aWF0b3IudXJsOworICAgICAgICAgICAgICAgIGxpbmVOdW1iZXIgPSB0aGlzLmlu aXRpYXRvci5saW5lTnVtYmVyOworICAgICAgICAgICAgfSBlbHNlIGlmICh0aGlzLmluaXRpYXRv ci50eXBlID09PSBOZXR3b3JrQWdlbnQuSW5pdGlhdG9yVHlwZS5TY3JpcHQpIHsKKyAgICAgICAg ICAgICAgICB2YXIgdG9wRnJhbWUgPSB0aGlzLmluaXRpYXRvci5zdGFja1RyYWNlWzBdOworICAg ICAgICAgICAgICAgIGlmICh0b3BGcmFtZS51cmwpIHsKKyAgICAgICAgICAgICAgICAgICAgdHlw ZSA9IFdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5Jbml0aWF0b3JUeXBlLlNjcmlwdDsKKyAg ICAgICAgICAgICAgICAgICAgdXJsID0gdG9wRnJhbWUudXJsOworICAgICAgICAgICAgICAgICAg ICBsaW5lTnVtYmVyID0gdG9wRnJhbWUubGluZU51bWJlcjsKKyAgICAgICAgICAgICAgICB9Cisg ICAgICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgICB0aGlzLl9pbml0aWF0b3JJbmZvID0g e3R5cGU6IHR5cGUsIHVybDogdXJsLCBzb3VyY2U6IFdlYkluc3BlY3Rvci5kaXNwbGF5TmFtZUZv clVSTCh1cmwpLCBsaW5lTnVtYmVyOiBsaW5lTnVtYmVyfTsKKyAgICAgICAgcmV0dXJuIHRoaXMu X2luaXRpYXRvckluZm87CisgICAgfSwKKworICAgIC8qKgogICAgICAqIEByZXR1cm4geyFBcnJh eS48IU9iamVjdD59CiAgICAgICovCiAgICAgZnJhbWVzOiBmdW5jdGlvbigpCg==