50813 2010-12-10 06:40:26 -0800 Web Inspector: creating conditional breakpoint doesn't work if breakpoint moves 2010-12-20 08:45:09 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 320121 0 podivilov 2010-12-10 06:40:26 -0800 1. Right click on a script line with comment. 2. Choose "Add Conditional Breakpoint". 3. Breakpoint is moved but condition popup doesn't, breakpoint is created without condition. 320122 1 76188 podivilov 2010-12-10 06:41:12 -0800 Created attachment 76188 Patch. 324342 2 76188 yurys 2010-12-20 05:38:14 -0800 Comment on attachment 76188 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=76188&action=review > WebCore/inspector/front-end/SourceFrame.js:452 > + lineNumber -= 1; Why do you need this? It should be extracted into a method with descriptive name. 324416 3 podivilov 2010-12-20 08:44:27 -0800 (In reply to comment #2) > (From update of attachment 76188 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=76188&action=review > > > WebCore/inspector/front-end/SourceFrame.js:452 > > + lineNumber -= 1; > > Why do you need this? It should be extracted into a method with descriptive name. This is because we use zero-based line numbers in text viewer. We may add addDecoration/removeDecoration methods to SourceFrame and extract it there. 324419 4 podivilov 2010-12-20 08:45:09 -0800 Committed r74350: <http://trac.webkit.org/changeset/74350> 76188 2010-12-10 06:41:12 -0800 2010-12-20 05:38:14 -0800 Patch. patch text/plain 10785 podivilov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDg5YzVkOC4uMjY1OGNlMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxMC0xMi0xMCAgUGF2ZWwgUG9kaXZp bG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiAiQWRkIGNvbmRpdGlvbmFsIGJy ZWFrcG9pbnQiIC0gY3JlYXRlIGJyZWFrcG9pbnQgb25seSBhZnRlciBjb25kaXRpb24gaXMgcHJv dmlkZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 MDgxMworCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuX2FkZEJyZWFrcG9pbnQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fYnJlYWtwb2lu dFJlbW92ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5f YnJlYWtwb2ludENoYW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnBy b3RvdHlwZS5fc2V0QnJlYWtwb2ludERlY29yYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fcmVtb3ZlQnJlYWtwb2ludERlY29yYXRpb24pOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fY29udGV4dE1lbnUuYWRk Q29uZGl0aW9uYWxCcmVha3BvaW50LmRpZEVkaXRCcmVha3BvaW50Q29uZGl0aW9uKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuX2NvbnRleHRNZW51LmFkZENv bmRpdGlvbmFsQnJlYWtwb2ludCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUu cHJvdG90eXBlLl9jb250ZXh0TWVudS5lbHNlLmVkaXRCcmVha3BvaW50Q29uZGl0aW9uLmRpZEVk aXRCcmVha3BvaW50Q29uZGl0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFt ZS5wcm90b3R5cGUuX2NvbnRleHRNZW51LmVsc2UuZWRpdEJyZWFrcG9pbnRDb25kaXRpb24pOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fY29udGV4dE1lbnUp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fZWRpdEJyZWFr cG9pbnRDb25kaXRpb24uZmluaXNoRWRpdGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291 cmNlRnJhbWUucHJvdG90eXBlLl9lZGl0QnJlYWtwb2ludENvbmRpdGlvbik6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLl9jb250aW51ZVRvTGluZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLl9zZXRCcmVha3BvaW50KToK KwogMjAxMC0xMi0wOSAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEdhdmluIEJhcnJhY2xvdWdoLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NvdXJjZUZyYW1lLmpzCmluZGV4IDhmMTAxZTIuLjM1OTc3ZmIgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcworKysgYi9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKQEAgLTI5MSwyNCArMjkxLDYgQEAgV2ViSW5z cGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgbXNnLl9yZXNvdXJjZU1l c3NhZ2VSZXBlYXRDb3VudEVsZW1lbnQudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIiAocmVwZWF0ZWQgJWQgdGltZXMpIiwgbXNnLnJlcGVhdENvdW50KTsKICAgICB9LAogCi0g ICAgX2JyZWFrcG9pbnRDaGFuZ2VkOiBmdW5jdGlvbihldmVudCkKLSAgICB7Ci0gICAgICAgIHZh ciBicmVha3BvaW50ID0gZXZlbnQudGFyZ2V0OwotICAgICAgICB2YXIgbGluZU51bWJlciA9IGJy ZWFrcG9pbnQubGluZSAtIDE7Ci0gICAgICAgIGlmIChsaW5lTnVtYmVyID49IHRoaXMuX3RleHRN b2RlbC5saW5lc0NvdW50KQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIGlmIChicmVh a3BvaW50LmVuYWJsZWQpCi0gICAgICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLnJlbW92ZURlY29y YXRpb24obGluZU51bWJlciwgIndlYmtpdC1icmVha3BvaW50LWRpc2FibGVkIik7Ci0gICAgICAg IGVsc2UKLSAgICAgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIuYWRkRGVjb3JhdGlvbihsaW5lTnVt YmVyLCAid2Via2l0LWJyZWFrcG9pbnQtZGlzYWJsZWQiKTsKLQotICAgICAgICBpZiAoYnJlYWtw b2ludC5jb25kaXRpb24pCi0gICAgICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLmFkZERlY29yYXRp b24obGluZU51bWJlciwgIndlYmtpdC1icmVha3BvaW50LWNvbmRpdGlvbmFsIik7Ci0gICAgICAg IGVsc2UKLSAgICAgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIucmVtb3ZlRGVjb3JhdGlvbihsaW5l TnVtYmVyLCAid2Via2l0LWJyZWFrcG9pbnQtY29uZGl0aW9uYWwiKTsKLSAgICB9LAotCiAgICAg X3VwZGF0ZUV4ZWN1dGlvbkxpbmU6IGZ1bmN0aW9uKHByZXZpb3VzTGluZSkKICAgICB7CiAgICAg ICAgIGlmIChwcmV2aW91c0xpbmUpIHsKQEAgLTQyMSwyMyArNDAzLDE1IEBAIFdlYkluc3BlY3Rv ci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAKICAgICBfYWRkQnJlYWtwb2ludDogZnVuY3Rp b24oYnJlYWtwb2ludCkKICAgICB7Ci0gICAgICAgIHZhciBsaW5lTnVtYmVyID0gYnJlYWtwb2lu dC5saW5lIC0gMTsKLSAgICAgICAgaWYgKGxpbmVOdW1iZXIgPj0gdGhpcy5fdGV4dE1vZGVsLmxp bmVzQ291bnQpCisgICAgICAgIGlmIChicmVha3BvaW50LmxpbmUgPiB0aGlzLl90ZXh0TW9kZWwu bGluZXNDb3VudCkKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBicmVha3BvaW50LmFk ZEV2ZW50TGlzdGVuZXIoImVuYWJsZS1jaGFuZ2VkIiwgdGhpcy5fYnJlYWtwb2ludENoYW5nZWQs IHRoaXMpOwogICAgICAgICBicmVha3BvaW50LmFkZEV2ZW50TGlzdGVuZXIoImNvbmRpdGlvbi1j aGFuZ2VkIiwgdGhpcy5fYnJlYWtwb2ludENoYW5nZWQsIHRoaXMpOwogICAgICAgICBicmVha3Bv aW50LmFkZEV2ZW50TGlzdGVuZXIoInJlbW92ZWQiLCB0aGlzLl9icmVha3BvaW50UmVtb3ZlZCwg dGhpcyk7CiAKLSAgICAgICAgYnJlYWtwb2ludC5zb3VyY2VUZXh0ID0gdGhpcy5fdGV4dE1vZGVs LmxpbmUobGluZU51bWJlcik7Ci0KLSAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5iZWdpblVwZGF0 ZXMoKTsKLSAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5hZGREZWNvcmF0aW9uKGxpbmVOdW1iZXIs ICJ3ZWJraXQtYnJlYWtwb2ludCIpOwotICAgICAgICBpZiAoIWJyZWFrcG9pbnQuZW5hYmxlZCkK LSAgICAgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIuYWRkRGVjb3JhdGlvbihsaW5lTnVtYmVyLCAi d2Via2l0LWJyZWFrcG9pbnQtZGlzYWJsZWQiKTsKLSAgICAgICAgaWYgKGJyZWFrcG9pbnQuY29u ZGl0aW9uKQotICAgICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5hZGREZWNvcmF0aW9uKGxpbmVO dW1iZXIsICJ3ZWJraXQtYnJlYWtwb2ludC1jb25kaXRpb25hbCIpOwotICAgICAgICB0aGlzLl90 ZXh0Vmlld2VyLmVuZFVwZGF0ZXMoKTsKKyAgICAgICAgYnJlYWtwb2ludC5zb3VyY2VUZXh0ID0g dGhpcy5fdGV4dE1vZGVsLmxpbmUoYnJlYWtwb2ludC5saW5lIC0gMSk7CisgICAgICAgIHRoaXMu X3NldEJyZWFrcG9pbnREZWNvcmF0aW9uKGJyZWFrcG9pbnQubGluZSwgYnJlYWtwb2ludC5lbmFi bGVkLCAhIWJyZWFrcG9pbnQuY29uZGl0aW9uKTsKICAgICB9LAogCiAgICAgX2JyZWFrcG9pbnRS ZW1vdmVkOiBmdW5jdGlvbihldmVudCkKQEAgLTQ0OCw3ICs0MjIsMzQgQEAgV2ViSW5zcGVjdG9y LlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgYnJlYWtwb2ludC5yZW1vdmVFdmVu dExpc3RlbmVyKCJjb25kaXRpb24tY2hhbmdlZCIsIG51bGwsIHRoaXMpOwogICAgICAgICBicmVh a3BvaW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoInJlbW92ZWQiLCBudWxsLCB0aGlzKTsKIAotICAg ICAgICB2YXIgbGluZU51bWJlciA9IGJyZWFrcG9pbnQubGluZSAtIDE7CisgICAgICAgIHRoaXMu X3JlbW92ZUJyZWFrcG9pbnREZWNvcmF0aW9uKGJyZWFrcG9pbnQubGluZSk7CisgICAgfSwKKwor ICAgIF9icmVha3BvaW50Q2hhbmdlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB2 YXIgYnJlYWtwb2ludCA9IGV2ZW50LnRhcmdldDsKKyAgICAgICAgdGhpcy5fc2V0QnJlYWtwb2lu dERlY29yYXRpb24oYnJlYWtwb2ludC5saW5lLCBicmVha3BvaW50LmVuYWJsZWQsICEhYnJlYWtw b2ludC5jb25kaXRpb24pOworICAgIH0sCisKKyAgICBfc2V0QnJlYWtwb2ludERlY29yYXRpb246 IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIGVuYWJsZWQsIGhhc0NvbmRpdGlvbikKKyAgICB7CisgICAg ICAgIGxpbmVOdW1iZXIgLT0gMTsKKyAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5iZWdpblVwZGF0 ZXMoKTsKKyAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5hZGREZWNvcmF0aW9uKGxpbmVOdW1iZXIs ICJ3ZWJraXQtYnJlYWtwb2ludCIpOworICAgICAgICBpZiAoZW5hYmxlZCkKKyAgICAgICAgICAg IHRoaXMuX3RleHRWaWV3ZXIucmVtb3ZlRGVjb3JhdGlvbihsaW5lTnVtYmVyLCAid2Via2l0LWJy ZWFrcG9pbnQtZGlzYWJsZWQiKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGhpcy5fdGV4 dFZpZXdlci5hZGREZWNvcmF0aW9uKGxpbmVOdW1iZXIsICJ3ZWJraXQtYnJlYWtwb2ludC1kaXNh YmxlZCIpOworICAgICAgICBpZiAoaGFzQ29uZGl0aW9uKQorICAgICAgICAgICAgdGhpcy5fdGV4 dFZpZXdlci5hZGREZWNvcmF0aW9uKGxpbmVOdW1iZXIsICJ3ZWJraXQtYnJlYWtwb2ludC1jb25k aXRpb25hbCIpOworICAgICAgICBlbHNlCisgICAgICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLnJl bW92ZURlY29yYXRpb24obGluZU51bWJlciwgIndlYmtpdC1icmVha3BvaW50LWNvbmRpdGlvbmFs Iik7CisgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIuZW5kVXBkYXRlcygpOworICAgIH0sCisKKyAg ICBfcmVtb3ZlQnJlYWtwb2ludERlY29yYXRpb246IGZ1bmN0aW9uKGxpbmVOdW1iZXIpCisgICAg eworICAgICAgICBsaW5lTnVtYmVyIC09IDE7CiAgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIuYmVn aW5VcGRhdGVzKCk7CiAgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIucmVtb3ZlRGVjb3JhdGlvbihs aW5lTnVtYmVyLCAid2Via2l0LWJyZWFrcG9pbnQiKTsKICAgICAgICAgdGhpcy5fdGV4dFZpZXdl ci5yZW1vdmVEZWNvcmF0aW9uKGxpbmVOdW1iZXIsICJ3ZWJraXQtYnJlYWtwb2ludC1kaXNhYmxl ZCIpOwpAQCAtNDc3LDE3ICs0NzgsMjkgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3Rv dHlwZSA9IHsKIAogICAgICAgICAgICAgZnVuY3Rpb24gYWRkQ29uZGl0aW9uYWxCcmVha3BvaW50 KCkKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICB0aGlzLl9zZXRCcmVha3BvaW50KGxp bmVOdW1iZXIpOwotICAgICAgICAgICAgICAgIHZhciBicmVha3BvaW50ID0gdGhpcy5fZmluZEJy ZWFrcG9pbnQobGluZU51bWJlcik7Ci0gICAgICAgICAgICAgICAgaWYgKGJyZWFrcG9pbnQpCi0g ICAgICAgICAgICAgICAgICAgIHRoaXMuX2VkaXRCcmVha3BvaW50Q29uZGl0aW9uKGJyZWFrcG9p bnQpOworICAgICAgICAgICAgICAgIHRoaXMuX3NldEJyZWFrcG9pbnREZWNvcmF0aW9uKGxpbmVO dW1iZXIsIHRydWUsIHRydWUpOworICAgICAgICAgICAgICAgIGZ1bmN0aW9uIGRpZEVkaXRCcmVh a3BvaW50Q29uZGl0aW9uKGNvbW1pdHRlZCwgY29uZGl0aW9uKQorICAgICAgICAgICAgICAgIHsK KyAgICAgICAgICAgICAgICAgICAgdGhpcy5fcmVtb3ZlQnJlYWtwb2ludERlY29yYXRpb24obGlu ZU51bWJlcik7CisgICAgICAgICAgICAgICAgICAgIGlmIChjb21taXR0ZWQpCisgICAgICAgICAg ICAgICAgICAgICAgICB0aGlzLl9zZXRCcmVha3BvaW50KGxpbmVOdW1iZXIsIGNvbmRpdGlvbik7 CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIHRoaXMuX2VkaXRCcmVha3BvaW50 Q29uZGl0aW9uKGxpbmVOdW1iZXIsICIiLCBkaWRFZGl0QnJlYWtwb2ludENvbmRpdGlvbi5iaW5k KHRoaXMpKTsKICAgICAgICAgICAgIH0KLQogICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5k SXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFkZCBDb25kaXRpb25hbCBCcmVha3BvaW504oCm IiksIGFkZENvbmRpdGlvbmFsQnJlYWtwb2ludC5iaW5kKHRoaXMpKTsKICAgICAgICAgfSBlbHNl IHsKICAgICAgICAgICAgIC8vIFRoaXMgcm93IGhhcyBhIGJyZWFrcG9pbnQsIHdlIHdhbnQgdG8g c2hvdyBlZGl0IGFuZCByZW1vdmUgYnJlYWtwb2ludCwgYW5kIGVpdGhlciBkaXNhYmxlIG9yIGVu YWJsZS4KICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJSZW1vdmUgQnJlYWtwb2ludCIpLCBicmVha3BvaW50LnJlbW92ZS5iaW5kKGJyZWFr cG9pbnQpKTsKLSAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJFZGl0IEJyZWFrcG9pbnTigKYiKSwgdGhpcy5fZWRpdEJyZWFrcG9pbnRDb25k aXRpb24uYmluZCh0aGlzLCBicmVha3BvaW50KSk7CisgICAgICAgICAgICBmdW5jdGlvbiBlZGl0 QnJlYWtwb2ludENvbmRpdGlvbigpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgZnVu Y3Rpb24gZGlkRWRpdEJyZWFrcG9pbnRDb25kaXRpb24oY29tbWl0dGVkLCBjb25kaXRpb24pCisg ICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICBpZiAoY29tbWl0dGVkKQorICAg ICAgICAgICAgICAgICAgICAgICAgYnJlYWtwb2ludC5jb25kaXRpb24gPSBjb25kaXRpb247Cisg ICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIHRoaXMuX2VkaXRCcmVha3BvaW50Q29u ZGl0aW9uKGxpbmVOdW1iZXIsIGJyZWFrcG9pbnQuY29uZGl0aW9uLCBkaWRFZGl0QnJlYWtwb2lu dENvbmRpdGlvbik7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBl bmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiRWRpdCBCcmVha3BvaW504oCmIiksIGVkaXRC cmVha3BvaW50Q29uZGl0aW9uLmJpbmQodGhpcykpOwogICAgICAgICAgICAgaWYgKGJyZWFrcG9p bnQuZW5hYmxlZCkKICAgICAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYklu c3BlY3Rvci5VSVN0cmluZygiRGlzYWJsZSBCcmVha3BvaW50IiksIGZ1bmN0aW9uKCkgeyBicmVh a3BvaW50LmVuYWJsZWQgPSBmYWxzZTsgfSk7CiAgICAgICAgICAgICBlbHNlCkBAIC02ODEsMzgg KzY5NCwyNSBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAg ICBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMuZXZhbHVhdGVJblNlbGVjdGVkQ2FsbEZyYW1l KGVsZW1lbnQudGV4dENvbnRlbnQsIGZhbHNlLCB0aGlzLl9wb3BvdmVyT2JqZWN0R3JvdXAsIGV2 YWx1YXRlQ2FsbGJhY2suYmluZCh0aGlzKSk7CiAgICAgfSwKIAotICAgIF9lZGl0QnJlYWtwb2lu dENvbmRpdGlvbjogZnVuY3Rpb24oYnJlYWtwb2ludCkKKyAgICBfZWRpdEJyZWFrcG9pbnRDb25k aXRpb246IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIGNvbmRpdGlvbiwgY2FsbGJhY2spCiAgICAgewot ICAgICAgICB0aGlzLl9zaG93QnJlYWtwb2ludENvbmRpdGlvblBvcHVwKGJyZWFrcG9pbnQubGlu ZSk7Ci0KLSAgICAgICAgZnVuY3Rpb24gY29tbWl0dGVkKGVsZW1lbnQsIG5ld1RleHQpCi0gICAg ICAgIHsKLSAgICAgICAgICAgIGJyZWFrcG9pbnQuY29uZGl0aW9uID0gbmV3VGV4dDsKLSAgICAg ICAgICAgIGRpc21pc3NlZC5jYWxsKHRoaXMpOwotICAgICAgICB9CisgICAgICAgIGxpbmVOdW1i ZXIgLT0gMTsKKyAgICAgICAgdGhpcy5fY29uZGl0aW9uRWxlbWVudCA9IHRoaXMuX2NyZWF0ZUNv bmRpdGlvbkVsZW1lbnQobGluZU51bWJlcik7CisgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIuYWRk RGVjb3JhdGlvbihsaW5lTnVtYmVyLCB0aGlzLl9jb25kaXRpb25FbGVtZW50KTsKIAotICAgICAg ICBmdW5jdGlvbiBkaXNtaXNzZWQoKQorICAgICAgICBmdW5jdGlvbiBmaW5pc2hFZGl0aW5nKGNv bW1pdHRlZCwgZWxlbWVudCwgbmV3VGV4dCkKICAgICAgICAgewotICAgICAgICAgICAgaWYgKHRo aXMuX2NvbmRpdGlvbkVsZW1lbnQpCi0gICAgICAgICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5y ZW1vdmVEZWNvcmF0aW9uKGJyZWFrcG9pbnQubGluZSAtIDEsIHRoaXMuX2NvbmRpdGlvbkVsZW1l bnQpOworICAgICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5yZW1vdmVEZWNvcmF0aW9uKGxpbmVO dW1iZXIsIHRoaXMuX2NvbmRpdGlvbkVsZW1lbnQpOwogICAgICAgICAgICAgZGVsZXRlIHRoaXMu X2NvbmRpdGlvbkVkaXRvckVsZW1lbnQ7CiAgICAgICAgICAgICBkZWxldGUgdGhpcy5fY29uZGl0 aW9uRWxlbWVudDsKKyAgICAgICAgICAgIGNhbGxiYWNrKGNvbW1pdHRlZCwgbmV3VGV4dCk7CiAg ICAgICAgIH0KIAotICAgICAgICB2YXIgZGlzbWlzc2VkSGFuZGxlciA9IGRpc21pc3NlZC5iaW5k KHRoaXMpOwotICAgICAgICB0aGlzLl9jb25kaXRpb25FZGl0b3JFbGVtZW50LmFkZEV2ZW50TGlz dGVuZXIoImJsdXIiLCBkaXNtaXNzZWRIYW5kbGVyLCBmYWxzZSk7Ci0KLSAgICAgICAgV2ViSW5z cGVjdG9yLnN0YXJ0RWRpdGluZyh0aGlzLl9jb25kaXRpb25FZGl0b3JFbGVtZW50LCBjb21taXR0 ZWQuYmluZCh0aGlzKSwgZGlzbWlzc2VkSGFuZGxlcik7Ci0gICAgICAgIHRoaXMuX2NvbmRpdGlv bkVkaXRvckVsZW1lbnQudmFsdWUgPSBicmVha3BvaW50LmNvbmRpdGlvbjsKKyAgICAgICAgV2Vi SW5zcGVjdG9yLnN0YXJ0RWRpdGluZyh0aGlzLl9jb25kaXRpb25FZGl0b3JFbGVtZW50LCBmaW5p c2hFZGl0aW5nLmJpbmQodGhpcywgdHJ1ZSksIGZpbmlzaEVkaXRpbmcuYmluZCh0aGlzLCBmYWxz ZSkpOworICAgICAgICB0aGlzLl9jb25kaXRpb25FZGl0b3JFbGVtZW50LnZhbHVlID0gY29uZGl0 aW9uOwogICAgICAgICB0aGlzLl9jb25kaXRpb25FZGl0b3JFbGVtZW50LnNlbGVjdCgpOwogICAg IH0sCiAKLSAgICBfc2hvd0JyZWFrcG9pbnRDb25kaXRpb25Qb3B1cDogZnVuY3Rpb24obGluZU51 bWJlcikKLSAgICB7Ci0gICAgICAgIHRoaXMuX2NvbmRpdGlvbkVsZW1lbnQgPSB0aGlzLl9jcmVh dGVDb25kaXRpb25FbGVtZW50KGxpbmVOdW1iZXIpOwotICAgICAgICB0aGlzLl90ZXh0Vmlld2Vy LmFkZERlY29yYXRpb24obGluZU51bWJlciAtIDEsIHRoaXMuX2NvbmRpdGlvbkVsZW1lbnQpOwot ICAgIH0sCi0KICAgICBfY3JlYXRlQ29uZGl0aW9uRWxlbWVudDogZnVuY3Rpb24obGluZU51bWJl cikKICAgICB7CiAgICAgICAgIHZhciBjb25kaXRpb25FbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgiZGl2Iik7CkBAIC03NjEsNiArNzYxLDggQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZy YW1lLnByb3RvdHlwZSA9IHsKICAgICBfY29udGludWVUb0xpbmU6IGZ1bmN0aW9uKGxpbmVOdW1i ZXIpCiAgICAgewogICAgICAgICB2YXIgc291cmNlSUQgPSB0aGlzLl9zb3VyY2VJREZvckxpbmUo bGluZU51bWJlcik7CisgICAgICAgIGlmICghc291cmNlSUQpCisgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5jb250aW51ZVRvTGluZShzb3Vy Y2VJRCwgbGluZU51bWJlcik7CiAgICAgfSwKIApAQCAtODAxLDEwICs4MDMsMTIgQEAgV2ViSW5z cGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgV2ViSW5zcGVjdG9yLnBh bmVscy5zY3JpcHRzLmVkaXRTY3JpcHRTb3VyY2UoZWRpdERhdGEsIGNvbW1pdEVkaXRpbmdDYWxs YmFjaywgY2FuY2VsRWRpdGluZ0NhbGxiYWNrKTsKICAgICB9LAogCi0gICAgX3NldEJyZWFrcG9p bnQ6IGZ1bmN0aW9uKGxpbmVOdW1iZXIpCisgICAgX3NldEJyZWFrcG9pbnQ6IGZ1bmN0aW9uKGxp bmVOdW1iZXIsIGNvbmRpdGlvbikKICAgICB7CiAgICAgICAgIHZhciBzb3VyY2VJRCA9IHRoaXMu X3NvdXJjZUlERm9yTGluZShsaW5lTnVtYmVyKTsKLSAgICAgICAgV2ViSW5zcGVjdG9yLmRlYnVn Z2VyTW9kZWwuc2V0QnJlYWtwb2ludChzb3VyY2VJRCwgdGhpcy5fdXJsLCBsaW5lTnVtYmVyLCB0 cnVlLCAiIik7CisgICAgICAgIGlmICghc291cmNlSUQpCisgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLnNldEJyZWFrcG9pbnQoc291cmNlSUQs IHRoaXMuX3VybCwgbGluZU51bWJlciwgdHJ1ZSwgY29uZGl0aW9uKTsKICAgICAgICAgaWYgKCFX ZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMuYnJlYWtwb2ludHNBY3RpdmF0ZWQpCiAgICAgICAg ICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMudG9nZ2xlQnJlYWtwb2ludHNDbGlja2Vk KCk7CiAgICAgfSwK