51751 2010-12-30 08:33:55 -0800 Web Inspector: recreate script view after live edit 2011-01-11 06:37:51 -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 327929 0 podivilov 2010-12-30 08:33:55 -0800 Recreate script view after live edit like it is done for source views. 327930 1 77681 podivilov 2010-12-30 08:34:46 -0800 Created attachment 77681 Patch. 327937 2 77684 podivilov 2010-12-30 09:03:25 -0800 Created attachment 77684 Patch. 332264 3 77684 pfeldman 2011-01-11 04:39:14 -0800 Comment on attachment 77684 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=77684&action=review > WebCore/inspector/front-end/ScriptsPanel.js:316 > + script.resource.setContent(newBodyOrErrorMessage, revertEditingCallback); In the future, we'd like to edit inline script of say HTML resources. As a result, committing snippet content as resource content will become wrong. 332308 4 podivilov 2011-01-11 06:37:51 -0800 Committed r75500: <http://trac.webkit.org/changeset/75500> 77681 2010-12-30 08:34:46 -0800 2010-12-30 09:03:25 -0800 Patch. patch text/plain 5079 podivilov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZWJkMWNkNy4uZjQ3NGQ0NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMiBAQAogMjAxMC0xMi0zMCAgUGF2ZWwgUG9kaXZp bG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiByZWNyZWF0ZSBzY3JpcHQgdmll dyBhZnRlciBsaXZlIGVkaXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01MTc1MQorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0LnByb3RvdHlwZS5zZXQgc291cmNlKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdFZpZXcuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU2NyaXB0Vmlldyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3Rv dHlwZS5lZGl0U2NyaXB0U291cmNlLm15Y2FsbGJhY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuZWRpdFNjcmlwdFNvdXJjZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS52aWV3UmVjcmVhdGVkKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzOgorCisyMDEwLTEyLTMwICBQYXZl bCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFJldmlld2Vk IGJ5IFBhdmVsIEZlbGRtYW4uCiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogY2FsbCBzdGFjayBz aG93cyAiUGF1c2VkIG9uIGEgSmF2YVNjcmlwdCBicmVha3BvaW50IiB3aGVuIHN0ZXBwaW5nLgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qcyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanMKaW5kZXggMTg0ZmU5Ny4uNTI3ZGQ5ZCAx MDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qcworKysgYi9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0LmpzCkBAIC01NywxMCArNTcsNiBAQCBX ZWJJbnNwZWN0b3IuU2NyaXB0LldvcmxkVHlwZSA9IHsKICAgICBFWFRFTlNJT05TX1dPUkxEOiAx CiB9CiAKLVdlYkluc3BlY3Rvci5TY3JpcHQuRXZlbnRzID0gewotICAgIFNvdXJjZUNoYW5nZWQ6 ICJzb3VyY2UtY2hhbmdlZCIKLX0KLQogV2ViSW5zcGVjdG9yLlNjcmlwdC5wcm90b3R5cGUgPSB7 CiAgICAgZ2V0IGxpbmVzQ291bnQoKQogICAgIHsKQEAgLTg1LDggKzgxLDUgQEAgV2ViSW5zcGVj dG9yLlNjcmlwdC5wcm90b3R5cGUgPSB7CiAgICAgc2V0IHNvdXJjZShzb3VyY2UpCiAgICAgewog ICAgICAgICB0aGlzLl9zb3VyY2UgPSBzb3VyY2U7Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVu dFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHQuRXZlbnRzLlNvdXJjZUNoYW5nZWQpOwog ICAgIH0KIH0KLQotV2ViSW5zcGVjdG9yLlNjcmlwdC5wcm90b3R5cGUuX19wcm90b19fID0gV2Vi SW5zcGVjdG9yLk9iamVjdC5wcm90b3R5cGU7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2NyaXB0Vmlldy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRWaWV3LmpzCmluZGV4IDM5ZGFlNTUuLmYxMzU0NzUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRWaWV3LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRWaWV3LmpzCkBAIC0zMCw3ICszMCw2IEBAIFdlYkluc3BlY3Rvci5T Y3JpcHRWaWV3ID0gZnVuY3Rpb24oc2NyaXB0KQogICAgIHRoaXMuZWxlbWVudC5hZGRTdHlsZUNs YXNzKCJzY3JpcHQtdmlldyIpOwogCiAgICAgdGhpcy5zY3JpcHQgPSBzY3JpcHQ7Ci0gICAgdGhp cy5zY3JpcHQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU2NyaXB0LkV2ZW50cy5Tb3Vy Y2VDaGFuZ2VkLCB0aGlzLl9zY3JpcHRTb3VyY2VDaGFuZ2VkLCB0aGlzKTsKIAogICAgIHRoaXMu X2ZyYW1lTmVlZHNTZXR1cCA9IHRydWU7CiAgICAgdGhpcy5fc291cmNlRnJhbWVTZXR1cCA9IGZh bHNlOwpAQCAtODUsMTEgKzg0LDYgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdFZpZXcucHJvdG90eXBl ID0gewogICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNjcmlwdC1yZXNvdXJj ZS12aWV3cyIpLmFwcGVuZENoaWxkKHRoaXMuZWxlbWVudCk7CiAgICAgfSwKIAotICAgIF9zY3Jp cHRTb3VyY2VDaGFuZ2VkOiBmdW5jdGlvbihldmVudCkKLSAgICB7Ci0gICAgICAgIHRoaXMuc291 cmNlRnJhbWUudXBkYXRlQ29udGVudCh0aGlzLl9wcmVwZW5kV2hpdGVzcGFjZSh0aGlzLnNjcmlw dC5zb3VyY2UpKTsKLSAgICB9LAotCiAgICAgLy8gVGhlIGZvbGxvd2luZyBtZXRob2RzIGFyZSBw dWxsZWQgZnJvbSBTb3VyY2VWaWV3LCBzaW5jZSB0aGV5IGFyZQogICAgIC8vIGdlbmVyaWMgYW5k IHdvcmsgd2l0aCBTY3JpcHRWaWV3IGp1c3QgZmluZS4KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggMTM4YmJkYS4uY2QzN2Y5MyAxMDA2NDQKLS0t IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0yOTIsNyArMjkyLDcg QEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVy biBQcmVmZXJlbmNlcy5jYW5FZGl0U2NyaXB0U291cmNlOwogICAgIH0sCiAKLSAgICBlZGl0U2Ny aXB0U291cmNlOiBmdW5jdGlvbihlZGl0RGF0YSwgY29tbWl0RWRpdGluZ0NhbGxiYWNrLCBjYW5j ZWxFZGl0aW5nQ2FsbGJhY2spCisgICAgZWRpdFNjcmlwdFNvdXJjZTogZnVuY3Rpb24oZWRpdERh dGEsIHJldmVydEVkaXRpbmdDYWxsYmFjaywgY2FuY2VsRWRpdGluZ0NhbGxiYWNrKQogICAgIHsK ICAgICAgICAgaWYgKCF0aGlzLmNhbkVkaXRTY3JpcHRzKCkpCiAgICAgICAgICAgICByZXR1cm47 CkBAIC0zMDUsNyArMzA1LDE2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBl ID0gewogICAgICAgICBmdW5jdGlvbiBteWNhbGxiYWNrKHN1Y2Nlc3MsIG5ld0JvZHlPckVycm9y TWVzc2FnZSwgY2FsbEZyYW1lcykKICAgICAgICAgewogICAgICAgICAgICAgaWYgKHN1Y2Nlc3Mp IHsKLSAgICAgICAgICAgICAgICBjb21taXRFZGl0aW5nQ2FsbGJhY2sobmV3Qm9keU9yRXJyb3JN ZXNzYWdlKTsKKyAgICAgICAgICAgICAgICB2YXIgc2NyaXB0ID0gV2ViSW5zcGVjdG9yLmRlYnVn Z2VyTW9kZWwuc2NyaXB0Rm9yU291cmNlSUQoZWRpdERhdGEuc291cmNlSUQpOworICAgICAgICAg ICAgICAgIHNjcmlwdC5zb3VyY2UgPSBuZXdCb2R5T3JFcnJvck1lc3NhZ2U7CisgICAgICAgICAg ICAgICAgdmFyIG9sZFZpZXcgPSBzY3JpcHQuX3NjcmlwdFZpZXcKKyAgICAgICAgICAgICAgICBp ZiAob2xkVmlldykgeworICAgICAgICAgICAgICAgICAgICBzY3JpcHQuX3NjcmlwdFZpZXcgPSBu ZXcgV2ViSW5zcGVjdG9yLlNjcmlwdFZpZXcoc2NyaXB0KTsKKyAgICAgICAgICAgICAgICAgICAg dGhpcy52aWV3UmVjcmVhdGVkKG9sZFZpZXcsIHNjcmlwdC5fc2NyaXB0Vmlldyk7CisgICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgICAgIGlmIChzY3JpcHQucmVzb3VyY2UpCisgICAgICAg ICAgICAgICAgICAgIHNjcmlwdC5yZXNvdXJjZS5zZXRDb250ZW50KG5ld0JvZHlPckVycm9yTWVz c2FnZSwgcmV2ZXJ0RWRpdGluZ0NhbGxiYWNrKTsKKwogICAgICAgICAgICAgICAgIGlmIChjYWxs RnJhbWVzICYmIGNhbGxGcmFtZXMubGVuZ3RoKQogICAgICAgICAgICAgICAgICAgICB0aGlzLl9k ZWJ1Z2dlclBhdXNlZCh7IGRhdGE6IHsgY2FsbEZyYW1lczogY2FsbEZyYW1lcyB9IH0pOwogICAg ICAgICAgICAgfSBlbHNlIHsKQEAgLTQ2MCw4ICs0NjksOCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0 c1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIHZpZXdSZWNyZWF0ZWQ6IGZ1bmN0aW9uKG9sZFZp ZXcsIG5ld1ZpZXcpCiAgICAgewotICAgICAgICBpZiAodGhpcy5fdmlzaWJsZVZpZXcgPT09IG9s ZFZpZXcpCi0gICAgICAgICAgICB0aGlzLl92aXNpYmxlVmlldyA9IG5ld1ZpZXc7CisgICAgICAg IGlmICh0aGlzLnZpc2libGVWaWV3ID09PSBvbGRWaWV3KQorICAgICAgICAgICAgdGhpcy52aXNp YmxlVmlldyA9IG5ld1ZpZXc7CiAgICAgfSwKIAogICAgIGNhblNob3dTb3VyY2VMaW5lOiBmdW5j dGlvbih1cmwsIGxpbmUpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U291cmNlRnJhbWUuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUu anMKaW5kZXggZmE4NDQxZC4uMzE1YjJmOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Tb3VyY2VGcmFtZS5qcwpAQCAtMTQ4LDExICsxNDgsNiBAQCBXZWJJbnNwZWN0b3IuU291cmNl RnJhbWUucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9jcmVhdGVWaWV3ZXJJZk5lZWRlZCgp OwogICAgIH0sCiAKLSAgICB1cGRhdGVDb250ZW50OiBmdW5jdGlvbihjb250ZW50KQotICAgIHsK LSAgICAgICAgdGhpcy5fdGV4dE1vZGVsLnNldFRleHQobnVsbCwgY29udGVudCk7Ci0gICAgfSwK LQogICAgIGdldCB0ZXh0TW9kZWwoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3RleHRN b2RlbDsK 77684 2010-12-30 09:03:25 -0800 2011-01-11 04:39:14 -0800 Patch. patch text/plain 6036 podivilov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZWJkMWNkNy4uMGQ5ZDc5MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMyBAQAogMjAxMC0xMi0zMCAgUGF2ZWwgUG9kaXZp bG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiByZWNyZWF0ZSBzY3JpcHQgdmll dyBhZnRlciBsaXZlIGVkaXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01MTc1MQorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0LnByb3RvdHlwZS5zZXQgc291cmNlKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdFZpZXcuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU2NyaXB0Vmlldyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3Rv dHlwZS5lZGl0U2NyaXB0U291cmNlLm15Y2FsbGJhY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuZWRpdFNjcmlwdFNvdXJjZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS52aWV3UmVjcmVhdGVkKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fZG9FZGl0TGluZSk6CisKKzIwMTAtMTItMzAgIFBh dmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgUmV2aWV3 ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBjYWxsIHN0YWNr IHNob3dzICJQYXVzZWQgb24gYSBKYXZhU2NyaXB0IGJyZWFrcG9pbnQiIHdoZW4gc3RlcHBpbmcu CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0LmpzIGIvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qcwppbmRleCAxODRmZTk3Li41MjdkZDlk IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0LmpzCisrKyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanMKQEAgLTU3LDEwICs1Nyw2IEBA IFdlYkluc3BlY3Rvci5TY3JpcHQuV29ybGRUeXBlID0gewogICAgIEVYVEVOU0lPTlNfV09STEQ6 IDEKIH0KIAotV2ViSW5zcGVjdG9yLlNjcmlwdC5FdmVudHMgPSB7Ci0gICAgU291cmNlQ2hhbmdl ZDogInNvdXJjZS1jaGFuZ2VkIgotfQotCiBXZWJJbnNwZWN0b3IuU2NyaXB0LnByb3RvdHlwZSA9 IHsKICAgICBnZXQgbGluZXNDb3VudCgpCiAgICAgewpAQCAtODUsOCArODEsNSBAQCBXZWJJbnNw ZWN0b3IuU2NyaXB0LnByb3RvdHlwZSA9IHsKICAgICBzZXQgc291cmNlKHNvdXJjZSkKICAgICB7 CiAgICAgICAgIHRoaXMuX3NvdXJjZSA9IHNvdXJjZTsKLSAgICAgICAgdGhpcy5kaXNwYXRjaEV2 ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNjcmlwdC5FdmVudHMuU291cmNlQ2hhbmdlZCk7 CiAgICAgfQogfQotCi1XZWJJbnNwZWN0b3IuU2NyaXB0LnByb3RvdHlwZS5fX3Byb3RvX18gPSBX ZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TY3JpcHRWaWV3LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdFZpZXcuanMKaW5kZXggMzlkYWU1NS4uZjEzNTQ3NSAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdFZpZXcuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdFZpZXcuanMKQEAgLTMwLDcgKzMwLDYgQEAgV2ViSW5zcGVjdG9y LlNjcmlwdFZpZXcgPSBmdW5jdGlvbihzY3JpcHQpCiAgICAgdGhpcy5lbGVtZW50LmFkZFN0eWxl Q2xhc3MoInNjcmlwdC12aWV3Iik7CiAKICAgICB0aGlzLnNjcmlwdCA9IHNjcmlwdDsKLSAgICB0 aGlzLnNjcmlwdC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5TY3JpcHQuRXZlbnRzLlNv dXJjZUNoYW5nZWQsIHRoaXMuX3NjcmlwdFNvdXJjZUNoYW5nZWQsIHRoaXMpOwogCiAgICAgdGhp cy5fZnJhbWVOZWVkc1NldHVwID0gdHJ1ZTsKICAgICB0aGlzLl9zb3VyY2VGcmFtZVNldHVwID0g ZmFsc2U7CkBAIC04NSwxMSArODQsNiBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0Vmlldy5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic2NyaXB0LXJlc291 cmNlLXZpZXdzIikuYXBwZW5kQ2hpbGQodGhpcy5lbGVtZW50KTsKICAgICB9LAogCi0gICAgX3Nj cmlwdFNvdXJjZUNoYW5nZWQ6IGZ1bmN0aW9uKGV2ZW50KQotICAgIHsKLSAgICAgICAgdGhpcy5z b3VyY2VGcmFtZS51cGRhdGVDb250ZW50KHRoaXMuX3ByZXBlbmRXaGl0ZXNwYWNlKHRoaXMuc2Ny aXB0LnNvdXJjZSkpOwotICAgIH0sCi0KICAgICAvLyBUaGUgZm9sbG93aW5nIG1ldGhvZHMgYXJl IHB1bGxlZCBmcm9tIFNvdXJjZVZpZXcsIHNpbmNlIHRoZXkgYXJlCiAgICAgLy8gZ2VuZXJpYyBh bmQgd29yayB3aXRoIFNjcmlwdFZpZXcganVzdCBmaW5lLgogCmRpZmYgLS1naXQgYS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCAxMzhiYmRhLi5jZDM3ZjkzIDEwMDY0NAot LS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAgLTI5Miw3ICsyOTIs NyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0 dXJuIFByZWZlcmVuY2VzLmNhbkVkaXRTY3JpcHRTb3VyY2U7CiAgICAgfSwKIAotICAgIGVkaXRT Y3JpcHRTb3VyY2U6IGZ1bmN0aW9uKGVkaXREYXRhLCBjb21taXRFZGl0aW5nQ2FsbGJhY2ssIGNh bmNlbEVkaXRpbmdDYWxsYmFjaykKKyAgICBlZGl0U2NyaXB0U291cmNlOiBmdW5jdGlvbihlZGl0 RGF0YSwgcmV2ZXJ0RWRpdGluZ0NhbGxiYWNrLCBjYW5jZWxFZGl0aW5nQ2FsbGJhY2spCiAgICAg ewogICAgICAgICBpZiAoIXRoaXMuY2FuRWRpdFNjcmlwdHMoKSkKICAgICAgICAgICAgIHJldHVy bjsKQEAgLTMwNSw3ICszMDUsMTYgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5 cGUgPSB7CiAgICAgICAgIGZ1bmN0aW9uIG15Y2FsbGJhY2soc3VjY2VzcywgbmV3Qm9keU9yRXJy b3JNZXNzYWdlLCBjYWxsRnJhbWVzKQogICAgICAgICB7CiAgICAgICAgICAgICBpZiAoc3VjY2Vz cykgewotICAgICAgICAgICAgICAgIGNvbW1pdEVkaXRpbmdDYWxsYmFjayhuZXdCb2R5T3JFcnJv ck1lc3NhZ2UpOworICAgICAgICAgICAgICAgIHZhciBzY3JpcHQgPSBXZWJJbnNwZWN0b3IuZGVi dWdnZXJNb2RlbC5zY3JpcHRGb3JTb3VyY2VJRChlZGl0RGF0YS5zb3VyY2VJRCk7CisgICAgICAg ICAgICAgICAgc2NyaXB0LnNvdXJjZSA9IG5ld0JvZHlPckVycm9yTWVzc2FnZTsKKyAgICAgICAg ICAgICAgICB2YXIgb2xkVmlldyA9IHNjcmlwdC5fc2NyaXB0VmlldworICAgICAgICAgICAgICAg IGlmIChvbGRWaWV3KSB7CisgICAgICAgICAgICAgICAgICAgIHNjcmlwdC5fc2NyaXB0VmlldyA9 IG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0VmlldyhzY3JpcHQpOworICAgICAgICAgICAgICAgICAg ICB0aGlzLnZpZXdSZWNyZWF0ZWQob2xkVmlldywgc2NyaXB0Ll9zY3JpcHRWaWV3KTsKKyAgICAg ICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgaWYgKHNjcmlwdC5yZXNvdXJjZSkKKyAgICAg ICAgICAgICAgICAgICAgc2NyaXB0LnJlc291cmNlLnNldENvbnRlbnQobmV3Qm9keU9yRXJyb3JN ZXNzYWdlLCByZXZlcnRFZGl0aW5nQ2FsbGJhY2spOworCiAgICAgICAgICAgICAgICAgaWYgKGNh bGxGcmFtZXMgJiYgY2FsbEZyYW1lcy5sZW5ndGgpCiAgICAgICAgICAgICAgICAgICAgIHRoaXMu X2RlYnVnZ2VyUGF1c2VkKHsgZGF0YTogeyBjYWxsRnJhbWVzOiBjYWxsRnJhbWVzIH0gfSk7CiAg ICAgICAgICAgICB9IGVsc2UgewpAQCAtNDYwLDggKzQ2OSw4IEBAIFdlYkluc3BlY3Rvci5TY3Jp cHRzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgdmlld1JlY3JlYXRlZDogZnVuY3Rpb24ob2xk VmlldywgbmV3VmlldykKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl92aXNpYmxlVmlldyA9PT0g b2xkVmlldykKLSAgICAgICAgICAgIHRoaXMuX3Zpc2libGVWaWV3ID0gbmV3VmlldzsKKyAgICAg ICAgaWYgKHRoaXMudmlzaWJsZVZpZXcgPT09IG9sZFZpZXcpCisgICAgICAgICAgICB0aGlzLnZp c2libGVWaWV3ID0gbmV3VmlldzsKICAgICB9LAogCiAgICAgY2FuU2hvd1NvdXJjZUxpbmU6IGZ1 bmN0aW9uKHVybCwgbGluZSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Tb3VyY2VGcmFtZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFt ZS5qcwppbmRleCBmYTg0NDFkLi45MzUwYmUwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NvdXJjZUZyYW1lLmpzCkBAIC0xNDgsMTEgKzE0OCw2IEBAIFdlYkluc3BlY3Rvci5Tb3Vy Y2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2NyZWF0ZVZpZXdlcklmTmVlZGVk KCk7CiAgICAgfSwKIAotICAgIHVwZGF0ZUNvbnRlbnQ6IGZ1bmN0aW9uKGNvbnRlbnQpCi0gICAg ewotICAgICAgICB0aGlzLl90ZXh0TW9kZWwuc2V0VGV4dChudWxsLCBjb250ZW50KTsKLSAgICB9 LAotCiAgICAgZ2V0IHRleHRNb2RlbCgpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fdGV4 dE1vZGVsOwpAQCAtODE3LDE2ICs4MTIsNyBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJv dG90eXBlID0gewogICAgIF9kb0VkaXRMaW5lOiBmdW5jdGlvbihlZGl0RGF0YSwgY2FuY2VsRWRp dGluZ0NhbGxiYWNrKQogICAgIHsKICAgICAgICAgdmFyIHJldmVydEVkaXRpbmdDYWxsYmFjayA9 IHRoaXMuX3JldmVydEVkaXRMaW5lLmJpbmQodGhpcywgZWRpdERhdGEpOwotICAgICAgICB2YXIg Y29tbWl0RWRpdGluZ0NhbGxiYWNrID0gdGhpcy5fY29tbWl0RWRpdExpbmUuYmluZCh0aGlzLCBl ZGl0RGF0YSwgcmV2ZXJ0RWRpdGluZ0NhbGxiYWNrKTsKLSAgICAgICAgV2ViSW5zcGVjdG9yLnBh bmVscy5zY3JpcHRzLmVkaXRTY3JpcHRTb3VyY2UoZWRpdERhdGEsIGNvbW1pdEVkaXRpbmdDYWxs YmFjaywgY2FuY2VsRWRpdGluZ0NhbGxiYWNrKTsKLSAgICB9LAotCi0gICAgX2NvbW1pdEVkaXRM aW5lOiBmdW5jdGlvbihlZGl0RGF0YSwgcmV2ZXJ0RWRpdExpbmVDYWxsYmFjaywgbmV3Q29udGVu dCkKLSAgICB7Ci0gICAgICAgIHZhciBzY3JpcHQgPSB0aGlzLl9zY3JpcHRzW2VkaXREYXRhLnNv dXJjZUlEXTsKLSAgICAgICAgc2NyaXB0LnNvdXJjZSA9IG5ld0NvbnRlbnQ7Ci0gICAgICAgIGlm IChzY3JpcHQucmVzb3VyY2UpCi0gICAgICAgICAgICBzY3JpcHQucmVzb3VyY2Uuc2V0Q29udGVu dChuZXdDb250ZW50LCByZXZlcnRFZGl0TGluZUNhbGxiYWNrKTsKKyAgICAgICAgV2ViSW5zcGVj dG9yLnBhbmVscy5zY3JpcHRzLmVkaXRTY3JpcHRTb3VyY2UoZWRpdERhdGEsIHJldmVydEVkaXRp bmdDYWxsYmFjaywgY2FuY2VsRWRpdGluZ0NhbGxiYWNrKTsKICAgICB9LAogCiAgICAgX3NldEJy ZWFrcG9pbnQ6IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIGVuYWJsZWQsIGNvbmRpdGlvbikK