50088 2010-11-25 09:12:47 -0800 Web Inspector: highlight diffs of revisions against base version. 2010-12-01 04:23:10 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 38578 1 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 313797 0 pfeldman 2010-11-25 09:12:47 -0800 Patch to follow. 313804 1 74887 pfeldman 2010-11-25 09:27:15 -0800 Created attachment 74887 [PATCH] Proposed change. 313813 2 74887 yurys 2010-11-25 09:56:06 -0800 Comment on attachment 74887 [PATCH] Proposed change. View in context: https://bugs.webkit.org/attachment.cgi?id=74887&action=review > WebCore/inspector/front-end/ResourcesPanel.js:372 > + if (resource.__initialRevision && resource.content && view instanceof WebInspector.SourceView) { Please rename __initialRevision to _baseRevision > WebCore/inspector/front-end/ResourcesPanel.js:1109 > + this._resource.__initialRevision = revisionResource; This field should be encapsulated into the resource. Please file a bug on this and do it in a separate CL. 313814 3 pfeldman 2010-11-25 10:02:09 -0800 M WebCore/ChangeLog M WebCore/inspector/front-end/CSSStyleModel.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/textViewer.css M WebCore/inspector/front-end/utilities.js Committed r72737 74887 2010-11-25 09:27:15 -0800 2010-11-25 09:56:05 -0800 [PATCH] Proposed change. diff_revisions text/plain 12190 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDI1ZTMwYS4uOTA4MGQzMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzNyBAQAogMjAxMC0xMS0yNSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBoaWdobGlnaHQgZGlmZnMgb2YgcmV2 aXNpb25zIGFnYWluc3QgYmFzZSB2ZXJzaW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTAwODgKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvQ1NTU3R5bGVNb2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVs LnByb3RvdHlwZS5fc3R5bGVTaGVldENoYW5nZWQuY2FsbGJhY2spOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBlLl9zdHlsZVNoZWV0Q2hhbmdlZCk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VzUGFuZWwucHJvdG90eXBlLnNob3cpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNl c1BhbmVsLnByb3RvdHlwZS5fc2hvd1Jlc291cmNlVmlldy5jYWxsYmFjayk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLl9zaG93UmVzb3VyY2VWaWV3KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuX2FwcGx5RGlm Zk1hcmt1cCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRnJhbWVSZXNvdXJjZVRyZWVFbGVtZW50 LnByb3RvdHlwZS5fY29udGVudENoYW5nZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvU291cmNlRnJhbWUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJv dG90eXBlLm1hcmtEaWZmKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90 b3R5cGUuX2NyZWF0ZVZpZXdlcklmTmVlZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3Vy Y2VGcmFtZS5wcm90b3R5cGUuX3VwZGF0ZURpZmZEZWNvcmF0aW9ucy5hZGREZWNvcmF0aW9ucyk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLl91cGRhdGVEaWZm RGVjb3JhdGlvbnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlw ZS5fcmVtb3ZlRGlmZkRlY29yYXRpb25zKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L1NvdXJjZVZpZXcuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC90ZXh0Vmlld2Vy LmNzczoKKyAgICAgICAgKC53ZWJraXQtbGluZS1udW1iZXIpOgorICAgICAgICAoLmRpZmYtY29u dGFpbmVyIC53ZWJraXQtYWRkZWQtbGluZSAud2Via2l0LWxpbmUtY29udGVudCk6CisgICAgICAg ICguZGlmZi1jb250YWluZXIgLndlYmtpdC1yZW1vdmVkLWxpbmUgLndlYmtpdC1saW5lLWNvbnRl bnQpOgorICAgICAgICAoLmRpZmYtY29udGFpbmVyIC53ZWJraXQtY2hhbmdlZC1saW5lIC53ZWJr aXQtbGluZS1jb250ZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL3V0aWxpdGll cy5qczoKKyAgICAgICAgKCk6CisKKzIwMTAtMTEtMjUgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1h bkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgWXVyeSBTZW1pa2hhdHNreS4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiByZXVzZSBjb2RlIGZvciByZWNyZWF0aW5nIHJlc291 cmNlIHZpZXdzLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0 eWxlTW9kZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5q cwppbmRleCA0YjZjZmIyLi5iYWY0NGM5IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvQ1NTU3R5bGVNb2RlbC5qcwpAQCAtMTYzLDcgKzE2Myw3IEBAIFdlYkluc3BlY3Rvci5DU1NT dHlsZU1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2soaHJlZiwg Y29udGVudCkKICAgICAgICAgewogICAgICAgICAgICAgdmFyIHJlc291cmNlID0gV2ViSW5zcGVj dG9yLnJlc291cmNlTWFuYWdlci5yZXNvdXJjZUZvclVSTChocmVmKTsKLSAgICAgICAgICAgIGlm IChyZXNvdXJjZSkKKyAgICAgICAgICAgIGlmIChyZXNvdXJjZSAmJiByZXNvdXJjZS50eXBlID09 PSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZS5TdHlsZXNoZWV0KQogICAgICAgICAgICAgICAg IHJlc291cmNlLmNvbnRlbnQgPSBjb250ZW50OwogICAgICAgICB9CiAgICAgICAgIEluc3BlY3Rv ckJhY2tlbmQuZ2V0U3R5bGVTaGVldFRleHQyKHN0eWxlU2hlZXRJZCwgY2FsbGJhY2spOwpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzIGIv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IGExOTRm NTMuLmU2MjlhMWEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNv dXJjZXNQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2Vz UGFuZWwuanMKQEAgLTY0LDYgKzY0LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsID0g ZnVuY3Rpb24oZGF0YWJhc2UpCiAKICAgICB0aGlzLnN0b3JhZ2VWaWV3cyA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgIHRoaXMuc3RvcmFnZVZpZXdzLmlkID0gInN0b3JhZ2Ut dmlld3MiOworICAgIHRoaXMuc3RvcmFnZVZpZXdzLmNsYXNzTmFtZSA9ICJkaWZmLWNvbnRhaW5l ciI7CiAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuc3RvcmFnZVZpZXdzKTsKIAog ICAgIHRoaXMuc3RvcmFnZVZpZXdTdGF0dXNCYXJJdGVtc0NvbnRhaW5lciA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImRpdiIpOwpAQCAtMTAwLDcgKzEwMSw3IEBAIFdlYkluc3BlY3Rvci5SZXNv dXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5QYW5lbC5wcm90 b3R5cGUuc2hvdy5jYWxsKHRoaXMpOwogCiAgICAgICAgIGlmICh0aGlzLnZpc2libGVWaWV3IGlu c3RhbmNlb2YgV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldykKLSAgICAgICAgICAgIHRoaXMudmlz aWJsZVZpZXcuc2hvdyh0aGlzLnN0b3JhZ2VWaWV3cyk7CisgICAgICAgICAgICB0aGlzLl9zaG93 UmVzb3VyY2VWaWV3KHRoaXMudmlzaWJsZVZpZXcucmVzb3VyY2UpOwogCiAgICAgICAgIGlmICh0 aGlzLl9pbml0aWFsaXplZERlZmF1bHRTZWxlY3Rpb24pCiAgICAgICAgICAgICByZXR1cm47CkBA IC0zNjYsOSArMzY3LDQ2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUg PSB7CiAgICAgX3Nob3dSZXNvdXJjZVZpZXc6IGZ1bmN0aW9uKHJlc291cmNlKQogICAgIHsKICAg ICAgICAgdmFyIHZpZXcgPSBXZWJJbnNwZWN0b3IuUmVzb3VyY2VNYW5hZ2VyLnJlc291cmNlVmll d0ZvclJlc291cmNlKHJlc291cmNlKTsKKworICAgICAgICAvLyBDb25zaWRlciByZW5kZXJpbmcg ZGlmZiBtYXJrdXAgaGVyZS4KKyAgICAgICAgaWYgKHJlc291cmNlLl9faW5pdGlhbFJldmlzaW9u ICYmIHJlc291cmNlLmNvbnRlbnQgJiYgdmlldyBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5Tb3Vy Y2VWaWV3KSB7CisgICAgICAgICAgICBmdW5jdGlvbiBjYWxsYmFjayhiYXNlQ29udGVudCkKKyAg ICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBpZiAoYmFzZUNvbnRlbnQpCisgICAgICAgICAg ICAgICAgICAgIHRoaXMuX2FwcGx5RGlmZk1hcmt1cCh2aWV3LCBiYXNlQ29udGVudCwgcmVzb3Vy Y2UuY29udGVudCk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICByZXNvdXJjZS5fX2luaXRp YWxSZXZpc2lvbi5yZXF1ZXN0Q29udGVudChjYWxsYmFjay5iaW5kKHRoaXMpKTsKKyAgICAgICAg fQogICAgICAgICB0aGlzLl9pbm5lclNob3dWaWV3KHZpZXcpOwogICAgIH0sCiAKKyAgICBfYXBw bHlEaWZmTWFya3VwOiBmdW5jdGlvbih2aWV3LCBiYXNlQ29udGVudCwgbmV3Q29udGVudCkgewor ICAgICAgICB2YXIgb2xkTGluZXMgPSBiYXNlQ29udGVudC5zcGxpdCgiXG4iKTsKKyAgICAgICAg dmFyIG5ld0xpbmVzID0gbmV3Q29udGVudC5zcGxpdCgiXG4iKTsKKworICAgICAgICB2YXIgZGlm ZiA9IEFycmF5LmRpZmYob2xkTGluZXMsIG5ld0xpbmVzKTsKKworICAgICAgICB2YXIgZGlmZkRh dGEgPSB7fTsKKyAgICAgICAgZGlmZkRhdGEuYWRkZWQgPSBbXTsKKyAgICAgICAgZGlmZkRhdGEu cmVtb3ZlZCA9IFtdOworICAgICAgICBkaWZmRGF0YS5jaGFuZ2VkID0gW107CisKKyAgICAgICAg dmFyIG9mZnNldCA9IDA7CisgICAgICAgIHZhciByaWdodCA9IGRpZmYucmlnaHQ7CisgICAgICAg IGZvciAodmFyIGkgPSAwOyBpIDwgcmlnaHQubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIGlm ICh0eXBlb2YgcmlnaHRbaV0gPT09ICJzdHJpbmciKSB7CisgICAgICAgICAgICAgICAgaWYgKHJp Z2h0Lmxlbmd0aCA+IGkgKyAxICYmIHJpZ2h0W2kgKyAxXS5yb3cgPT09IGkgKyAxIC0gb2Zmc2V0 KQorICAgICAgICAgICAgICAgICAgICBkaWZmRGF0YS5jaGFuZ2VkLnB1c2goaSk7CisgICAgICAg ICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAgICAgICAgIGRpZmZEYXRhLmFkZGVkLnB1c2go aSk7CisgICAgICAgICAgICAgICAgICAgIG9mZnNldCsrOworICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgICAgIG9mZnNldCA9IGkgLSByaWdodFtpXS5y b3c7CisgICAgICAgIH0KKyAgICAgICAgdmlldy5zb3VyY2VGcmFtZS5tYXJrRGlmZihkaWZmRGF0 YSk7CisgICAgfSwKKwogICAgIHNob3dEYXRhYmFzZTogZnVuY3Rpb24oZGF0YWJhc2UsIHRhYmxl TmFtZSkKICAgICB7CiAgICAgICAgIGlmICghZGF0YWJhc2UpCkBAIC0xMDY2LDExICsxMTA0LDE2 IEBAIFdlYkluc3BlY3Rvci5GcmFtZVJlc291cmNlVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewog ICAgICAgICAgICAgfQogICAgICAgICAgICAgdGhpcy5fcmVzb3VyY2UuYWRkRXZlbnRMaXN0ZW5l cigiZmluaXNoZWQiLCBmaW5pc2hlZCk7CiAgICAgICAgIH0KKworICAgICAgICBpZiAoIXRoaXMu X3Jlc291cmNlLl9faW5pdGlhbFJldmlzaW9uKQorICAgICAgICAgICAgdGhpcy5fcmVzb3VyY2Uu X19pbml0aWFsUmV2aXNpb24gPSByZXZpc2lvblJlc291cmNlOworICAgICAgICBlbHNlCisgICAg ICAgICAgICByZXZpc2lvblJlc291cmNlLl9faW5pdGlhbFJldmlzaW9uID0gdGhpcy5fcmVzb3Vy Y2UuX19pbml0aWFsUmV2aXNpb247CisKICAgICAgICAgaWYgKGV2ZW50LmRhdGEub2xkQ29udGVu dCkKICAgICAgICAgICAgIHJldmlzaW9uUmVzb3VyY2Uuc2V0SW5pdGlhbENvbnRlbnQoZXZlbnQu ZGF0YS5vbGRDb250ZW50KTsKICAgICAgICAgdGhpcy5pbnNlcnRDaGlsZChuZXcgV2ViSW5zcGVj dG9yLlJlc291cmNlUmV2aXNpb25UcmVlRWxlbWVudCh0aGlzLl9zdG9yYWdlUGFuZWwsIHJldmlz aW9uUmVzb3VyY2UsIGV2ZW50LmRhdGEub2xkQ29udGVudFRpbWVzdGFtcCksIDApOwogCi0gICAg ICAgIAogICAgICAgICB2YXIgb2xkVmlldyA9IFdlYkluc3BlY3Rvci5SZXNvdXJjZU1hbmFnZXIu ZXhpc3RpbmdSZXNvdXJjZVZpZXdGb3JSZXNvdXJjZSh0aGlzLl9yZXNvdXJjZSk7CiAgICAgICAg IGlmIChvbGRWaWV3KSB7CiAgICAgICAgICAgICB2YXIgbmV3VmlldyA9IFdlYkluc3BlY3Rvci5S ZXNvdXJjZU1hbmFnZXIucmVjcmVhdGVSZXNvdXJjZVZpZXcodGhpcy5fcmVzb3VyY2UpOwpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzIGIvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCmluZGV4IDY2YTAwMDUuLjhl MDc3Y2QgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFt ZS5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKQEAg LTg3LDYgKzg3LDE2IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICB0aGlzLl91cGRhdGVFeGVjdXRpb25MaW5lKHByZXZpb3VzTGluZSk7CiAgICAg fSwKIAorICAgIG1hcmtEaWZmOiBmdW5jdGlvbihkaWZmRGF0YSkKKyAgICB7CisgICAgICAgIGlm ICh0aGlzLl9kaWZmTGluZXMgJiYgdGhpcy5fdGV4dFZpZXdlcikKKyAgICAgICAgICAgIHRoaXMu X3JlbW92ZURpZmZEZWNvcmF0aW9ucygpOworCisgICAgICAgIHRoaXMuX2RpZmZMaW5lcyA9IGRp ZmZEYXRhOworICAgICAgICBpZiAodGhpcy5fdGV4dFZpZXdlcikKKyAgICAgICAgICAgIHRoaXMu X3VwZGF0ZURpZmZEZWNvcmF0aW9ucygpOworICAgIH0sCisKICAgICByZXZlYWxMaW5lOiBmdW5j dGlvbihsaW5lTnVtYmVyKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX3RleHRWaWV3ZXIpCkBA IC0yMTAsNiArMjIwLDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsK ICAgICAgICAgdGhpcy5fYWRkRXhpc3RpbmdNZXNzYWdlc1RvU291cmNlKCk7CiAgICAgICAgIHRo aXMuX2FkZEV4aXN0aW5nQnJlYWtwb2ludHNUb1NvdXJjZSgpOwogICAgICAgICB0aGlzLl91cGRh dGVFeGVjdXRpb25MaW5lKCk7CisgICAgICAgIHRoaXMuX3VwZGF0ZURpZmZEZWNvcmF0aW9ucygp OwogICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLnJlc2l6ZSgpOwogCiAgICAgICAgIGlmICh0aGlz Ll9saW5lTnVtYmVyVG9SZXZlYWwpIHsKQEAgLTMzMCw2ICszNDEsMzMgQEAgV2ViSW5zcGVjdG9y LlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIu YWRkRGVjb3JhdGlvbih0aGlzLl9leGVjdXRpb25MaW5lIC0gMSwgIndlYmtpdC1leGVjdXRpb24t bGluZSIpOwogICAgIH0sCiAKKyAgICBfdXBkYXRlRGlmZkRlY29yYXRpb25zOiBmdW5jdGlvbigp CisgICAgeworICAgICAgICBpZiAoIXRoaXMuX2RpZmZMaW5lcykKKyAgICAgICAgICAgIHJldHVy bjsKKworICAgICAgICBmdW5jdGlvbiBhZGREZWNvcmF0aW9ucyh0ZXh0Vmlld2VyLCBsaW5lcywg Y2xhc3NOYW1lKQorICAgICAgICB7CisgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGxp bmVzLmxlbmd0aDsgKytpKQorICAgICAgICAgICAgICAgIHRleHRWaWV3ZXIuYWRkRGVjb3JhdGlv bihsaW5lc1tpXSwgY2xhc3NOYW1lKTsKKyAgICAgICAgfQorICAgICAgICBhZGREZWNvcmF0aW9u cyh0aGlzLl90ZXh0Vmlld2VyLCB0aGlzLl9kaWZmTGluZXMuYWRkZWQsICJ3ZWJraXQtYWRkZWQt bGluZSIpOworICAgICAgICBhZGREZWNvcmF0aW9ucyh0aGlzLl90ZXh0Vmlld2VyLCB0aGlzLl9k aWZmTGluZXMucmVtb3ZlZCwgIndlYmtpdC1yZW1vdmVkLWxpbmUiKTsKKyAgICAgICAgYWRkRGVj b3JhdGlvbnModGhpcy5fdGV4dFZpZXdlciwgdGhpcy5fZGlmZkxpbmVzLmNoYW5nZWQsICJ3ZWJr aXQtY2hhbmdlZC1saW5lIik7CisgICAgfSwKKworICAgIF9yZW1vdmVEaWZmRGVjb3JhdGlvbnM6 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGZ1bmN0aW9uIHJlbW92ZURlY29yYXRpb25zKHRl eHRWaWV3ZXIsIGxpbmVzLCBjbGFzc05hbWUpCisgICAgICAgIHsKKyAgICAgICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgbGluZXMubGVuZ3RoOyArK2kpCisgICAgICAgICAgICAgICAgdGV4dFZp ZXdlci5yZW1vdmVEZWNvcmF0aW9uKGxpbmVzW2ldLCBjbGFzc05hbWUpOworICAgICAgICB9Cisg ICAgICAgIHJlbW92ZURlY29yYXRpb25zKHRoaXMuX3RleHRWaWV3ZXIsIHRoaXMuX2RpZmZMaW5l cy5hZGRlZCwgIndlYmtpdC1hZGRlZC1saW5lIik7CisgICAgICAgIHJlbW92ZURlY29yYXRpb25z KHRoaXMuX3RleHRWaWV3ZXIsIHRoaXMuX2RpZmZMaW5lcy5yZW1vdmVkLCAid2Via2l0LXJlbW92 ZWQtbGluZSIpOworICAgICAgICByZW1vdmVEZWNvcmF0aW9ucyh0aGlzLl90ZXh0Vmlld2VyLCB0 aGlzLl9kaWZmTGluZXMuY2hhbmdlZCwgIndlYmtpdC1jaGFuZ2VkLWxpbmUiKTsKKyAgICB9LAor CiAgICAgX2FkZEV4aXN0aW5nTWVzc2FnZXNUb1NvdXJjZTogZnVuY3Rpb24oKQogICAgIHsKICAg ICAgICAgdmFyIGxlbmd0aCA9IHRoaXMuX21lc3NhZ2VzLmxlbmd0aDsKZGlmZiAtLWdpdCBhL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VWaWV3LmpzIGIvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NvdXJjZVZpZXcuanMKaW5kZXggYjYyNGVlMy4uZTc2NGNmOCAxMDA2NDQK LS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVZpZXcuanMKKysrIGIvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVZpZXcuanMKQEAgLTgwLDYgKzgwLDcgQEAg V2ViSW5zcGVjdG9yLlNvdXJjZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnNvdXJj ZUZyYW1lLnNjcm9sbFRvcCA9IHNjcm9sbFRvcDsKICAgICB9LAogCisKICAgICBzZXR1cFNvdXJj ZUZyYW1lSWZOZWVkZWQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5fZnJh bWVOZWVkc1NldHVwKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3Rl eHRWaWV3ZXIuY3NzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RleHRWaWV3ZXIuY3Nz CmluZGV4IDhhOTZiMWYuLmJlZTlmZTUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC90ZXh0Vmlld2VyLmNzcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv dGV4dFZpZXdlci5jc3MKQEAgLTY0LDggKzY0LDggQEAKICAgICB2ZXJ0aWNhbC1hbGlnbjogdG9w OwogICAgIHdvcmQtYnJlYWs6IG5vcm1hbDsKICAgICAtd2Via2l0LXVzZXItc2VsZWN0OiBub25l OwotCXBhZGRpbmctcmlnaHQ6IDRweDsKLQlwYWRkaW5nLWxlZnQ6IDZweDsKKyAgICBwYWRkaW5n LXJpZ2h0OiA0cHg7CisgICAgcGFkZGluZy1sZWZ0OiA2cHg7CiB9CiAKIC53ZWJraXQtbGluZS1u dW1iZXItb3V0ZXIgewpAQCAtMTQxLDYgKzE0MSwxOSBAQAogICAgIG91dGxpbmU6IDFweCBzb2xp ZCByZ2IoNjQsIDExNSwgMjQ0KTsKIH0KIAorLmRpZmYtY29udGFpbmVyIC53ZWJraXQtYWRkZWQt bGluZSAud2Via2l0LWxpbmUtY29udGVudCB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDIy MCwgMjU1LCAyMjApOworfQorCisuZGlmZi1jb250YWluZXIgLndlYmtpdC1yZW1vdmVkLWxpbmUg LndlYmtpdC1saW5lLWNvbnRlbnQgeworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyNTUsIDIy MCwgMjIwKTsKKyAgICB0ZXh0LWRlY29yYXRpb246IGxpbmUtdGhyb3VnaDsKK30KKworLmRpZmYt Y29udGFpbmVyIC53ZWJraXQtY2hhbmdlZC1saW5lIC53ZWJraXQtbGluZS1jb250ZW50IHsKKyAg ICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjIwLCAyMjAsIDI1NSk7Cit9CisKIC53ZWJraXQtc2Vh cmNoLXJlc3VsdCB7CiAgICAgLXdlYmtpdC1ib3JkZXItcmFkaXVzOiA0cHg7CiAgICAgcGFkZGlu ZzogMnB4IDJweCAycHggM3B4OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL3V0aWxpdGllcy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMu anMKaW5kZXggM2FmZjZiYi4uZjk3OGM2ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL3V0aWxpdGllcy5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv dXRpbGl0aWVzLmpzCkBAIC0yNCw2ICsyNCw5IEBACiAgKiBPTiBBTlkgVEhFT1JZIE9GIExJQUJJ TElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAogICog KElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9V VCBPRiBUSEUgVVNFIE9GCiAgKiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICoKKyAqIENvbnRhaW5zIGRpZmYgbWV0aG9k IGJhc2VkIG9uIEphdmFzY3JpcHQgRGlmZiBBbGdvcml0aG0gQnkgSm9obiBSZXNpZworICogaHR0 cDovL2Vqb2huLm9yZy9maWxlcy9qc2RpZmYuanMgKHJlbGVhc2VkIHVuZGVyIHRoZSBNSVQgbGlj ZW5zZSkuCiAgKi8KIAogRnVuY3Rpb24ucHJvdG90eXBlLmJpbmQgPSBmdW5jdGlvbih0aGlzT2Jq ZWN0KQpAQCAtNzMxLDYgKzczNCw1MSBAQCBBcnJheS5wcm90b3R5cGUua2V5U2V0ID0gZnVuY3Rp b24oKQogICAgIHJldHVybiBrZXlzOwogfQogCitBcnJheS5kaWZmID0gZnVuY3Rpb24obGVmdCwg cmlnaHQpCit7CisgICAgdmFyIG8gPSBsZWZ0OworICAgIHZhciBuID0gcmlnaHQ7CisKKyAgICB2 YXIgbnMgPSB7fTsKKyAgICB2YXIgb3MgPSB7fTsKKworICAgIGZvciAodmFyIGkgPSAwOyBpIDwg bi5sZW5ndGg7IGkrKykgeworICAgICAgICBpZiAobnNbbltpXV0gPT0gbnVsbCkKKyAgICAgICAg ICAgIG5zW25baV1dID0geyByb3dzOiBbXSwgbzogbnVsbCB9OworICAgICAgICBuc1tuW2ldXS5y b3dzLnB1c2goaSk7CisgICAgfQorCisgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBvLmxlbmd0aDsg aSsrKSB7CisgICAgICAgIGlmIChvc1tvW2ldXSA9PSBudWxsKQorICAgICAgICAgICAgb3Nbb1tp XV0gPSB7IHJvd3M6IFtdLCBuOiBudWxsIH07CisgICAgICAgIG9zW29baV1dLnJvd3MucHVzaChp KTsKKyAgICB9CisKKyAgICBmb3IgKHZhciBpIGluIG5zKSB7CisgICAgICAgIGlmIChuc1tpXS5y b3dzLmxlbmd0aCA9PSAxICYmIHR5cGVvZihvc1tpXSkgIT0gInVuZGVmaW5lZCIgJiYgb3NbaV0u cm93cy5sZW5ndGggPT0gMSkgeworICAgICAgICAgICAgbltuc1tpXS5yb3dzWzBdXSA9IHsgdGV4 dDogbltuc1tpXS5yb3dzWzBdXSwgcm93OiBvc1tpXS5yb3dzWzBdIH07CisgICAgICAgICAgICBv W29zW2ldLnJvd3NbMF1dID0geyB0ZXh0OiBvW29zW2ldLnJvd3NbMF1dLCByb3c6IG5zW2ldLnJv d3NbMF0gfTsKKyAgICAgICAgfQorICAgIH0KKworICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbi5s ZW5ndGggLSAxOyBpKyspIHsKKyAgICAgICAgaWYgKG5baV0udGV4dCAhPSBudWxsICYmIG5baSAr IDFdLnRleHQgPT0gbnVsbCAmJiBuW2ldLnJvdyArIDEgPCBvLmxlbmd0aCAmJiBvW25baV0ucm93 ICsgMV0udGV4dCA9PSBudWxsICYmIG5baSArIDFdID09IG9bbltpXS5yb3cgKyAxXSkgeworICAg ICAgICAgICAgbltpICsgMV0gPSB7IHRleHQ6IG5baSArIDFdLCByb3c6IG5baV0ucm93ICsgMSB9 OworICAgICAgICAgICAgb1tuW2ldLnJvdyArIDFdID0geyB0ZXh0OiBvW25baV0ucm93ICsgMV0s IHJvdzogaSArIDEgfTsKKyAgICAgICAgfQorICAgIH0KKworICAgIGZvciAodmFyIGkgPSBuLmxl bmd0aCAtIDE7IGkgPiAwOyBpLS0pIHsKKyAgICAgICAgaWYgKG5baV0udGV4dCAhPSBudWxsICYm IG5baSAtIDFdLnRleHQgPT0gbnVsbCAmJiBuW2ldLnJvdyA+IDAgJiYgb1tuW2ldLnJvdyAtIDFd LnRleHQgPT0gbnVsbCAmJiAKKyAgICAgICAgICAgIG5baSAtIDFdID09IG9bbltpXS5yb3cgLSAx XSkgeworICAgICAgICAgICAgbltpIC0gMV0gPSB7IHRleHQ6IG5baSAtIDFdLCByb3c6IG5baV0u cm93IC0gMSB9OworICAgICAgICAgICAgb1tuW2ldLnJvdyAtIDFdID0geyB0ZXh0OiBvW25baV0u cm93IC0gMV0sIHJvdzogaSAtIDEgfTsKKyAgICAgICAgfQorICAgIH0KKworICAgIHJldHVybiB7 IGxlZnQ6IG8sIHJpZ2h0OiBuIH07Cit9CisKIEFycmF5LmNvbnZlcnQgPSBmdW5jdGlvbihsaXN0 KQogewogICAgIC8vIENhc3QgYXJyYXktbGlrZSBvYmplY3QgdG8gYW4gYXJyYXkuCg==