28280 2009-08-13 14:26:10 -0700 WebInspector: Evaluating objects while on a breakpoint dumps string representation instead of live object. 2009-08-15 01:59:36 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman webkit-unassigned timothy oldest_to_newest 140034 0 pfeldman 2009-08-13 14:26:10 -0700 1. Open Web Inspector 2. Hit Pause on Scripts Panel 3. Do something on page to execute some JS 4. In console type "window" Expected: live expandable DOMWindow object appears in console Actual: [object DOMWindow] appears in the console. 140236 1 34841 pfeldman 2009-08-14 08:19:17 -0700 Created attachment 34841 patch 140239 2 34841 timothy 2009-08-14 08:46:29 -0700 Comment on attachment 34841 patch > + function(result, isException) { > + if (!isException) > + result = JSON.parse(result); > + reportCompletions(result, isException); > + }); Can you break this out into a named function so it is easier to read? It took me a second to realize this was being passed as an argument. 140331 3 34870 pfeldman 2009-08-14 13:39:36 -0700 Created attachment 34870 patch >> Can you break this out into a named function so it is easier to read? It took >> me a second to realize this was being passed as an argument. Done. Thanks for review! 140451 4 pfeldman 2009-08-15 01:59:36 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/front-end/ConsoleView.js M WebCore/inspector/front-end/ScriptsPanel.js Committed r47318 34841 2009-08-14 08:19:17 -0700 2009-08-14 13:39:36 -0700 patch stack_eval text/plain 5015 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NWJkMzRlYi4uNDI3ZDA1YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAwOS0wOC0xNCAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWJJbnNwZWN0b3I6IEV2YWx1YXRpbmcgb2JqZWN0cyB3aGls ZSBvbiBhIGJyZWFrcG9pbnQgZHVtcHMgc3RyaW5nCisgICAgICAgIHJlcHJlc2VudGF0aW9uIGlu c3RlYWQgb2YgbGl2ZSBvYmplY3QuIAorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yODI4MAorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9D b25zb2xlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5 cGUuY29tcGxldGlvbnMudGhpcy5fZXZhbEluSW5zcGVjdGVkV2luZG93KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUuY29tcGxldGlvbnMpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5fcmVwb3J0Q29tcGxldGlvbnMpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuZG9FdmFsSW5DYWxsRnJhbWUuZGVs YXllZEV2YWx1YXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90 b3R5cGUuZG9FdmFsSW5DYWxsRnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQ YW5lbC5wcm90b3R5cGUudmFyaWFibGVzSW5TZWxlY3RlZENhbGxGcmFtZSk6CisKIDIwMDktMDgt MTMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlVmlldy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25z b2xlVmlldy5qcwppbmRleCA1YWY5MzUxLi40NDc3Zjc2IDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCkBAIC0yMTEsMjIgKzIxMSwzNCBAQCBXZWJJbnNwZWN0 b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIWV4cHJlc3Npb25TdHJp bmcgJiYgIXByZWZpeCkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBpZiAoIWV4cHJl c3Npb25TdHJpbmcpCi0gICAgICAgICAgICBleHByZXNzaW9uU3RyaW5nID0gInRoaXMiOwotCiAg ICAgICAgIHZhciByZXBvcnRDb21wbGV0aW9ucyA9IHRoaXMuX3JlcG9ydENvbXBsZXRpb25zLmJp bmQodGhpcywgYmVzdE1hdGNoT25seSwgY29tcGxldGlvbnNSZWFkeUNhbGxiYWNrLCBkb3ROb3Rh dGlvbiwgYnJhY2tldE5vdGF0aW9uLCBwcmVmaXgpOwogICAgICAgICAvLyBDb2xsZWN0IGNvbW1h IHNlcGFyYXRlZCBvYmplY3QgcHJvcGVydGllcyBmb3IgdGhlIGNvbXBsZXRpb24uCisKKyAgICAg ICAgaWYgKCFleHByZXNzaW9uU3RyaW5nKSB7CisgICAgICAgICAgICBpZiAoV2ViSW5zcGVjdG9y LnBhbmVscy5zY3JpcHRzICYmIFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5wYXVzZWQpIHsK KyAgICAgICAgICAgICAgICAvLyBFdmFsdWF0ZSBpbnRvIHByb3BlcnRpZXMgaW4gc2NvcGUgb2Yg dGhlIHNlbGVjdGVkIGNhbGwgZnJhbWUuCisgICAgICAgICAgICAgICAgcmVwb3J0Q29tcGxldGlv bnMoV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzLnZhcmlhYmxlc0luU2VsZWN0ZWRDYWxsRnJh bWUoKSk7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfSBlbHNlIHsKKyAg ICAgICAgICAgICAgICBleHByZXNzaW9uU3RyaW5nID0gInRoaXMiOworICAgICAgICAgICAgfQor ICAgICAgICB9CisKICAgICAgICAgdGhpcy5fZXZhbEluSW5zcGVjdGVkV2luZG93KAogICAgICAg ICAgICAgIihmdW5jdGlvbigpIHsiICsKLSAgICAgICAgICAgICAgICAidmFyIHByb3BzID0gW107 IiArCi0gICAgICAgICAgICAgICAgImZvciAodmFyIHByb3AgaW4gKCIgKyBleHByZXNzaW9uU3Ry aW5nICsgIikpIHByb3BzLnB1c2gocHJvcCk7IiArCisgICAgICAgICAgICAgICAgInZhciBwcm9w cyA9IHt9OyIgKworICAgICAgICAgICAgICAgICJmb3IgKHZhciBwcm9wIGluICgiICsgZXhwcmVz c2lvblN0cmluZyArICIpKSBwcm9wc1twcm9wXSA9IHRydWU7IiArCiAgICAgICAgICAgICAgICAg KCghZG90Tm90YXRpb24gJiYgIWJyYWNrZXROb3RhdGlvbikgPwogICAgICAgICAgICAgICAgICJm b3IgKHZhciBwcm9wIGluIHdpbmRvdy5faW5zcGVjdG9yQ29tbWFuZExpbmVBUEkpIiArCi0gICAg ICAgICAgICAgICAgICAgICJpZiAocHJvcC5jaGFyQXQoMCkgIT09ICdfJykgcHJvcHMucHVzaChw cm9wKTsiCisgICAgICAgICAgICAgICAgICAgICJpZiAocHJvcC5jaGFyQXQoMCkgIT09ICdfJykg cHJvcHNbcHJvcF0gPSB0cnVlOyIKICAgICAgICAgICAgICAgICA6ICIiKSArCi0gICAgICAgICAg ICAgICAgInJldHVybiBwcm9wcy5qb2luKCcsJyk7IiArCisgICAgICAgICAgICAgICAgInJldHVy biBKU09OLnN0cmluZ2lmeShwcm9wcyk7IiArCiAgICAgICAgICAgICAifSkoKSIsCi0gICAgICAg ICAgICByZXBvcnRDb21wbGV0aW9ucyk7CisgICAgICAgICAgICBmdW5jdGlvbihyZXN1bHQsIGlz RXhjZXB0aW9uKSB7CisgICAgICAgICAgICAgICAgaWYgKCFpc0V4Y2VwdGlvbikKKyAgICAgICAg ICAgICAgICAgICAgcmVzdWx0ID0gSlNPTi5wYXJzZShyZXN1bHQpOworICAgICAgICAgICAgICAg IHJlcG9ydENvbXBsZXRpb25zKHJlc3VsdCwgaXNFeGNlcHRpb24pOworICAgICAgICAgICAgfSk7 CiAgICAgfSwKIAogICAgIF9yZXBvcnRDb21wbGV0aW9uczogZnVuY3Rpb24oYmVzdE1hdGNoT25s eSwgY29tcGxldGlvbnNSZWFkeUNhbGxiYWNrLCBkb3ROb3RhdGlvbiwgYnJhY2tldE5vdGF0aW9u LCBwcmVmaXgsIHJlc3VsdCwgaXNFeGNlcHRpb24pIHsKQEAgLTI0MSw4ICsyNTMsNyBAQCBXZWJJ bnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICB9CiAKICAgICAgICAg dmFyIHJlc3VsdHMgPSBbXTsKLSAgICAgICAgdmFyIHByb3BlcnRpZXMgPSByZXN1bHQuc3BsaXQo IiwiKTsKLSAgICAgICAgcHJvcGVydGllcy5zb3J0KCk7CisgICAgICAgIHZhciBwcm9wZXJ0aWVz ID0gT2JqZWN0LnNvcnRlZFByb3BlcnRpZXMocmVzdWx0KTsKIAogICAgICAgICBmb3IgKHZhciBp ID0gMDsgaSA8IHByb3BlcnRpZXMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciBwcm9w ZXJ0eSA9IHByb3BlcnRpZXNbaV07CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Njcmlw dHNQYW5lbC5qcwppbmRleCA2OWIyMWYxLi40YzIwODNmIDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAgLTM3NCwxMyArMzc0LDggQEAgV2ViSW5zcGVj dG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBwYW5lbCA9IHRoaXM7 CiAgICAgICAgIGZ1bmN0aW9uIGRlbGF5ZWRFdmFsdWF0aW9uKCkKICAgICAgICAgewotICAgICAg ICAgICAgaWYgKCFjb2RlKSB7Ci0gICAgICAgICAgICAgICAgLy8gRXZhbHVhdGUgaW50byBwcm9w ZXJ0aWVzIGluIHNjb3BlIG9mIHRoZSBzZWxlY3RlZCBjYWxsIGZyYW1lLgotICAgICAgICAgICAg ICAgIGNhbGxiYWNrKHBhbmVsLl92YXJpYWJsZXNJblNjb3BlKGNhbGxGcmFtZSkpOwotICAgICAg ICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIH0KICAgICAgICAgICAgIHRyeSB7Ci0gICAg ICAgICAgICAgICAgY2FsbGJhY2soY2FsbEZyYW1lLmV2YWx1YXRlKGNvZGUpKTsKKyAgICAgICAg ICAgICAgICBjYWxsYmFjayhJbnNwZWN0b3JDb250cm9sbGVyLndyYXBPYmplY3QoY2FsbEZyYW1l LmV2YWx1YXRlKGNvZGUpKSk7CiAgICAgICAgICAgICB9IGNhdGNoIChlKSB7CiAgICAgICAgICAg ICAgICAgY2FsbGJhY2soZSwgdHJ1ZSk7CiAgICAgICAgICAgICB9CkBAIC0zODgsMTAgKzM4Mywx NCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgc2V0 VGltZW91dChkZWxheWVkRXZhbHVhdGlvbiwgMCk7CiAgICAgfSwKIAotICAgIF92YXJpYWJsZXNJ blNjb3BlOiBmdW5jdGlvbihjYWxsRnJhbWUpCisgICAgdmFyaWFibGVzSW5TZWxlY3RlZENhbGxG cmFtZTogZnVuY3Rpb24oKQogICAgIHsKKyAgICAgICAgdmFyIHNlbGVjdGVkQ2FsbEZyYW1lID0g dGhpcy5zaWRlYmFyUGFuZXMuY2FsbHN0YWNrLnNlbGVjdGVkQ2FsbEZyYW1lOworICAgICAgICBp ZiAoIXRoaXMuX3BhdXNlZCB8fCAhc2VsZWN0ZWRDYWxsRnJhbWUpCisgICAgICAgICAgICByZXR1 cm47CisKICAgICAgICAgdmFyIHJlc3VsdCA9IHt9OwotICAgICAgICB2YXIgc2NvcGVDaGFpbiA9 IGNhbGxGcmFtZS5zY29wZUNoYWluOworICAgICAgICB2YXIgc2NvcGVDaGFpbiA9IHNlbGVjdGVk Q2FsbEZyYW1lLnNjb3BlQ2hhaW47CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc2NvcGVD aGFpbi5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAgdmFyIHNjb3BlT2JqZWN0ID0gc2NvcGVD aGFpbltpXTsKICAgICAgICAgICAgIGZvciAodmFyIHByb3BlcnR5IGluIHNjb3BlT2JqZWN0KQo= 34870 2009-08-14 13:39:36 -0700 2009-08-14 13:43:30 -0700 patch stack_eval text/plain 5051 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NWJkMzRlYi4uNDI3ZDA1YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAwOS0wOC0xNCAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWJJbnNwZWN0b3I6IEV2YWx1YXRpbmcgb2JqZWN0cyB3aGls ZSBvbiBhIGJyZWFrcG9pbnQgZHVtcHMgc3RyaW5nCisgICAgICAgIHJlcHJlc2VudGF0aW9uIGlu c3RlYWQgb2YgbGl2ZSBvYmplY3QuIAorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yODI4MAorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9D b25zb2xlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5 cGUuY29tcGxldGlvbnMudGhpcy5fZXZhbEluSW5zcGVjdGVkV2luZG93KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUuY29tcGxldGlvbnMpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5fcmVwb3J0Q29tcGxldGlvbnMpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuZG9FdmFsSW5DYWxsRnJhbWUuZGVs YXllZEV2YWx1YXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90 b3R5cGUuZG9FdmFsSW5DYWxsRnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQ YW5lbC5wcm90b3R5cGUudmFyaWFibGVzSW5TZWxlY3RlZENhbGxGcmFtZSk6CisKIDIwMDktMDgt MTMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlVmlldy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25z b2xlVmlldy5qcwppbmRleCA1YWY5MzUxLi5kNDY5M2I3IDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCkBAIC0yMTEsMjIgKzIxMSwzNyBAQCBXZWJJbnNwZWN0 b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIWV4cHJlc3Npb25TdHJp bmcgJiYgIXByZWZpeCkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBpZiAoIWV4cHJl c3Npb25TdHJpbmcpCi0gICAgICAgICAgICBleHByZXNzaW9uU3RyaW5nID0gInRoaXMiOwotCiAg ICAgICAgIHZhciByZXBvcnRDb21wbGV0aW9ucyA9IHRoaXMuX3JlcG9ydENvbXBsZXRpb25zLmJp bmQodGhpcywgYmVzdE1hdGNoT25seSwgY29tcGxldGlvbnNSZWFkeUNhbGxiYWNrLCBkb3ROb3Rh dGlvbiwgYnJhY2tldE5vdGF0aW9uLCBwcmVmaXgpOwogICAgICAgICAvLyBDb2xsZWN0IGNvbW1h IHNlcGFyYXRlZCBvYmplY3QgcHJvcGVydGllcyBmb3IgdGhlIGNvbXBsZXRpb24uCisKKyAgICAg ICAgaWYgKCFleHByZXNzaW9uU3RyaW5nKSB7CisgICAgICAgICAgICBpZiAoV2ViSW5zcGVjdG9y LnBhbmVscy5zY3JpcHRzICYmIFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5wYXVzZWQpIHsK KyAgICAgICAgICAgICAgICAvLyBFdmFsdWF0ZSBpbnRvIHByb3BlcnRpZXMgaW4gc2NvcGUgb2Yg dGhlIHNlbGVjdGVkIGNhbGwgZnJhbWUuCisgICAgICAgICAgICAgICAgcmVwb3J0Q29tcGxldGlv bnMoV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzLnZhcmlhYmxlc0luU2VsZWN0ZWRDYWxsRnJh bWUoKSk7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfSBlbHNlIHsKKyAg ICAgICAgICAgICAgICBleHByZXNzaW9uU3RyaW5nID0gInRoaXMiOworICAgICAgICAgICAgfQor ICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gcGFyc2luZ0NhbGxiYWNrKHJlc3VsdCwgaXNF eGNlcHRpb24pCisgICAgICAgIHsKKyAgICAgICAgICAgIGlmICghaXNFeGNlcHRpb24pCisgICAg ICAgICAgICAgICAgcmVzdWx0ID0gSlNPTi5wYXJzZShyZXN1bHQpOworICAgICAgICAgICAgcmVw b3J0Q29tcGxldGlvbnMocmVzdWx0LCBpc0V4Y2VwdGlvbik7CisgICAgICAgIH0KKwogICAgICAg ICB0aGlzLl9ldmFsSW5JbnNwZWN0ZWRXaW5kb3coCiAgICAgICAgICAgICAiKGZ1bmN0aW9uKCkg eyIgKwotICAgICAgICAgICAgICAgICJ2YXIgcHJvcHMgPSBbXTsiICsKLSAgICAgICAgICAgICAg ICAiZm9yICh2YXIgcHJvcCBpbiAoIiArIGV4cHJlc3Npb25TdHJpbmcgKyAiKSkgcHJvcHMucHVz aChwcm9wKTsiICsKKyAgICAgICAgICAgICAgICAidmFyIHByb3BzID0ge307IiArCisgICAgICAg ICAgICAgICAgImZvciAodmFyIHByb3AgaW4gKCIgKyBleHByZXNzaW9uU3RyaW5nICsgIikpIHBy b3BzW3Byb3BdID0gdHJ1ZTsiICsKICAgICAgICAgICAgICAgICAoKCFkb3ROb3RhdGlvbiAmJiAh YnJhY2tldE5vdGF0aW9uKSA/CiAgICAgICAgICAgICAgICAgImZvciAodmFyIHByb3AgaW4gd2lu ZG93Ll9pbnNwZWN0b3JDb21tYW5kTGluZUFQSSkiICsKLSAgICAgICAgICAgICAgICAgICAgImlm IChwcm9wLmNoYXJBdCgwKSAhPT0gJ18nKSBwcm9wcy5wdXNoKHByb3ApOyIKKyAgICAgICAgICAg ICAgICAgICAgImlmIChwcm9wLmNoYXJBdCgwKSAhPT0gJ18nKSBwcm9wc1twcm9wXSA9IHRydWU7 IgogICAgICAgICAgICAgICAgIDogIiIpICsKLSAgICAgICAgICAgICAgICAicmV0dXJuIHByb3Bz LmpvaW4oJywnKTsiICsKKyAgICAgICAgICAgICAgICAicmV0dXJuIEpTT04uc3RyaW5naWZ5KHBy b3BzKTsiICsKICAgICAgICAgICAgICJ9KSgpIiwKLSAgICAgICAgICAgIHJlcG9ydENvbXBsZXRp b25zKTsKKyAgICAgICAgICAgIHBhcnNpbmdDYWxsYmFjayk7CiAgICAgfSwKIAogICAgIF9yZXBv cnRDb21wbGV0aW9uczogZnVuY3Rpb24oYmVzdE1hdGNoT25seSwgY29tcGxldGlvbnNSZWFkeUNh bGxiYWNrLCBkb3ROb3RhdGlvbiwgYnJhY2tldE5vdGF0aW9uLCBwcmVmaXgsIHJlc3VsdCwgaXNF eGNlcHRpb24pIHsKQEAgLTI0MSw4ICsyNTYsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcu cHJvdG90eXBlID0gewogICAgICAgICB9CiAKICAgICAgICAgdmFyIHJlc3VsdHMgPSBbXTsKLSAg ICAgICAgdmFyIHByb3BlcnRpZXMgPSByZXN1bHQuc3BsaXQoIiwiKTsKLSAgICAgICAgcHJvcGVy dGllcy5zb3J0KCk7CisgICAgICAgIHZhciBwcm9wZXJ0aWVzID0gT2JqZWN0LnNvcnRlZFByb3Bl cnRpZXMocmVzdWx0KTsKIAogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHByb3BlcnRpZXMu bGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciBwcm9wZXJ0eSA9IHByb3BlcnRpZXNbaV07 CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpz IGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCA2OWIy MWYxLi40YzIwODNmIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0c1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFu ZWwuanMKQEAgLTM3NCwxMyArMzc0LDggQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHZhciBwYW5lbCA9IHRoaXM7CiAgICAgICAgIGZ1bmN0aW9uIGRl bGF5ZWRFdmFsdWF0aW9uKCkKICAgICAgICAgewotICAgICAgICAgICAgaWYgKCFjb2RlKSB7Ci0g ICAgICAgICAgICAgICAgLy8gRXZhbHVhdGUgaW50byBwcm9wZXJ0aWVzIGluIHNjb3BlIG9mIHRo ZSBzZWxlY3RlZCBjYWxsIGZyYW1lLgotICAgICAgICAgICAgICAgIGNhbGxiYWNrKHBhbmVsLl92 YXJpYWJsZXNJblNjb3BlKGNhbGxGcmFtZSkpOwotICAgICAgICAgICAgICAgIHJldHVybjsKLSAg ICAgICAgICAgIH0KICAgICAgICAgICAgIHRyeSB7Ci0gICAgICAgICAgICAgICAgY2FsbGJhY2so Y2FsbEZyYW1lLmV2YWx1YXRlKGNvZGUpKTsKKyAgICAgICAgICAgICAgICBjYWxsYmFjayhJbnNw ZWN0b3JDb250cm9sbGVyLndyYXBPYmplY3QoY2FsbEZyYW1lLmV2YWx1YXRlKGNvZGUpKSk7CiAg ICAgICAgICAgICB9IGNhdGNoIChlKSB7CiAgICAgICAgICAgICAgICAgY2FsbGJhY2soZSwgdHJ1 ZSk7CiAgICAgICAgICAgICB9CkBAIC0zODgsMTAgKzM4MywxNCBAQCBXZWJJbnNwZWN0b3IuU2Ny aXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgc2V0VGltZW91dChkZWxheWVkRXZhbHVh dGlvbiwgMCk7CiAgICAgfSwKIAotICAgIF92YXJpYWJsZXNJblNjb3BlOiBmdW5jdGlvbihjYWxs RnJhbWUpCisgICAgdmFyaWFibGVzSW5TZWxlY3RlZENhbGxGcmFtZTogZnVuY3Rpb24oKQogICAg IHsKKyAgICAgICAgdmFyIHNlbGVjdGVkQ2FsbEZyYW1lID0gdGhpcy5zaWRlYmFyUGFuZXMuY2Fs bHN0YWNrLnNlbGVjdGVkQ2FsbEZyYW1lOworICAgICAgICBpZiAoIXRoaXMuX3BhdXNlZCB8fCAh c2VsZWN0ZWRDYWxsRnJhbWUpCisgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgdmFyIHJl c3VsdCA9IHt9OwotICAgICAgICB2YXIgc2NvcGVDaGFpbiA9IGNhbGxGcmFtZS5zY29wZUNoYWlu OworICAgICAgICB2YXIgc2NvcGVDaGFpbiA9IHNlbGVjdGVkQ2FsbEZyYW1lLnNjb3BlQ2hhaW47 CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc2NvcGVDaGFpbi5sZW5ndGg7ICsraSkgewog ICAgICAgICAgICAgdmFyIHNjb3BlT2JqZWN0ID0gc2NvcGVDaGFpbltpXTsKICAgICAgICAgICAg IGZvciAodmFyIHByb3BlcnR5IGluIHNjb3BlT2JqZWN0KQo=