87021 2012-05-21 07:57:01 -0700 Web Inspector: Move working copy support to UISourceCode and use it for both styles and scripts. 2012-05-21 08:09:13 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 629095 0 vsevik 2012-05-21 07:57:01 -0700 UISourceCode now listens for RevisionAdded event. Virtual methods workingCopyChanged and workingCopyCommitted added to UISourceCode and implemented in descendants. 629098 1 143035 vsevik 2012-05-21 08:00:06 -0700 Created attachment 143035 Patch 629106 2 vsevik 2012-05-21 08:09:13 -0700 Committed r117781: <http://trac.webkit.org/changeset/117781> 143035 2012-05-21 08:00:06 -0700 2012-05-21 08:07:38 -0700 Patch bug-87021-20120521190005.patch text/plain 11651 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3Nzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzU5YjMzNTM3OWVkZjFk NTg5MDI5MTYxYzc2N2RlNjliZGVhZTUwNy4uMmQ2ZTQ3ZDQxODUxZmU5ZGFlYWZmYjcxMmNiMmMz MjVkZmMyNThiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDEyLTA1LTIxICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IE1vdmUgd29ya2luZyBjb3B5IHN1cHBvcnQgdG8gVUlTb3VyY2VDb2RlIGFuZCB1c2UgaXQg Zm9yIGJvdGggc3R5bGVzIGFuZCBzY3JpcHRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODcwMjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVSVNvdXJjZUNvZGUgbm93IGxpc3RlbnMgZm9yIFJldmlzaW9u QWRkZWQgZXZlbnQuCisgICAgICAgIFZpcnR1YWwgbWV0aG9kcyB3b3JraW5nQ29weUNoYW5nZWQg YW5kIHdvcmtpbmdDb3B5Q29tbWl0dGVkIGFkZGVkIHRvIFVJU291cmNlQ29kZSBhbmQgaW1wbGVt ZW50ZWQgaW4gZGVzY2VuZGFudHMuCisgICAgICAgIERlYnVnZ2VyUmVzb3VyY2VCaW5kaW5nIGRv ZXMgbm90IGNhbGwgY29udGVudENoYW5nZWQgb24gVUlTb3VyY2VDb2RlIGV4cGxpY2l0bHkgYW55 bW9yZS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJSZXNvdXJjZUJp bmRpbmcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJSZXNvdXJjZUJpbmRpbmcu c2V0U2NyaXB0U291cmNlLmRpZEVkaXRTY3JpcHRTb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRlYnVnZ2VyUmVzb3VyY2VCaW5kaW5nLnNldFNjcmlwdFNvdXJjZSk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0U291cmNlLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkphdmFTY3JpcHRTb3VyY2UucHJvdG90eXBlLndvcmtpbmdDb3B5Q29tbWl0dGVkKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlLmNv bW1pdEVkaXRpbmcpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0U25pcHBl dE1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNuaXBwZXRKYXZhU2NyaXB0U291cmNl LnByb3RvdHlwZS53b3JraW5nQ29weUNvbW1pdHRlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9TdHlsZXNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVNvdXJj ZS5wcm90b3R5cGUud29ya2luZ0NvcHlDb21taXR0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlN0eWxlU291cmNlLnByb3RvdHlwZS53b3JraW5nQ29weUNoYW5nZWQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlN0eWxlU291cmNlRnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxl U291cmNlRnJhbWUucHJvdG90eXBlLmNvbW1pdEVkaXRpbmcpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlN0eWxlU291cmNlRnJhbWUucHJvdG90eXBlLmFmdGVyVGV4dENoYW5nZWQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlN0eWxlU291cmNlRnJhbWUucHJvdG90eXBlLl9kaWRFZGl0Q29udGVu dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVTb3VyY2VGcmFtZS5wcm90b3R5cGUuX29u Q29udGVudENoYW5nZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VD b2RlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlwZS5fcmV2aXNpb25BZGRlZCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlwZS5jb250ZW50Q2hhbmdlZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlwZS53b3JraW5nQ29w eSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlwZS5zZXRXb3Jr aW5nQ29weSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlwZS53 b3JraW5nQ29weUNoYW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5w cm90b3R5cGUuY29tbWl0V29ya2luZ0NvcHkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291 cmNlQ29kZS5wcm90b3R5cGUud29ya2luZ0NvcHlDb21taXR0ZWQpOgorCiAyMDEyLTA1LTIxICAn UGF2ZWwgRmVsZG1hbicgIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIElu c3BlY3RvcjogZGVjbGFyZSBzZXRGb3JtYXR0ZWQgb24gVUlTb3VyY2VDb2RlIChvdGhlcndpc2Ug ZmFpbHMgZm9yIHN0eWxlcykuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0RlYnVnZ2VyUmVzb3VyY2VCaW5kaW5nLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclJlc291cmNlQmluZGluZy5qcwppbmRleCBkOGE0NmQ4 YzJiOGQ5NDYyNzFmNzVhNGFlNmM3MzJhMmQzODY1MzJkLi40ZDZmNTcxMWU2OTQxN2YyMjA2ZjEx MGQyZjQwM2M4NGUxZWE0NWI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0RlYnVnZ2VyUmVzb3VyY2VCaW5kaW5nLmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJSZXNvdXJjZUJpbmRpbmcuanMKQEAgLTY0LDcg KzY0LDYgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUmVzb3VyY2VCaW5kaW5nLnNldFNjcmlwdFNv dXJjZSA9IGZ1bmN0aW9uKHVpU291cmNlQ29kZSwgbmUKICAgICAgICAgaWYgKHJlc291cmNlKQog ICAgICAgICAgICAgcmVzb3VyY2UuYWRkUmV2aXNpb24obmV3U291cmNlKTsKIAotICAgICAgICB1 aVNvdXJjZUNvZGUuY29udGVudENoYW5nZWQobmV3U291cmNlKTsKICAgICAgICAgY2FsbGJhY2so bnVsbCk7CiAgICAgfQogICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLnNldFNjcmlwdFNv dXJjZShzY3JpcHQuc2NyaXB0SWQsIG5ld1NvdXJjZSwgZGlkRWRpdFNjcmlwdFNvdXJjZS5iaW5k KHRoaXMpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv SmF2YVNjcmlwdFNvdXJjZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv SmF2YVNjcmlwdFNvdXJjZS5qcwppbmRleCA0MTBlZTMxODY4MmRkMzdkYzk3ZjQ5MzQzYTQ0Mjdm MzQxY2VkZTM5Li4wZTNjNzZhNDY3YmI5Mjc2OWE2Y2E0OGZjNGNiNzI4ODQxZmQxNjFmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3Vy Y2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0 U291cmNlLmpzCkBAIC0xNzcsNyArMTc3LDEwIEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291 cmNlLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2lzRWRpdGFibGUgJiYgV2Vi SW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuY2FuU2V0U2NyaXB0U291cmNlKCk7CiAgICAgfSwKIAot ICAgIGNvbW1pdFdvcmtpbmdDb3B5OiBmdW5jdGlvbihjYWxsYmFjaykKKyAgICAvKioKKyAgICAg KiBAcGFyYW0ge2Z1bmN0aW9uKD9zdHJpbmcpfSBjYWxsYmFjaworICAgICAqLworICAgIHdvcmtp bmdDb3B5Q29tbWl0dGVkOiBmdW5jdGlvbihjYWxsYmFjaykKICAgICB7ICAKICAgICAgICAgV2Vi SW5zcGVjdG9yLkRlYnVnZ2VyUmVzb3VyY2VCaW5kaW5nLnNldFNjcmlwdFNvdXJjZSh0aGlzLCB0 aGlzLndvcmtpbmdDb3B5KCksIGNhbGxiYWNrKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpz CmluZGV4IDdjZThkMTU3NGQzNzVkN2NlNTk1OGQwMjUyODA3ZDk5MGZhZjEwYjEuLmQ2MGM3NWU4 NTVmZGJhNjBlYmQ5ZDFkNzE0NDc4M2IyN2Q3MjkxMWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpz CkBAIC05Myw4ICs5Myw2IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJv dG90eXBlID0gewogICAgIGNvbW1pdEVkaXRpbmc6IGZ1bmN0aW9uKHRleHQpCiAgICAgewogICAg ICAgICB0aGlzLl9lZGl0aW5nQ29udGVudCA9IHRydWU7Ci0gICAgICAgIGlmICghdGhpcy5fdWlT b3VyY2VDb2RlLmlzRGlydHkoKSkKLSAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgdGhpcy5f dWlTb3VyY2VDb2RlLmNvbW1pdFdvcmtpbmdDb3B5KHRoaXMuX2RpZEVkaXRDb250ZW50LmJpbmQo dGhpcykpOwogICAgIH0sCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU2NyaXB0U25pcHBldE1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRTbmlwcGV0TW9kZWwuanMKaW5kZXggZDA1M2JhOWE4NzNhZjljNGI3 ODUwYjdhMTBhOTU4YTE2ODE0OWE4NC4uY2M4YjA5MzE4NzE4NWNjNGVlMDQzNzI5YmFiN2E1OTBh ZWJmNzExNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRTbmlwcGV0TW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHRTbmlwcGV0TW9kZWwuanMKQEAgLTMxNiwxMCArMzE2LDEzIEBAIFdlYkluc3Bl Y3Rvci5TbmlwcGV0SmF2YVNjcmlwdFNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVy biB0cnVlOwogICAgIH0sCiAKLSAgICBjb21taXRXb3JraW5nQ29weTogZnVuY3Rpb24oY2FsbGJh Y2spCi0gICAgeworICAgIC8qKgorICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oP3N0cmluZyl9IGNh bGxiYWNrCisgICAgICovCisgICAgd29ya2luZ0NvcHlDb21taXR0ZWQ6IGZ1bmN0aW9uKGNhbGxi YWNrKQorICAgIHsgIAogICAgICAgICB0aGlzLl9zY3JpcHRTbmlwcGV0TW9kZWwuc2V0U2NyaXB0 U25pcHBldENvbnRlbnQodGhpcywgdGhpcy53b3JraW5nQ29weSgpKTsKLSAgICAgICAgY2FsbGJh Y2soKTsKKyAgICAgICAgY2FsbGJhY2sobnVsbCk7CiAgICAgfSwKIAogICAgIC8qKgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNQYW5lbC5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzUGFuZWwuanMKaW5kZXgg MGE1ZGI5ZDg5YmUzYWFlOWVmYzE2YTI4NjU3YzAwMzRkZGZkZWVhNC4uMTMxMWJhOTA0NzI0ZTYw YjhmM2NhYzgwOGYxZGJiOWY3MDM5MDU2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TdHlsZXNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1BhbmVsLmpzCkBAIC05OCw2ICs5OCwyMyBAQCBXZWJJbnNw ZWN0b3IuU3R5bGVTb3VyY2UgPSBmdW5jdGlvbihyZXNvdXJjZSkKIH0KIAogV2ViSW5zcGVjdG9y LlN0eWxlU291cmNlLnByb3RvdHlwZSA9IHsKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge2Z1bmN0 aW9uKD9zdHJpbmcpfSBjYWxsYmFjaworICAgICAqLworICAgIHdvcmtpbmdDb3B5Q29tbWl0dGVk OiBmdW5jdGlvbihjYWxsYmFjaykKKyAgICB7ICAKKyAgICAgICAgdGhpcy5fcmVzb3VyY2Uuc2V0 Q29udGVudCh0aGlzLndvcmtpbmdDb3B5KCksIHRydWUsIGNhbGxiYWNrKTsKKyAgICB9LAorCisg ICAgd29ya2luZ0NvcHlDaGFuZ2VkOiBmdW5jdGlvbigpCisgICAgeyAgCisgICAgICAgIGZ1bmN0 aW9uIGNvbW1pdEluY3JlbWVudGFsRWRpdCgpCisgICAgICAgIHsKKyAgICAgICAgICAgIHRoaXMu X3Jlc291cmNlLnNldENvbnRlbnQodGhpcy53b3JraW5nQ29weSgpLCBmYWxzZSwgZnVuY3Rpb24o KSB7fSk7CisgICAgICAgIH0KKyAgICAgICAgY29uc3QgdXBkYXRlVGltZW91dCA9IDIwMDsKKyAg ICAgICAgdGhpcy5faW5jcmVtZW50YWxVcGRhdGVUaW1lciA9IHNldFRpbWVvdXQoY29tbWl0SW5j cmVtZW50YWxFZGl0LmJpbmQodGhpcyksIHVwZGF0ZVRpbWVvdXQpOworICAgIH0KIH0KIAogV2Vi SW5zcGVjdG9yLlN0eWxlU291cmNlLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3Iu VUlTb3VyY2VDb2RlLnByb3RvdHlwZTsKQEAgLTExMSw3ICsxMjgsNyBAQCBXZWJJbnNwZWN0b3Iu U3R5bGVTb3VyY2VGcmFtZSA9IGZ1bmN0aW9uKHN0eWxlU291cmNlKQogewogICAgIHRoaXMuX3N0 eWxlU291cmNlID0gc3R5bGVTb3VyY2U7CiAgICAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLmNh bGwodGhpcywgdGhpcy5fc3R5bGVTb3VyY2UpOwotICAgIHRoaXMuX3N0eWxlU291cmNlLnJlc291 cmNlKCkuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3VyY2UuRXZlbnRzLlJldmlz aW9uQWRkZWQsIHRoaXMuX2NvbnRlbnRDaGFuZ2VkLCB0aGlzKTsKKyAgICB0aGlzLl9zdHlsZVNv dXJjZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRzLkNv bnRlbnRDaGFuZ2VkLCB0aGlzLl9vbkNvbnRlbnRDaGFuZ2VkLCB0aGlzKTsKIH0KIAogV2ViSW5z cGVjdG9yLlN0eWxlU291cmNlRnJhbWUucHJvdG90eXBlID0gewpAQCAtMTI4LDE5ICsxNDUsMjAg QEAgV2ViSW5zcGVjdG9yLlN0eWxlU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAqLwog ICAgIGNvbW1pdEVkaXRpbmc6IGZ1bmN0aW9uKHRleHQpCiAgICAgewotICAgICAgICB0aGlzLl9z dHlsZVNvdXJjZS5yZXNvdXJjZSgpLnNldENvbnRlbnQodGV4dCwgdHJ1ZSwgZnVuY3Rpb24oKSB7 fSk7CisgICAgICAgIHRoaXMuX3N0eWxlU291cmNlLmNvbW1pdFdvcmtpbmdDb3B5KHRoaXMuX2Rp ZEVkaXRDb250ZW50LmJpbmQodGhpcykpOwogICAgIH0sCiAKICAgICBhZnRlclRleHRDaGFuZ2Vk OiBmdW5jdGlvbihvbGRSYW5nZSwgbmV3UmFuZ2UpCiAgICAgewotICAgICAgICBmdW5jdGlvbiBj b21taXRJbmNyZW1lbnRhbEVkaXQoKQotICAgICAgICB7Ci0gICAgICAgICAgICB2YXIgdGV4dCA9 IHRoaXMuX3RleHRNb2RlbC50ZXh0OwotICAgICAgICAgICAgdGhpcy5fc3R5bGVTb3VyY2Uuc2V0 V29ya2luZ0NvcHkodGV4dCk7Ci0gICAgICAgICAgICB0aGlzLl9zdHlsZVNvdXJjZS5yZXNvdXJj ZSgpLnNldENvbnRlbnQodGV4dCwgZmFsc2UsIGZ1bmN0aW9uKCkge30pOworICAgICAgICB0aGlz Ll9zdHlsZVNvdXJjZS5zZXRXb3JraW5nQ29weSh0aGlzLnRleHRNb2RlbC50ZXh0KTsKKyAgICB9 LAorCisgICAgX2RpZEVkaXRDb250ZW50OiBmdW5jdGlvbihlcnJvcikKKyAgICB7CisgICAgICAg IGlmIChlcnJvcikgeworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmxvZyhlcnJvciwgV2ViSW5z cGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZlbC5FcnJvciwgdHJ1ZSk7CisgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgIH0KLSAgICAgICAgY29uc3QgdXBkYXRlVGltZW91dCA9IDIw MDsKLSAgICAgICAgdGhpcy5faW5jcmVtZW50YWxVcGRhdGVUaW1lciA9IHNldFRpbWVvdXQoY29t bWl0SW5jcmVtZW50YWxFZGl0LmJpbmQodGhpcyksIHVwZGF0ZVRpbWVvdXQpOwogICAgIH0sCiAK ICAgICBfY2xlYXJJbmNyZW1lbnRhbFVwZGF0ZVRpbWVyOiBmdW5jdGlvbigpCkBAIC0xNTAsOSAr MTY4LDExIEBAIFdlYkluc3BlY3Rvci5TdHlsZVNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAg ICAgICAgZGVsZXRlIHRoaXMuX2luY3JlbWVudGFsVXBkYXRlVGltZXI7CiAgICAgfSwKIAotICAg IF9jb250ZW50Q2hhbmdlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgLyoqCisgICAgICogQHBhcmFt IHtXZWJJbnNwZWN0b3IuRXZlbnR9IGV2ZW50CisgICAgICovCisgICAgX29uQ29udGVudENoYW5n ZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgdGhpcy5fc3R5bGVTb3VyY2UuY29u dGVudENoYW5nZWQodGhpcy5fc3R5bGVTb3VyY2UucmVzb3VyY2UoKS5jb250ZW50IHx8ICIiKTsK ICAgICAgICAgdGhpcy5zZXRDb250ZW50KHRoaXMuX3N0eWxlU291cmNlLnJlc291cmNlKCkuY29u dGVudCwgZmFsc2UsICJ0ZXh0L3N0eWxlc2hlZXQiKTsKICAgICB9LAogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCmluZGV4IDQ3ZTNm MzlkNTg4M2U1NDBjN2U2Y2RkNzk0MWJiZTM5YWJlMWFiNzkuLjZmZGNmMzdkODJmZDlkYWZkMTBj NWE0ZjBmMGM0YWY5ZThhNDNlZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCkBAIC01NSw2ICs1NSw5IEBAIFdlYkluc3BlY3Rv ci5VSVNvdXJjZUNvZGUgPSBmdW5jdGlvbih1cmwsIHJlc291cmNlLCBjb250ZW50UHJvdmlkZXIs IHNvdXJjZU1hcHBpCiAgICAgICogQHR5cGUge0FycmF5LjxXZWJJbnNwZWN0b3IuUHJlc2VudGF0 aW9uQ29uc29sZU1lc3NhZ2U+fQogICAgICAqLwogICAgIHRoaXMuX2NvbnNvbGVNZXNzYWdlcyA9 IFtdOworICAgIAorICAgIGlmICh0aGlzLnJlc291cmNlKCkpCisgICAgICAgIHRoaXMucmVzb3Vy Y2UoKS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5FdmVudHMuUmV2aXNp b25BZGRlZCwgdGhpcy5fcmV2aXNpb25BZGRlZCwgdGhpcyk7CiB9CiAKIFdlYkluc3BlY3Rvci5V SVNvdXJjZUNvZGUuRXZlbnRzID0gewpAQCAtMTMxLDEzICsxMzQsMjAgQEAgV2ViSW5zcGVjdG9y LlVJU291cmNlQ29kZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9jb250ZW50UHJv dmlkZXIucmVxdWVzdENvbnRlbnQodGhpcy5maXJlQ29udGVudEF2YWlsYWJsZS5iaW5kKHRoaXMp KTsKICAgICB9LAogCisgICAgX3JldmlzaW9uQWRkZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsK KyAgICAgICAgdGhpcy5jb250ZW50Q2hhbmdlZCh0aGlzLnJlc291cmNlKCkuY29udGVudCB8fCAi Iik7CisgICAgfSwKKwogICAgIC8qKgogICAgICAqIEBwYXJhbSB7c3RyaW5nfSBuZXdDb250ZW50 CiAgICAgICovCiAgICAgY29udGVudENoYW5nZWQ6IGZ1bmN0aW9uKG5ld0NvbnRlbnQpCiAgICAg ewotICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLl9jb250ZW50TG9hZGVkKTsKLSAgICAgICAg dmFyIG9sZENvbnRlbnQgPSB0aGlzLl9jb250ZW50OworICAgICAgICBpZiAodGhpcy5fY29tbWl0 dGluZ1dvcmtpbmdDb3B5KQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHZhciBvbGRD b250ZW50ID0gdGhpcy5fY29udGVudExvYWRlZCA/IHRoaXMuX2NvbnRlbnQgOiB1bmRlZmluZWQ7 CiAgICAgICAgIHRoaXMuX2NvbnRlbnQgPSBuZXdDb250ZW50OwogICAgICAgICBkZWxldGUgdGhp cy5fd29ya2luZ0NvcHk7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdl Ykluc3BlY3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRzLkNvbnRlbnRDaGFuZ2VkLCB7b2xkQ29udGVu dDogb2xkQ29udGVudCwgY29udGVudDogbmV3Q29udGVudH0pOwpAQCAtMTU3LDcgKzE2Nyw5IEBA IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlID0gewogICAgIHdvcmtpbmdDb3B5 OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLl9jb250ZW50 TG9hZGVkKTsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3dvcmtpbmdDb3B5OworICAgICAgICBpZiAo dGhpcy5pc0RpcnR5KCkpCisgICAgICAgICAgICByZXR1cm4gdGhpcy5fd29ya2luZ0NvcHk7Cisg ICAgICAgIHJldHVybiB0aGlzLl9jb250ZW50OwogICAgIH0sCiAKICAgICAvKioKQEAgLTE3MSw5 ICsxODMsNDkgQEAgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICBkZWxldGUgdGhpcy5fd29ya2luZ0NvcHk7CiAgICAgICAgIGVsc2UKICAgICAgICAg ICAgIHRoaXMuX3dvcmtpbmdDb3B5ID0gbmV3V29ya2luZ0NvcHk7CisgICAgICAgIHRoaXMud29y a2luZ0NvcHlDaGFuZ2VkKCk7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJz KFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRzLldvcmtpbmdDb3B5Q2hhbmdlZCwge29s ZFdvcmtpbmdDb3B5OiBvbGRXb3JraW5nQ29weSwgd29ya2luZ0NvcHk6IG5ld1dvcmtpbmdDb3B5 fSk7CiAgICAgfSwKIAorICAgIHdvcmtpbmdDb3B5Q2hhbmdlZDogZnVuY3Rpb24oKQorICAgIHsg IAorICAgICAgICAvLyBPdmVycmlkZGVuLgorICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFy YW0ge2Z1bmN0aW9uKD9zdHJpbmcpfSBjYWxsYmFjaworICAgICAqLworICAgIGNvbW1pdFdvcmtp bmdDb3B5OiBmdW5jdGlvbihjYWxsYmFjaykKKyAgICB7CisgICAgICAgIC8qKgorICAgICAgICAg KiBAcGFyYW0gez9zdHJpbmd9IGVycm9yCisgICAgICAgICAqLworICAgICAgICBmdW5jdGlvbiBp bm5lckNhbGxiYWNrKGVycm9yKQorICAgICAgICB7CisgICAgICAgICAgICBkZWxldGUgdGhpcy5f Y29tbWl0dGluZ1dvcmtpbmdDb3B5OworICAgICAgICAgICAgaWYgKCFlcnJvcikKKyAgICAgICAg ICAgICAgICB0aGlzLmNvbnRlbnRDaGFuZ2VkKG5ld0NvbnRlbnQpOworICAgICAgICAgICAgY2Fs bGJhY2soZXJyb3IpOworICAgICAgICB9CisKKyAgICAgICAgaWYgKCF0aGlzLmlzRGlydHkoKSkg eworICAgICAgICAgICAgY2FsbGJhY2sobnVsbCk7CisgICAgICAgICAgICByZXR1cm47CisgICAg ICAgIH0KKworICAgICAgICB2YXIgbmV3Q29udGVudCA9IHRoaXMuX3dvcmtpbmdDb3B5OworICAg ICAgICB0aGlzLl9jb21taXR0aW5nV29ya2luZ0NvcHkgPSB0cnVlOworICAgICAgICB0aGlzLndv cmtpbmdDb3B5Q29tbWl0dGVkKGlubmVyQ2FsbGJhY2suYmluZCh0aGlzKSk7CisgICAgfSwKKwor ICAgIC8qKgorICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oP3N0cmluZyl9IGNhbGxiYWNrCisgICAg ICovCisgICAgd29ya2luZ0NvcHlDb21taXR0ZWQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIHsg IAorICAgICAgICAvLyBPdmVycmlkZGVuLgorICAgIH0sCisKICAgICAvKioKICAgICAgKiBAcmV0 dXJuIHtib29sZWFufQogICAgICAqLwo=