32924 2009-12-24 14:54:33 -0800 Web Inspector: Implement Edit Inner HTML action. 2009-12-25 06:24:40 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman bweinstein joepeck rik timothy oldest_to_newest 174814 0 pfeldman 2009-12-24 14:54:33 -0800 Popup action with in-place HTML editing. 174815 1 45476 pfeldman 2009-12-24 15:00:19 -0800 Created attachment 45476 [PATCH] Proposed change. 174828 2 45476 timothy 2009-12-24 17:26:31 -0800 Comment on attachment 45476 [PATCH] Proposed change. > + } > + WebInspector.startEditing(this._htmlEditElement, commit.bind(this), dispose.bind(this), null, true); I prefer an empty line between lines like this. 174870 3 pfeldman 2009-12-25 06:24:40 -0800 Review comments addressed + I ended up landing "Edit as HTML", not "Edit Inner HTML" version. Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/English.lproj/localizedStrings.js M WebCore/bindings/js/JSInjectedScriptHostCustom.cpp M WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp M WebCore/inspector/InjectedScriptHost.cpp M WebCore/inspector/InjectedScriptHost.h M WebCore/inspector/InjectedScriptHost.idl M WebCore/inspector/InspectorDOMAgent.h M WebCore/inspector/front-end/ElementsPanel.js M WebCore/inspector/front-end/ElementsTreeOutline.js M WebCore/inspector/front-end/InjectedScript.js M WebCore/inspector/front-end/InjectedScriptAccess.js M WebCore/inspector/front-end/InspectorFrontendHostStub.js M WebCore/inspector/front-end/inspector.css M WebCore/inspector/front-end/inspector.js Committed r52556 45476 2009-12-24 15:00:19 -0800 2009-12-24 17:26:30 -0800 [PATCH] Proposed change. edit_html text/plain 8902 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZjRiMGEzOS4uYmE2Y2ZmMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAwOS0xMi0yNCAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbXBsZW1lbnQgRWRpdCBJbm5lciBI VE1MIGFjdGlvbi4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MzI5MjQKKworICAgICAgICAqIEVuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5q czoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUuX3Bv cHVsYXRlVGFnQ29udGV4dE1lbnUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJl ZUVsZW1lbnQucHJvdG90eXBlLl9zdGFydEVkaXRpbmdBc0hUTUwuY29tbWl0KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlwZS5fc3RhcnRFZGl0aW5n QXNIVE1MLmRpc3Bvc2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1l bnQucHJvdG90eXBlLl9zdGFydEVkaXRpbmdBc0hUTUwpOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvSW5qZWN0ZWRTY3JpcHQuanM6CisgICAgICAgIChJbmplY3RlZFNjcmlwdC5nZXRO b2RlUHJvcGVydHlWYWx1ZSk6CisgICAgICAgIChJbmplY3RlZFNjcmlwdC5zZXROb2RlUHJvcGVy dHlWYWx1ZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdEFj Y2Vzcy5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0luc3BlY3RvckZyb250ZW5k SG9zdFN0dWIuanM6CisgICAgICAgICguV2ViSW5zcGVjdG9yLkluc3BlY3RvckZyb250ZW5kSG9z dFN0dWIucHJvdG90eXBlLmhpZGRlblBhbmVscyk6CisgICAgICAgICguV2ViSW5zcGVjdG9yLklu c3BlY3RvckZyb250ZW5kSG9zdFN0dWIucHJvdG90eXBlLndpbmRvd1VubG9hZGluZyk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLnN0YXJ0 RWRpdGluZy5rZXlEb3duRXZlbnRMaXN0ZW5lcik6CisgICAgICAgIChXZWJJbnNwZWN0b3Iuc3Rh cnRFZGl0aW5nKToKKwogMjAwOS0xMi0yNCAgSmVzc2llIEJlcmxpbiAgPGpiZXJsaW5Ad2Via2l0 Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9XZWJDb3JlL0VuZ2xp c2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA1ZWJhMmVhLi5mMTk3MDgxIDEwMDY0 NApCaW5hcnkgZmlsZXMgYS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5q cyBhbmQgYi9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBkaWZmZXIK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRs aW5lLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUu anMKaW5kZXggYjg2NTMxNi4uNzEwMDFlOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKQEAgLTYwMyw2ICs2MDMsNyBAQCBXZWJJ bnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGNvbnRl eHRNZW51LmFwcGVuZFNlcGFyYXRvcigpOwogCiAgICAgICAgIC8vIEFkZCBub2RlLXJlbGF0ZWQg YWN0aW9ucy4KKyAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIkVkaXQgSW5uZXIgSFRNTCIpLCB0aGlzLl9lZGl0SW5uZXJIVE1MLmJpbmQodGhpcykp OwogICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygi Q29weSBhcyBIVE1MIiksIHRoaXMuX2NvcHlIVE1MLmJpbmQodGhpcykpOwogICAgICAgICBjb250 ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGVsZXRlIE5vZGUiKSwg dGhpcy5yZW1vdmUuYmluZCh0aGlzKSk7CiAgICAgfSwKQEAgLTcxOSw2ICs3MjAsNDIgQEAgV2Vi SW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICB9LAogCisgICAgX3N0YXJ0RWRpdGluZ0FzSFRNTDogZnVuY3Rpb24oY29t bWl0Q2FsbGJhY2ssIGluaXRpYWxWYWx1ZSkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl9odG1s RWRpdEVsZW1lbnQgJiYgV2ViSW5zcGVjdG9yLmlzQmVpbmdFZGl0ZWQodGhpcy5faHRtbEVkaXRF bGVtZW50KSkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworCisgICAgICAgIHRoaXMuX2VkaXRp bmcgPSB0cnVlOworCisgICAgICAgIHRoaXMuX2h0bWxFZGl0RWxlbWVudCA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImRpdiIpOworICAgICAgICB0aGlzLl9odG1sRWRpdEVsZW1lbnQuY2xhc3NO YW1lID0gInNvdXJjZS1jb2RlIGVsZW1lbnRzLXRyZWUtZWRpdG9yIjsKKyAgICAgICAgdGhpcy5f aHRtbEVkaXRFbGVtZW50LnRleHRDb250ZW50ID0gaW5pdGlhbFZhbHVlOworCisgICAgICAgIGlm ICh0aGlzLl9jaGlsZHJlbkxpc3ROb2RlKQorICAgICAgICAgICAgdGhpcy5fY2hpbGRyZW5MaXN0 Tm9kZS5zdHlsZS5kaXNwbGF5ID0gIm5vbmUiOworCisgICAgICAgIHRoaXMubGlzdEl0ZW1FbGVt ZW50LmFwcGVuZENoaWxkKHRoaXMuX2h0bWxFZGl0RWxlbWVudCk7CisKKyAgICAgICAgZnVuY3Rp b24gY29tbWl0KCkKKyAgICAgICAgeworICAgICAgICAgICAgY29tbWl0Q2FsbGJhY2sodGhpcy5f aHRtbEVkaXRFbGVtZW50LnRleHRDb250ZW50KTsKKyAgICAgICAgICAgIGRpc3Bvc2UuY2FsbCh0 aGlzKTsKKyAgICAgICAgfQorCisgICAgICAgIGZ1bmN0aW9uIGRpc3Bvc2UoKQorICAgICAgICB7 CisgICAgICAgICAgICBkZWxldGUgdGhpcy5fZWRpdGluZzsKKworICAgICAgICAgICAgdGhpcy5s aXN0SXRlbUVsZW1lbnQucmVtb3ZlQ2hpbGQodGhpcy5faHRtbEVkaXRFbGVtZW50KTsKKyAgICAg ICAgICAgIGRlbGV0ZSB0aGlzLl9odG1sRWRpdEVsZW1lbnQ7CisKKyAgICAgICAgICAgIGlmICh0 aGlzLl9jaGlsZHJlbkxpc3ROb2RlKQorICAgICAgICAgICAgICAgIHRoaXMuX2NoaWxkcmVuTGlz dE5vZGUuc3R5bGUucmVtb3ZlUHJvcGVydHkoImRpc3BsYXkiKTsKKyAgICAgICAgICAgIHRoaXMu dXBkYXRlU2VsZWN0aW9uKCk7CisgICAgICAgIH0KKyAgICAgICAgV2ViSW5zcGVjdG9yLnN0YXJ0 RWRpdGluZyh0aGlzLl9odG1sRWRpdEVsZW1lbnQsIGNvbW1pdC5iaW5kKHRoaXMpLCBkaXNwb3Nl LmJpbmQodGhpcyksIG51bGwsIHRydWUpOworICAgIH0sCisKICAgICBfYXR0cmlidXRlRWRpdGlu Z0NvbW1pdHRlZDogZnVuY3Rpb24oZWxlbWVudCwgbmV3VGV4dCwgb2xkVGV4dCwgYXR0cmlidXRl TmFtZSwgbW92ZURpcmVjdGlvbikKICAgICB7CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9lZGl0aW5n OwpAQCAtOTYyLDcgKzk5OSwxOSBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5w cm90b3R5cGUgPSB7CiAgICAgICAgIEluc3BlY3RvckJhY2tlbmQucmVtb3ZlTm9kZShjYWxsSWQs IHRoaXMucmVwcmVzZW50ZWRPYmplY3QuaWQpOwogICAgIH0sCiAKLSAgICBfY29weUhUTUw6IGZ1 bmN0aW9uKG5vZGUpCisgICAgX2VkaXRJbm5lckhUTUw6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAg ICAgIHZhciBub2RlSWQgPSB0aGlzLnJlcHJlc2VudGVkT2JqZWN0LmlkOworCisgICAgICAgIGZ1 bmN0aW9uIGNvbW1pdENoYW5nZSh2YWx1ZSkKKyAgICAgICAgeworICAgICAgICAgICAgSW5qZWN0 ZWRTY3JpcHRBY2Nlc3Muc2V0Tm9kZVByb3BlcnR5VmFsdWUobm9kZUlkLCAiaW5uZXJIVE1MIiwg dmFsdWUsIGZ1bmN0aW9uKCkge30pOworICAgICAgICB9CisKKyAgICAgICAgSW5qZWN0ZWRTY3Jp cHRBY2Nlc3MuZ2V0Tm9kZVByb3BlcnR5VmFsdWUobm9kZUlkLCAiaW5uZXJIVE1MIiwgdGhpcy5f c3RhcnRFZGl0aW5nQXNIVE1MLmJpbmQodGhpcywgY29tbWl0Q2hhbmdlKSk7CisgICAgfSwKKwor ICAgIF9jb3B5SFRNTDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgSW5zcGVjdG9yQmFja2Vu ZC5jb3B5Tm9kZSh0aGlzLnJlcHJlc2VudGVkT2JqZWN0LmlkKTsKICAgICB9CmRpZmYgLS1naXQg YS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0ZWRTY3JpcHQuanMgYi9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0ZWRTY3JpcHQuanMKaW5kZXggMzMwYWY5ZC4uNjI4 OTdiYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2Ny aXB0LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdC5q cwpAQCAtNTEwLDYgKzUxMCwyMyBAQCBJbmplY3RlZFNjcmlwdC5zZXRQcm9wZXJ0eVZhbHVlID0g ZnVuY3Rpb24ob2JqZWN0UHJveHksIHByb3BlcnR5TmFtZSwgZXhwcmVzc2lvbgogICAgIH0KIH0K IAorSW5qZWN0ZWRTY3JpcHQuZ2V0Tm9kZVByb3BlcnR5VmFsdWUgPSBmdW5jdGlvbihub2RlSWQs IHByb3BlcnR5TmFtZSkKK3sKKyAgICB2YXIgbm9kZSA9IEluamVjdGVkU2NyaXB0Ll9ub2RlRm9y SWQobm9kZUlkKTsKKyAgICBpZiAoIW5vZGUpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB2 YXIgcmVzdWx0ID0gbm9kZVtwcm9wZXJ0eU5hbWVdOworICAgIHJldHVybiByZXN1bHQgIT09IHVu ZGVmaW5lZCA/IHJlc3VsdCA6IGZhbHNlOworfQorCitJbmplY3RlZFNjcmlwdC5zZXROb2RlUHJv cGVydHlWYWx1ZSA9IGZ1bmN0aW9uKG5vZGVJZCwgcHJvcGVydHlOYW1lLCB2YWx1ZSkKK3sKKyAg ICB2YXIgbm9kZSA9IEluamVjdGVkU2NyaXB0Ll9ub2RlRm9ySWQobm9kZUlkKTsKKyAgICBpZiAo IW5vZGUpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBub2RlW3Byb3BlcnR5TmFtZV0gPSB2 YWx1ZTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KIAogSW5qZWN0ZWRTY3JpcHQuZ2V0Q29tcGxldGlv bnMgPSBmdW5jdGlvbihleHByZXNzaW9uLCBpbmNsdWRlSW5zcGVjdG9yQ29tbWFuZExpbmVBUEks IGNhbGxGcmFtZUlkKQogewpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0luamVjdGVkU2NyaXB0QWNjZXNzLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0lu amVjdGVkU2NyaXB0QWNjZXNzLmpzCmluZGV4IDRjMDRmYjkuLmZhZjk3YTEgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdEFjY2Vzcy5qcworKysg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuanMKQEAg LTY1LDYgKzY1LDcgQEAgSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuX2luc3RhbGxIYW5kbGVyKCJldmFs dWF0ZUluQ2FsbEZyYW1lIik7CiBJbmplY3RlZFNjcmlwdEFjY2Vzcy5faW5zdGFsbEhhbmRsZXIo ImdldENvbXBsZXRpb25zIik7CiBJbmplY3RlZFNjcmlwdEFjY2Vzcy5faW5zdGFsbEhhbmRsZXIo ImdldENvbXB1dGVkU3R5bGUiKTsKIEluamVjdGVkU2NyaXB0QWNjZXNzLl9pbnN0YWxsSGFuZGxl cigiZ2V0SW5saW5lU3R5bGUiKTsKK0luamVjdGVkU2NyaXB0QWNjZXNzLl9pbnN0YWxsSGFuZGxl cigiZ2V0Tm9kZVByb3BlcnR5VmFsdWUiKTsKIEluamVjdGVkU2NyaXB0QWNjZXNzLl9pbnN0YWxs SGFuZGxlcigiZ2V0UHJvcGVydGllcyIpOwogSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuX2luc3RhbGxI YW5kbGVyKCJnZXRQcm90b3R5cGVzIik7CiBJbmplY3RlZFNjcmlwdEFjY2Vzcy5faW5zdGFsbEhh bmRsZXIoImdldFN0eWxlcyIpOwpAQCAtNzMsNiArNzQsNyBAQCBJbmplY3RlZFNjcmlwdEFjY2Vz cy5faW5zdGFsbEhhbmRsZXIoInBlcmZvcm1TZWFyY2giKTsKIEluamVjdGVkU2NyaXB0QWNjZXNz Ll9pbnN0YWxsSGFuZGxlcigicHVzaE5vZGVUb0Zyb250ZW5kIik7CiBJbmplY3RlZFNjcmlwdEFj Y2Vzcy5faW5zdGFsbEhhbmRsZXIoIm5vZGVCeVBhdGgiKTsKIEluamVjdGVkU2NyaXB0QWNjZXNz Ll9pbnN0YWxsSGFuZGxlcigic2VhcmNoQ2FuY2VsZWQiKTsKK0luamVjdGVkU2NyaXB0QWNjZXNz Ll9pbnN0YWxsSGFuZGxlcigic2V0Tm9kZVByb3BlcnR5VmFsdWUiKTsKIEluamVjdGVkU2NyaXB0 QWNjZXNzLl9pbnN0YWxsSGFuZGxlcigic2V0UHJvcGVydHlWYWx1ZSIpOwogSW5qZWN0ZWRTY3Jp cHRBY2Nlc3MuX2luc3RhbGxIYW5kbGVyKCJzZXRTdHlsZVByb3BlcnR5Iik7CiBJbmplY3RlZFNj cmlwdEFjY2Vzcy5faW5zdGFsbEhhbmRsZXIoInNldFN0eWxlVGV4dCIpOwpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luc3BlY3RvckZyb250ZW5kSG9zdFN0dWIuanMg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5q cwppbmRleCBmYjkxNzk0Li45MTQxYzBmIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvSW5zcGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5qcworKysgYi9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5qcwpAQCAtOTIsNiArOTIs MTAgQEAgV2ViSW5zcGVjdG9yLkluc3BlY3RvckZyb250ZW5kSG9zdFN0dWIucHJvdG90eXBlID0g ewogICAgIGhpZGRlblBhbmVsczogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgcmV0dXJuICIi OworICAgIH0sCisKKyAgICB3aW5kb3dVbmxvYWRpbmc6IGZ1bmN0aW9uKCkKKyAgICB7CiAgICAg fQogfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9y LmNzcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCmluZGV4IGU1 YmQ5ZGQuLmYyMGYwYjQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuY3NzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu Y3NzCkBAIC0xNTAyLDYgKzE1MDIsMTIgQEAgYm9keS5pbmFjdGl2ZSAucGxhY2FyZC5zZWxlY3Rl ZCB7CiAgICAgdGV4dC1kZWNvcmF0aW9uOiBub25lICFpbXBvcnRhbnQ7CiB9CiAKKy5lbGVtZW50 cy10cmVlLWVkaXRvciB7CisgICAgLXdlYmtpdC11c2VyLXNlbGVjdDogdGV4dDsKKyAgICAtd2Vi a2l0LXVzZXItbW9kaWZ5OiByZWFkLXdyaXRlLXBsYWludGV4dC1vbmx5OworICAgIHRleHQtaW5k ZW50OiAwOworfQorCiAuc2VjdGlvbiAucHJvcGVydGllcyBsaS5lZGl0aW5nIHsKICAgICBtYXJn aW4tbGVmdDogMTBweDsKICAgICB0ZXh0LW92ZXJmbG93OiBjbGlwOwpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggNzIzN2JhOS4uN2RlYjFlMiAxMDA2NDQKLS0t IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCkBAIC0xNjIzLDcgKzE2MjMsNyBAQCBX ZWJJbnNwZWN0b3IuaXNCZWluZ0VkaXRlZCA9IGZ1bmN0aW9uKGVsZW1lbnQpCiAgICAgcmV0dXJu IGVsZW1lbnQuX19lZGl0aW5nOwogfQogCi1XZWJJbnNwZWN0b3Iuc3RhcnRFZGl0aW5nID0gZnVu Y3Rpb24oZWxlbWVudCwgY29tbWl0dGVkQ2FsbGJhY2ssIGNhbmNlbGxlZENhbGxiYWNrLCBjb250 ZXh0KQorV2ViSW5zcGVjdG9yLnN0YXJ0RWRpdGluZyA9IGZ1bmN0aW9uKGVsZW1lbnQsIGNvbW1p dHRlZENhbGxiYWNrLCBjYW5jZWxsZWRDYWxsYmFjaywgY29udGV4dCwgbXVsdGlsaW5lKQogewog ICAgIGlmIChlbGVtZW50Ll9fZWRpdGluZykKICAgICAgICAgcmV0dXJuOwpAQCAtMTY4NCw3ICsx Njg0LDEwIEBAIFdlYkluc3BlY3Rvci5zdGFydEVkaXRpbmcgPSBmdW5jdGlvbihlbGVtZW50LCBj b21taXR0ZWRDYWxsYmFjaywgY2FuY2VsbGVkQ2FsbGJhCiAgICAgfQogCiAgICAgZnVuY3Rpb24g a2V5RG93bkV2ZW50TGlzdGVuZXIoZXZlbnQpIHsKLSAgICAgICAgaWYgKGlzRW50ZXJLZXkoZXZl bnQpKSB7CisgICAgICAgIHZhciBpc01ldGFPckN0cmwgPSBXZWJJbnNwZWN0b3IuaXNNYWMoKSA/ CisgICAgICAgICAgICBldmVudC5tZXRhS2V5ICYmICFldmVudC5zaGlmdEtleSAmJiAhZXZlbnQu Y3RybEtleSAmJiAhZXZlbnQuYWx0S2V5IDoKKyAgICAgICAgICAgIGV2ZW50LmN0cmxLZXkgJiYg IWV2ZW50LnNoaWZ0S2V5ICYmICFldmVudC5tZXRhS2V5ICYmICFldmVudC5hbHRLZXk7CisgICAg ICAgIGlmIChpc0VudGVyS2V5KGV2ZW50KSAmJiAoIW11bHRpbGluZSB8fCBpc01ldGFPckN0cmwp KSB7CiAgICAgICAgICAgICBlZGl0aW5nQ29tbWl0dGVkLmNhbGwoZWxlbWVudCk7CiAgICAgICAg ICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwogICAgICAgICAgICAgZXZlbnQuc3RvcFByb3Bh Z2F0aW9uKCk7Cg==