57002 2011-03-24 03:52:35 -0700 Web Inspector: source frame should show the error to user when live edit is failed 2011-03-28 10:08:23 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 57245 0 podivilov aandrey aandrey apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 372728 0 podivilov 2011-03-24 03:52:35 -0700 Web Inspector: source frame should show the error to user when live edit is failed. Currently, the only way to check whether live edit failed or succeeded is to open the console and check for warnings. Source frame should indicate live edit failure more explicitly. 372734 1 aandrey 2011-03-24 03:56:34 -0700 One way is just to open the console on an error, and leave the editor in the live edit mode, preserving the current (unsaved) changes. Any other ideas? 373493 2 86934 aandrey 2011-03-25 07:32:21 -0700 Created attachment 86934 Patch 373503 3 86934 podivilov 2011-03-25 07:51:56 -0700 Comment on attachment 86934 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=86934&action=review > Source/WebCore/inspector/front-end/ScriptsPanel.js:1064 > WebInspector.log(newBodyOrErrorMessage, WebInspector.ConsoleMessage.MessageLevel.Warning); I think you should either move this code to SourceFrame or move WebInspector.showConsole() here. > Source/WebCore/inspector/front-end/ScriptsPanel.js:1065 > + callback(success); When live edit is succeeded, newBodyOrErrorMessage contains new source which may differ from current SourceFrame content. 373523 4 86934 aandrey 2011-03-25 08:15:37 -0700 Comment on attachment 86934 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=86934&action=review >> Source/WebCore/inspector/front-end/ScriptsPanel.js:1064 >> WebInspector.log(newBodyOrErrorMessage, WebInspector.ConsoleMessage.MessageLevel.Warning); > > I think you should either move this code to SourceFrame or move WebInspector.showConsole() here. done. >> Source/WebCore/inspector/front-end/ScriptsPanel.js:1065 >> + callback(success); > > When live edit is succeeded, newBodyOrErrorMessage contains new source which may differ from current SourceFrame content. done. 373524 5 86945 aandrey 2011-03-25 08:16:51 -0700 Created attachment 86945 Patch 374333 6 86945 yurys 2011-03-28 01:17:14 -0700 Comment on attachment 86945 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=86945&action=review > Source/WebCore/inspector/front-end/SourceFrame.js:817 > + if (newSource !== newBodyOrErrorMessage) Is there a valid scenario for this? 374348 7 podivilov 2011-03-28 01:56:52 -0700 (In reply to comment #6) > (From update of attachment 86945 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=86945&action=review > > > Source/WebCore/inspector/front-end/SourceFrame.js:817 > > + if (newSource !== newBodyOrErrorMessage) > > Is there a valid scenario for this? There is no such scenario according to Peter. 374355 8 aandrey 2011-03-28 02:04:36 -0700 Applying the diff below before landing: diff --git a/Source/WebCore/inspector/front-end/SourceFrame.js b/Source/WebCore/inspector/front-end/SourceFrame.js index de8b9fb..6f5d0dc 100644 --- a/Source/WebCore/inspector/front-end/SourceFrame.js +++ b/Source/WebCore/inspector/front-end/SourceFrame.js @@ -811,12 +811,7 @@ WebInspector.SourceFrame.prototype = { function didEditScriptSource(success, newBodyOrErrorMessage) { - if (this._originalTextModelContent !== undefined || this._textModel.text !== newSource) - return; - if (success) { - if (newSource !== newBodyOrErrorMessage) - this._textModel.setText(null, newBodyOrErrorMessage); - } else { + if (!success && this._originalTextModelContent === undefined && this._textModel.text === newSource) { this._originalTextModelContent = originalTextModelContent; this._textViewer.readOnly = false; this._delegate.setScriptSourceIsBeingEdited(true); 374398 9 podivilov 2011-03-28 04:32:06 -0700 Committed r82099: <http://trac.webkit.org/changeset/82099> 86934 2011-03-25 07:32:21 -0700 2011-03-25 08:16:45 -0700 Patch bug-57002-20110325173219.patch text/plain 3795 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogODE5NTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5NWVjYWIwODNjZWZhZWEz MGNiNDRmMTYyYTAxNTM2ZDQ3ODYwYWFjLi40NzQxYjQ3MzJjNzc0ZGVjNWMzOWYwNjMxMGZiZjk4 ODczNTI3ZmIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDMtMjUgIEFuZHJl eSBBZGFpa2luICA8YWFuZHJleUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHNvdXJjZSBmcmFtZSBzaG91 bGQgc2hvdyB0aGUgZXJyb3IgdG8gdXNlciB3aGVuIGxpdmUgZWRpdCBpcyBmYWlsZWQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MDAyCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5lZGl0 U2NyaXB0U291cmNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1l LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5faGFuZGxl U2F2ZS5kaWRTYXZlU2NyaXB0U291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VG cmFtZS5wcm90b3R5cGUuX2hhbmRsZVNhdmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lRGVsZWdhdGUucHJvdG90eXBlLmVkaXRTY3JpcHRTb3VyY2UpOgorCiAyMDExLTAzLTE1 ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggMjNiMDMxZDQzNjkxODE3NjgxNjQzMjQ2 OWY1YmFmODgwMDlhNGUyMy4uYjcxOTNmY2M1ZWVjNzFkYzkwNzY4NTU3YjJlOWM0YjA4NjJkM2E3 MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRz UGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRz UGFuZWwuanMKQEAgLTEwNjAsMTAgKzEwNjAsOSBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVE ZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBmdW5j dGlvbiBkaWRFZGl0U2NyaXB0U291cmNlKHN1Y2Nlc3MsIG5ld0JvZHlPckVycm9yTWVzc2FnZSkK ICAgICAgICAgewotICAgICAgICAgICAgaWYgKCFzdWNjZXNzKSB7CisgICAgICAgICAgICBpZiAo IXN1Y2Nlc3MpCiAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmxvZyhuZXdCb2R5T3JFcnJv ck1lc3NhZ2UsIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuV2Fybmlu Zyk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgfQorICAgICAgICAgICAg Y2FsbGJhY2soc3VjY2Vzcyk7CiAgICAgICAgIH0KICAgICAgICAgdGhpcy5fbW9kZWwuZWRpdFNj cmlwdFNvdXJjZSh0aGlzLl9zb3VyY2VGaWxlSWQsIHRleHQsIGRpZEVkaXRTY3JpcHRTb3VyY2Uu YmluZCh0aGlzKSk7CiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NvdXJjZUZyYW1lLmpzCmluZGV4IGJmOTYzOGM3ZDAxNzcwMDE5YmExODMxODEyN2Rj ZGE3NzczNDEzMjIuLjZlNmQwN2VmNWU3MzI2OTFmNjNiNmY5NzBiZmZhZTlhOWIyYzQzMTYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5q cwpAQCAtNzk1LDEyICs3OTUsMzAgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlw ZSA9IHsKICAgICAgICAgaWYgKHRoaXMuX3RleHRWaWV3ZXIucmVhZE9ubHkgfHwgIXRoaXMuX2Rl bGVnYXRlLmNhbkVkaXRTY3JpcHRTb3VyY2UoKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK IAorICAgICAgICBpZiAodGhpcy5fb3JpZ2luYWxUZXh0TW9kZWxDb250ZW50ID09PSB1bmRlZmlu ZWQpIHsKKyAgICAgICAgICAgIC8vIE5vIGVkaXRpbmcgd2FzIGFjdHVhbGx5IGRvbmUuCisgICAg ICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLnJlYWRPbmx5ID0gdHJ1ZTsKKyAgICAgICAgICAgIHRo aXMuX2RlbGVnYXRlLnNldFNjcmlwdFNvdXJjZUlzQmVpbmdFZGl0ZWQoZmFsc2UpOworICAgICAg ICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KKworICAgICAgICB2YXIgb3JpZ2luYWxUZXh0 TW9kZWxDb250ZW50ID0gdGhpcy5fb3JpZ2luYWxUZXh0TW9kZWxDb250ZW50OwogICAgICAgICB2 YXIgbmV3U291cmNlID0gdGhpcy5fdGV4dE1vZGVsLnRleHQ7Ci0gICAgICAgIGlmICh0aGlzLl9v cmlnaW5hbFRleHRNb2RlbENvbnRlbnQgIT09IG5ld1NvdXJjZSkKLSAgICAgICAgICAgIHRoaXMu X2RlbGVnYXRlLmVkaXRTY3JpcHRTb3VyY2UobmV3U291cmNlKTsKKwogICAgICAgICBkZWxldGUg dGhpcy5fb3JpZ2luYWxUZXh0TW9kZWxDb250ZW50OwogICAgICAgICB0aGlzLl90ZXh0Vmlld2Vy LnJlYWRPbmx5ID0gdHJ1ZTsKICAgICAgICAgdGhpcy5fZGVsZWdhdGUuc2V0U2NyaXB0U291cmNl SXNCZWluZ0VkaXRlZChmYWxzZSk7CisKKyAgICAgICAgZnVuY3Rpb24gZGlkU2F2ZVNjcmlwdFNv dXJjZShzdWNjZXNzKQorICAgICAgICB7CisgICAgICAgICAgICBpZiAoIXN1Y2Nlc3MgJiYgdGhp cy5fb3JpZ2luYWxUZXh0TW9kZWxDb250ZW50ID09PSB1bmRlZmluZWQgJiYgdGhpcy5fdGV4dE1v ZGVsLnRleHQgPT09IG5ld1NvdXJjZSkgeworICAgICAgICAgICAgICAgIHRoaXMuX29yaWdpbmFs VGV4dE1vZGVsQ29udGVudCA9IG9yaWdpbmFsVGV4dE1vZGVsQ29udGVudDsKKyAgICAgICAgICAg ICAgICB0aGlzLl90ZXh0Vmlld2VyLnJlYWRPbmx5ID0gZmFsc2U7CisgICAgICAgICAgICAgICAg dGhpcy5fZGVsZWdhdGUuc2V0U2NyaXB0U291cmNlSXNCZWluZ0VkaXRlZCh0cnVlKTsKKyAgICAg ICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd0NvbnNvbGUoKTsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgfQorICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5lZGl0U2NyaXB0U291cmNlKG5ld1NvdXJj ZSwgZGlkU2F2ZVNjcmlwdFNvdXJjZS5iaW5kKHRoaXMpKTsKICAgICAgICAgcmV0dXJuIHRydWU7 CiAgICAgfSwKIApAQCAtODgxLDcgKzg5OSw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURl bGVnYXRlLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0sCiAKLSAg ICBlZGl0U2NyaXB0U291cmNlOiBmdW5jdGlvbih0ZXh0KQorICAgIGVkaXRTY3JpcHRTb3VyY2U6 IGZ1bmN0aW9uKHRleHQsIGNhbGxiYWNrKQogICAgIHsKICAgICAgICAgLy8gU2hvdWxkIGJlIGlt cGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMuCiAgICAgfSwK 86945 2011-03-25 08:16:51 -0700 2011-03-28 01:17:14 -0700 Patch bug-57002-20110325181649.patch text/plain 4242 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogODE5NTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5NWVjYWIwODNjZWZhZWEz MGNiNDRmMTYyYTAxNTM2ZDQ3ODYwYWFjLi40NzQxYjQ3MzJjNzc0ZGVjNWMzOWYwNjMxMGZiZjk4 ODczNTI3ZmIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDMtMjUgIEFuZHJl eSBBZGFpa2luICA8YWFuZHJleUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHNvdXJjZSBmcmFtZSBzaG91 bGQgc2hvdyB0aGUgZXJyb3IgdG8gdXNlciB3aGVuIGxpdmUgZWRpdCBpcyBmYWlsZWQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MDAyCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5lZGl0 U2NyaXB0U291cmNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1l LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5faGFuZGxl U2F2ZS5kaWRTYXZlU2NyaXB0U291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VG cmFtZS5wcm90b3R5cGUuX2hhbmRsZVNhdmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lRGVsZWdhdGUucHJvdG90eXBlLmVkaXRTY3JpcHRTb3VyY2UpOgorCiAyMDExLTAzLTE1 ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggMjNiMDMxZDQzNjkxODE3NjgxNjQzMjQ2 OWY1YmFmODgwMDlhNGUyMy4uMjFlMTlmYzcyMThjMWVhOWE1ZjI4MThlM2ZkNGM5Yjg4M2Q5MjIw YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRz UGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRz UGFuZWwuanMKQEAgLTEwNTgsMTQgKzEwNTgsNyBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVE ZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICBlZGl0U2NyaXB0U291 cmNlOiBmdW5jdGlvbih0ZXh0LCBjYWxsYmFjaykKICAgICB7Ci0gICAgICAgIGZ1bmN0aW9uIGRp ZEVkaXRTY3JpcHRTb3VyY2Uoc3VjY2VzcywgbmV3Qm9keU9yRXJyb3JNZXNzYWdlKQotICAgICAg ICB7Ci0gICAgICAgICAgICBpZiAoIXN1Y2Nlc3MpIHsKLSAgICAgICAgICAgICAgICBXZWJJbnNw ZWN0b3IubG9nKG5ld0JvZHlPckVycm9yTWVzc2FnZSwgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNz YWdlLk1lc3NhZ2VMZXZlbC5XYXJuaW5nKTsKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAg ICAgICAgICB9Ci0gICAgICAgIH0KLSAgICAgICAgdGhpcy5fbW9kZWwuZWRpdFNjcmlwdFNvdXJj ZSh0aGlzLl9zb3VyY2VGaWxlSWQsIHRleHQsIGRpZEVkaXRTY3JpcHRTb3VyY2UuYmluZCh0aGlz KSk7CisgICAgICAgIHRoaXMuX21vZGVsLmVkaXRTY3JpcHRTb3VyY2UodGhpcy5fc291cmNlRmls ZUlkLCB0ZXh0LCBjYWxsYmFjayk7CiAgICAgfSwKIAogICAgIHNldFNjcmlwdFNvdXJjZUlzQmVp bmdFZGl0ZWQ6IGZ1bmN0aW9uKGluRWRpdE1vZGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcwppbmRleCBiZjk2MzhjN2QwMTc3MDAxOWJh MTgzMTgxMjdkY2RhNzc3MzQxMzIyLi5kZThiOWZiMDVhMzMxMGE5MDEzZjQ2Y2Y0ZDY4ODRmZWQw ZDc3ZjFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nv dXJjZUZyYW1lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291 cmNlRnJhbWUuanMKQEAgLTc5NSwxMiArNzk1LDM2IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFt ZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLl90ZXh0Vmlld2VyLnJlYWRPbmx5IHx8 ICF0aGlzLl9kZWxlZ2F0ZS5jYW5FZGl0U2NyaXB0U291cmNlKCkpCiAgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CiAKKyAgICAgICAgaWYgKHRoaXMuX29yaWdpbmFsVGV4dE1vZGVsQ29udGVudCA9 PT0gdW5kZWZpbmVkKSB7CisgICAgICAgICAgICAvLyBObyBlZGl0aW5nIHdhcyBhY3R1YWxseSBk b25lLgorICAgICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5yZWFkT25seSA9IHRydWU7CisgICAg ICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5zZXRTY3JpcHRTb3VyY2VJc0JlaW5nRWRpdGVkKGZhbHNl KTsKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisKKyAgICAgICAgdmFyIG9y aWdpbmFsVGV4dE1vZGVsQ29udGVudCA9IHRoaXMuX29yaWdpbmFsVGV4dE1vZGVsQ29udGVudDsK ICAgICAgICAgdmFyIG5ld1NvdXJjZSA9IHRoaXMuX3RleHRNb2RlbC50ZXh0OwotICAgICAgICBp ZiAodGhpcy5fb3JpZ2luYWxUZXh0TW9kZWxDb250ZW50ICE9PSBuZXdTb3VyY2UpCi0gICAgICAg ICAgICB0aGlzLl9kZWxlZ2F0ZS5lZGl0U2NyaXB0U291cmNlKG5ld1NvdXJjZSk7CisKICAgICAg ICAgZGVsZXRlIHRoaXMuX29yaWdpbmFsVGV4dE1vZGVsQ29udGVudDsKICAgICAgICAgdGhpcy5f dGV4dFZpZXdlci5yZWFkT25seSA9IHRydWU7CiAgICAgICAgIHRoaXMuX2RlbGVnYXRlLnNldFNj cmlwdFNvdXJjZUlzQmVpbmdFZGl0ZWQoZmFsc2UpOworCisgICAgICAgIGZ1bmN0aW9uIGRpZEVk aXRTY3JpcHRTb3VyY2Uoc3VjY2VzcywgbmV3Qm9keU9yRXJyb3JNZXNzYWdlKQorICAgICAgICB7 CisgICAgICAgICAgICBpZiAodGhpcy5fb3JpZ2luYWxUZXh0TW9kZWxDb250ZW50ICE9PSB1bmRl ZmluZWQgfHwgdGhpcy5fdGV4dE1vZGVsLnRleHQgIT09IG5ld1NvdXJjZSkKKyAgICAgICAgICAg ICAgICByZXR1cm47CisgICAgICAgICAgICBpZiAoc3VjY2VzcykgeworICAgICAgICAgICAgICAg IGlmIChuZXdTb3VyY2UgIT09IG5ld0JvZHlPckVycm9yTWVzc2FnZSkKKyAgICAgICAgICAgICAg ICAgICAgdGhpcy5fdGV4dE1vZGVsLnNldFRleHQobnVsbCwgbmV3Qm9keU9yRXJyb3JNZXNzYWdl KTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgdGhpcy5fb3JpZ2luYWxU ZXh0TW9kZWxDb250ZW50ID0gb3JpZ2luYWxUZXh0TW9kZWxDb250ZW50OworICAgICAgICAgICAg ICAgIHRoaXMuX3RleHRWaWV3ZXIucmVhZE9ubHkgPSBmYWxzZTsKKyAgICAgICAgICAgICAgICB0 aGlzLl9kZWxlZ2F0ZS5zZXRTY3JpcHRTb3VyY2VJc0JlaW5nRWRpdGVkKHRydWUpOworICAgICAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5sb2cobmV3Qm9keU9yRXJyb3JNZXNzYWdlLCBXZWJJbnNw ZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLkVycm9yKTsKKyAgICAgICAgICAgICAg ICBXZWJJbnNwZWN0b3Iuc2hvd0NvbnNvbGUoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQor ICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5lZGl0U2NyaXB0U291cmNlKG5ld1NvdXJjZSwgZGlkRWRp dFNjcmlwdFNvdXJjZS5iaW5kKHRoaXMpKTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfSwK IApAQCAtODgxLDcgKzkwNSw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlLnBy b3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0sCiAKLSAgICBlZGl0U2Ny aXB0U291cmNlOiBmdW5jdGlvbih0ZXh0KQorICAgIGVkaXRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9u KHRleHQsIGNhbGxiYWNrKQogICAgIHsKICAgICAgICAgLy8gU2hvdWxkIGJlIGltcGxlbWVudGVk IGJ5IHN1YmNsYXNzZXMuCiAgICAgfSwK