30485 2009-10-17 14:26:05 -0700 Web Inspector: Properties on Arrays and NodeLists are not logged correctly 2009-10-18 19:11:31 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 timothy webkit-unassigned aroben joepeck pfeldman rik timothy oldest_to_newest 155423 0 timothy 2009-10-17 14:26:05 -0700 If you log an Array that has a non-numeric property on it we will output the array with the non-numeric property at the end. But we wont show the property key. And NodeLists have an enumerible "length" property, so we show the length. We should just skip non-numeric properties and require you to use dir(array) to see everything. Run this in the console: a = ["test", "test2"]; a.foo = "bar"; a 155507 1 41382 keishi 2009-10-18 10:22:23 -0700 Created attachment 41382 proposed patch Adds InjectedScript.getArrayElements to enumerate just the array elements. 155508 2 41382 timothy 2009-10-18 10:27:54 -0700 Comment on attachment 41382 proposed patch > + var i; > + for (i = 0; i < object.length; i++) { This should be one line as: for (var i = 0; i < object.length; ++i) { > + } > + return elements; Please put a new line between these two lines. I would like Pavel to review this to make sure everything is covered. 155536 3 pfeldman 2009-10-18 17:10:38 -0700 I've actually started working on this one, but chose different approach: I was filtering indexes on the frontend side by their type (don't think we need a dedicated method for that in the injectedscript). I did not upload the patch since I wanted to do a test for it first. Now that tests are there I can put it in. Sorry about the confusion. I should have assigned the bug to myself. Keishi, do you think my version makes sense? 155537 4 41389 pfeldman 2009-10-18 17:11:51 -0700 Created attachment 41389 patch with no changes to InjectedScript (and a test!) 155541 5 timothy 2009-10-18 18:27:55 -0700 (In reply to comment #3) > I've actually started working on this one, but chose different approach: I was > filtering indexes on the frontend side by their type (don't think we need a > dedicated method for that in the injectedscript). > > I did not upload the patch since I wanted to do a test for it first. Now that > tests are there I can put it in. Sorry about the confusion. I should have > assigned the bug to myself. Keishi, do you think my version makes sense? This makes sense to me. You also handle sparse arrays better. 155543 6 41389 timothy 2009-10-18 18:37:22 -0700 Comment on attachment 41389 patch with no changes to InjectedScript (and a test!) > +console-format.html:15["test", "test2", undefined, undefined, "test4"] It would be nice to have a space or ": " seperator here. Like the CONSOLE MESSAGE version. > -function dumpMessages() > +window.dumpMessages = function(testController) These are equivlant. If it is a global function, I prefer the old version. > + for (var i = 0; i &lt; messages.length; ++i) Why &lt; here? I think < would work fine. > + result.push(messages[i].toMessageElement().textContent); Does this need .replace(/\u200b/g, "")? 155546 7 pfeldman 2009-10-18 19:05:40 -0700 (In reply to comment #6) > (From update of attachment 41389 [details]) > > > +console-format.html:15["test", "test2", undefined, undefined, "test4"] > > It would be nice to have a space or ": " seperator here. Like the CONSOLE > MESSAGE version. > I'll need to add some universal dump code for console messages in another change. > > > -function dumpMessages() > > +window.dumpMessages = function(testController) > > These are equivlant. If it is a global function, I prefer the old version. Done. > > > > + for (var i = 0; i &lt; messages.length; ++i) > > Why &lt; here? I think < would work fine. > Done. > > > + result.push(messages[i].toMessageElement().textContent); > > Does this need .replace(/\u200b/g, "")? No, since it does render any expandable nodes. 155547 8 pfeldman 2009-10-18 19:09:49 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog M LayoutTests/inspector/console-dir.html M LayoutTests/inspector/console-dirxml.html M LayoutTests/inspector/console-format-expected.txt M LayoutTests/inspector/console-format.html M LayoutTests/inspector/console-tests.html M WebCore/ChangeLog M WebCore/inspector/InspectorDOMAgent.cpp (to trigger WebCore build) M WebCore/inspector/front-end/ConsoleView.js Committed r49762 41382 2009-10-18 10:22:23 -0700 2009-10-18 19:11:31 -0700 proposed patch fix-array.diff text/plain 4133 keishi ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZWQzZWMzNi4uNzk4YWI1YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAwOS0xMC0xOCAgS2Vpc2hpIEhhdHRv cmkgIDxjYXNleS5oYXR0b3JpQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBGaXggZm9yIHByb3BlcnRpZXMgb24gQXJyYXlzIGFuZCBO b2RlTGlzdHMgbm90IGxvZ2dlZCBjb3JyZWN0bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTMwNDg1CisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL0NvbnNvbGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnBy b3RvdHlwZS5fZm9ybWF0YXJyYXkucHJpbnRSZXN1bHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkNvbnNvbGVWaWV3LnByb3RvdHlwZS5fZm9ybWF0YXJyYXkpOiBVc2VzIEluamVjdGVkU2NyaXB0 LmdldEFycmF5RWxlbWVudHMgaW5zdGVhZCBvZiBnZXRQcm9wZXJ0aWVzLgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0ZWRTY3JpcHQuanM6CisgICAgICAgIChJbmplY3RlZFNj cmlwdC5nZXRBcnJheUVsZW1lbnRzKTogQWRkZWQuCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9JbmplY3RlZFNjcmlwdEFjY2Vzcy5qczogQWRkZWQgaW5zdGFsbEhhbmRsZXIgZm9yIGdl dEFycmF5RWxlbWVudHMuCisKIDIwMDktMDktMTMgIEtldmluIFdhdHRlcnMgIDxrZXZpbndhdHRl cnNAZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtldmluIE9sbGl2aWVyLgpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzIGIvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCmluZGV4IDgwNjhhZDQuLjI0 MTRjMDAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmll dy5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKQEAg LTUwNSwyMCArNTA1LDE5IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7 CiAgICAgX2Zvcm1hdGFycmF5OiBmdW5jdGlvbihhcnIsIGVsZW0pCiAgICAgewogICAgICAgICB2 YXIgc2VsZiA9IHRoaXM7Ci0gICAgICAgIGZ1bmN0aW9uIHByaW50UmVzdWx0KHByb3BlcnRpZXMp CisgICAgICAgIGZ1bmN0aW9uIHByaW50UmVzdWx0KGVsZW1lbnRzKQogICAgICAgICB7Ci0gICAg ICAgICAgICBpZiAoIXByb3BlcnRpZXMpCisgICAgICAgICAgICBpZiAoIWVsZW1lbnRzKQogICAg ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIGVsZW0uYXBwZW5kQ2hpbGQoZG9jdW1l bnQuY3JlYXRlVGV4dE5vZGUoIlsiKSk7Ci0gICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8 IHByb3BlcnRpZXMubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgICAgICB2YXIgcHJvcGVydHkg PSBwcm9wZXJ0aWVzW2ldLnZhbHVlOwotICAgICAgICAgICAgICAgIGVsZW0uYXBwZW5kQ2hpbGQo c2VsZi5fZm9ybWF0KHByb3BlcnR5KSk7Ci0gICAgICAgICAgICAgICAgaWYgKGkgPCBwcm9wZXJ0 aWVzLmxlbmd0aCAtIDEpCisgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGVsZW1lbnRz Lmxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICAgICAgZWxlbS5hcHBlbmRDaGlsZChzZWxmLl9m b3JtYXQoZWxlbWVudHNbaV0pKTsKKyAgICAgICAgICAgICAgICBpZiAoaSA8IGVsZW1lbnRzLmxl bmd0aCAtIDEpCiAgICAgICAgICAgICAgICAgICAgIGVsZW0uYXBwZW5kQ2hpbGQoZG9jdW1lbnQu Y3JlYXRlVGV4dE5vZGUoIiwgIikpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgZWxlbS5h cHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiXSIpKTsKICAgICAgICAgfQotICAg ICAgICBJbmplY3RlZFNjcmlwdEFjY2Vzcy5nZXRQcm9wZXJ0aWVzKGFyciwgZmFsc2UsIHByaW50 UmVzdWx0KTsKKyAgICAgICAgSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuZ2V0QXJyYXlFbGVtZW50cyhh cnIsIGZhbHNlLCBwcmludFJlc3VsdCk7CiAgICAgfSwKIAogICAgIF9mb3JtYXRub2RlOiBmdW5j dGlvbihvYmplY3QsIGVsZW0pCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSW5qZWN0ZWRTY3JpcHQuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0 ZWRTY3JpcHQuanMKaW5kZXggNWQzYzA0Mi4uN2E1MzI3YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2NyaXB0LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdC5qcwpAQCAtNDM4LDYgKzQzOCwyNiBAQCBJbmpl Y3RlZFNjcmlwdC5nZXRQcm90b3R5cGVzID0gZnVuY3Rpb24obm9kZUlkKQogICAgIHJldHVybiBy ZXN1bHQ7CiB9CiAKK0luamVjdGVkU2NyaXB0LmdldEFycmF5RWxlbWVudHMgPSBmdW5jdGlvbihv YmplY3RQcm94eSkKK3sKKyAgICB2YXIgb2JqZWN0ID0gSW5qZWN0ZWRTY3JpcHQuX3Jlc29sdmVP YmplY3Qob2JqZWN0UHJveHkpOworICAgIGlmICghb2JqZWN0KQorICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgCisgICAgdmFyIGVsZW1lbnRzID0gW107CisgICAgCisgICAgdmFyIGk7CisgICAg Zm9yIChpID0gMDsgaSA8IG9iamVjdC5sZW5ndGg7IGkrKykgeworICAgICAgICB2YXIgY2hpbGRP YmplY3QgPSBvYmplY3RbaV07CisgICAgICAgIHZhciBjaGlsZE9iamVjdFByb3h5ID0gbmV3IElu amVjdGVkU2NyaXB0LmNyZWF0ZVByb3h5T2JqZWN0KGNoaWxkT2JqZWN0LCBvYmplY3RQcm94eS5v YmplY3RJZCwgdHJ1ZSk7CisgICAgICAgIGNoaWxkT2JqZWN0UHJveHkucGF0aCA9IG9iamVjdFBy b3h5LnBhdGggPyBvYmplY3RQcm94eS5wYXRoLnNsaWNlKCkgOiBbXTsKKyAgICAgICAgY2hpbGRP YmplY3RQcm94eS5wYXRoLnB1c2goaSk7CisgICAgICAgIGNoaWxkT2JqZWN0UHJveHkucHJvdG9E ZXB0aCA9IG9iamVjdFByb3h5LnByb3RvRGVwdGggfHwgMDsKKyAgICAgICAgZWxlbWVudHMucHVz aChjaGlsZE9iamVjdFByb3h5KTsKKyAgICB9CisgICAgcmV0dXJuIGVsZW1lbnRzOworfQorCiBJ bmplY3RlZFNjcmlwdC5nZXRQcm9wZXJ0aWVzID0gZnVuY3Rpb24ob2JqZWN0UHJveHksIGlnbm9y ZUhhc093blByb3BlcnR5KQogewogICAgIHZhciBvYmplY3QgPSBJbmplY3RlZFNjcmlwdC5fcmVz b2x2ZU9iamVjdChvYmplY3RQcm94eSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuanMKaW5kZXggYzZkNGI2NS4uOGY5NGIyZCAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2NyaXB0QWNjZXNz LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdEFjY2Vz cy5qcwpAQCAtNjEsNiArNjEsNyBAQCBJbmplY3RlZFNjcmlwdEFjY2Vzcy5faW5zdGFsbEhhbmRs ZXIoImFwcGx5U3R5bGVSdWxlVGV4dCIpOwogSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuX2luc3RhbGxI YW5kbGVyKCJhcHBseVN0eWxlVGV4dCIpOwogSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuX2luc3RhbGxI YW5kbGVyKCJldmFsdWF0ZSIpOwogSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuX2luc3RhbGxIYW5kbGVy KCJldmFsdWF0ZUluQ2FsbEZyYW1lIik7CitJbmplY3RlZFNjcmlwdEFjY2Vzcy5faW5zdGFsbEhh bmRsZXIoImdldEFycmF5RWxlbWVudHMiKTsKIEluamVjdGVkU2NyaXB0QWNjZXNzLl9pbnN0YWxs SGFuZGxlcigiZ2V0Q29tcGxldGlvbnMiKTsKIEluamVjdGVkU2NyaXB0QWNjZXNzLl9pbnN0YWxs SGFuZGxlcigiZ2V0Q29tcHV0ZWRTdHlsZSIpOwogSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuX2luc3Rh bGxIYW5kbGVyKCJnZXRJbmxpbmVTdHlsZSIpOwo= 41389 2009-10-18 17:11:51 -0700 2009-10-18 18:37:22 -0700 patch with no changes to InjectedScript (and a test!) array_index text/plain 5753 pfeldman ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkZTk3NzU3Li40NDc3YWI4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMTggQEAKIAogICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBQ cm9wZXJ0aWVzIG9uIEFycmF5cyBhbmQgTm9kZUxpc3RzIGFyZQorICAgICAgICBub3QgbG9nZ2Vk IGNvcnJlY3RseS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MzA0ODUKKworICAgICAgICAqIGluc3BlY3Rvci9jb25zb2xlLWZvcm1hdC1leHBlY3Rl ZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL2NvbnNvbGUtZm9ybWF0Lmh0bWw6CisKKzIwMDkt MTAtMTggIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAgV2ViIEluc3BlY3RvcjogbWFr ZSBjb25zb2xlIHRlc3RzIG1vcmUgZ3JhbnVsYXIuCiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwNDk2CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvY29uc29sZS1mb3JtYXQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2NvbnNvbGUtZm9ybWF0LWV4cGVjdGVkLnR4dAppbmRleCBiNWRhNTQwLi4wNjM2MWRiIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS1mb3JtYXQtZXhwZWN0ZWQu dHh0CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlLWZvcm1hdC1leHBlY3RlZC50 eHQKQEAgLTEsOSArMSwxMSBAQAogQ09OU09MRSBNRVNTQUdFOiBsaW5lIDg6IE1lc3NhZ2UgZm9y bWF0IG51bWJlciAlaSwgJWQgYW5kICVmCiBDT05TT0xFIE1FU1NBR0U6IGxpbmUgOTogTWVzc2Fn ZSAlcyBmb3IgJXMKIENPTlNPTEUgTUVTU0FHRTogbGluZSAxMDogT2JqZWN0ICVvCitDT05TT0xF IE1FU1NBR0U6IGxpbmUgMTU6IHRlc3QsdGVzdDIsLCx0ZXN0NAogVGVzdHMgdGhhdCBjb25zb2xl IGxvZ2dpbmcgZHVtcHMgcHJvcGVyIG1lc3NhZ2VzLgogCiBjb25zb2xlLWZvcm1hdC5odG1sOjhN ZXNzYWdlIGZvcm1hdCBudW1iZXIgMSwgMiBhbmQgMy41CiBjb25zb2xlLWZvcm1hdC5odG1sOjlN ZXNzYWdlIGZvcm1hdCBmb3Igc3RyaW5nCiBjb25zb2xlLWZvcm1hdC5odG1sOjEwT2JqZWN0IE9i amVjdAorY29uc29sZS1mb3JtYXQuaHRtbDoxNVsidGVzdCIsICJ0ZXN0MiIsIHVuZGVmaW5lZCwg dW5kZWZpbmVkLCAidGVzdDQiXQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv Y29uc29sZS1mb3JtYXQuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlLWZvcm1h dC5odG1sCmluZGV4IGI4M2NmNmEuLjhlNjg1MGQgMTAwNzU1Ci0tLSBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci9jb25zb2xlLWZvcm1hdC5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9j b25zb2xlLWZvcm1hdC5odG1sCkBAIC05LDEzICs5LDE4IEBAIGZ1bmN0aW9uIGRvaXQoKQogICAg IGNvbnNvbGUubG9nKCdNZXNzYWdlICVzIGZvciAlcycsICdmb3JtYXQnLCAnc3RyaW5nJyk7CiAg ICAgY29uc29sZS5sb2coJ09iamVjdCAlbycsIHsnZm9vJyA6ICdiYXInIH0pOwogCisgICAgdmFy IGFycmF5ID0gWyJ0ZXN0IiwgInRlc3QyIl07CisgICAgYXJyYXkuZm9vID0gImJhciI7CisgICAg YXJyYXlbNF0gPSAidGVzdDQiOworICAgIGNvbnNvbGUubG9nKGFycmF5KTsKKwogICAgIGZ1bmN0 aW9uIGNhbGxiYWNrKHJlc3VsdCkKICAgICB7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwg cmVzdWx0Lmxlbmd0aDsgKytpKQogICAgICAgICAgICAgb3V0cHV0KHJlc3VsdFtpXSk7CiAgICAg ICAgIG5vdGlmeURvbmUoKTsKICAgICB9Ci0gICAgZXZhbHVhdGVJbldlYkluc3BlY3RvcigiZHVt cE1lc3NhZ2VzKCkiLCBjYWxsYmFjayk7CisgICAgZXZhbHVhdGVJbldlYkluc3BlY3RvcigiZHVt cE1lc3NhZ2VzIiwgY2FsbGJhY2spOwogfQogCiA8L3NjcmlwdD4KQEAgLTI3LDEzICszMiwxOCBA QCBUZXN0cyB0aGF0IGNvbnNvbGUgbG9nZ2luZyBkdW1wcyBwcm9wZXIgbWVzc2FnZXMuCiA8L3A+ CiAKIDxkaXYgaWQ9ImZyb250ZW5kLXNjcmlwdCIgc3R5bGU9ImRpc3BsYXk6bm9uZSI+Ci1mdW5j dGlvbiBkdW1wTWVzc2FnZXMoKQord2luZG93LmR1bXBNZXNzYWdlcyA9IGZ1bmN0aW9uKHRlc3RD b250cm9sbGVyKQogewotICAgIHZhciByZXN1bHQgPSBbXTsKLSAgICB2YXIgbWVzc2FnZXMgPSBX ZWJJbnNwZWN0b3IuY29uc29sZS5tZXNzYWdlczsKLSAgICBmb3IgKHZhciBpID0gMDsgaSAmbHQ7 IG1lc3NhZ2VzLmxlbmd0aDsgKytpKQotICAgICAgICByZXN1bHQucHVzaChtZXNzYWdlc1tpXS50 b01lc3NhZ2VFbGVtZW50KCkudGV4dENvbnRlbnQucmVwbGFjZSgvXHUyMDBiL2csICIiKSk7Ci0g ICAgcmV0dXJuIHJlc3VsdDsKKyAgICAvLyBBcnJheSBmb3JtYXR0aW5nIGlzIGRlZmVycmVkIGR1 ZSB0byB0aGUgYXN5bmMgSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuZ2V0UHJvcGVydGllcyBjYWxsLgor ICAgIC8vIFF1ZXVlIG1lc3NhZ2UgbG9nIGR1bXAgaW4gb3JkZXIgdG8gc2VlIHByb3BlciByZXN1 bHQuCisgICAgdGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgpOworICAgIHNldFRpbWVvdXQo ZnVuY3Rpb24oKSB7CisgICAgICAgIHZhciByZXN1bHQgPSBbXTsKKyAgICAgICAgdmFyIG1lc3Nh Z2VzID0gV2ViSW5zcGVjdG9yLmNvbnNvbGUubWVzc2FnZXM7CisgICAgICAgIGZvciAodmFyIGkg PSAwOyBpICZsdDsgbWVzc2FnZXMubGVuZ3RoOyArK2kpCisgICAgICAgICAgICByZXN1bHQucHVz aChtZXNzYWdlc1tpXS50b01lc3NhZ2VFbGVtZW50KCkudGV4dENvbnRlbnQpOworICAgICAgICB0 ZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKHJlc3VsdCk7CisgICAgfSwgMCk7CiB9CiA8L2Rpdj4K IApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRl eCA5ODg4YjUyLi4zODk1MWMwIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDA5LTEwLTE4ICBQYXZlbCBGZWxk bWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFByb3BlcnRpZXMgb24gQXJyYXlz IGFuZCBOb2RlTGlzdHMgYXJlIG5vdCBsb2dnZWQgY29ycmVjdGx5LgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDQ4NQorCisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5D b25zb2xlVmlldy5wcm90b3R5cGUuX2Zvcm1hdGFycmF5KToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Db25zb2xlVmlldy5wcm90b3R5cGUuX3ByaW50QXJyYXkpOgorCisyMDA5LTEwLTE4ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5 IFRpbW90aHkgSGF0Y2hlci4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBUaXRsZSBvZiBkaXIo WyJ0ZXN0IiwgInRlc3QyIl0pIHNob3VsZCBiZSBBcnJheQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0NvbnNvbGVWaWV3LmpzCmluZGV4IDgwNjhhZDQuLjc4MGU4YTkgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcworKysgYi9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKQEAgLTUwNCwyMSArNTA0LDMxIEBA IFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAKICAgICBfZm9ybWF0YXJy YXk6IGZ1bmN0aW9uKGFyciwgZWxlbSkKICAgICB7Ci0gICAgICAgIHZhciBzZWxmID0gdGhpczsK LSAgICAgICAgZnVuY3Rpb24gcHJpbnRSZXN1bHQocHJvcGVydGllcykKLSAgICAgICAgewotICAg ICAgICAgICAgaWYgKCFwcm9wZXJ0aWVzKQotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAg ICAgICAgIGVsZW0uYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoIlsiKSk7Ci0g ICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHByb3BlcnRpZXMubGVuZ3RoOyArK2kpIHsK LSAgICAgICAgICAgICAgICB2YXIgcHJvcGVydHkgPSBwcm9wZXJ0aWVzW2ldLnZhbHVlOwotICAg ICAgICAgICAgICAgIGVsZW0uYXBwZW5kQ2hpbGQoc2VsZi5fZm9ybWF0KHByb3BlcnR5KSk7Ci0g ICAgICAgICAgICAgICAgaWYgKGkgPCBwcm9wZXJ0aWVzLmxlbmd0aCAtIDEpCi0gICAgICAgICAg ICAgICAgICAgIGVsZW0uYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoIiwgIikp OwotICAgICAgICAgICAgfQotICAgICAgICAgICAgZWxlbS5hcHBlbmRDaGlsZChkb2N1bWVudC5j cmVhdGVUZXh0Tm9kZSgiXSIpKTsKKyAgICAgICAgSW5qZWN0ZWRTY3JpcHRBY2Nlc3MuZ2V0UHJv cGVydGllcyhhcnIsIGZhbHNlLCB0aGlzLl9wcmludEFycmF5LmJpbmQodGhpcywgZWxlbSkpOwor ICAgIH0sCisKKyAgICBfcHJpbnRBcnJheTogZnVuY3Rpb24oZWxlbSwgcHJvcGVydGllcykKKyAg ICB7CisgICAgICAgIGlmICghcHJvcGVydGllcykKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgdmFyIGVsZW1lbnRzID0gW107CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcHJvcGVy dGllcy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgdmFyIG5hbWUgPSBwcm9wZXJ0aWVzW2ld Lm5hbWU7CisgICAgICAgICAgICBpZiAobmFtZSA9PSBwYXJzZUludChuYW1lKSkKKyAgICAgICAg ICAgICAgICBlbGVtZW50c1tuYW1lXSA9IHRoaXMuX2Zvcm1hdChwcm9wZXJ0aWVzW2ldLnZhbHVl KTsKKyAgICAgICAgfQorCisgICAgICAgIGVsZW0uYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRl VGV4dE5vZGUoIlsiKSk7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZWxlbWVudHMubGVu Z3RoOyArK2kpIHsKKyAgICAgICAgICAgIHZhciBlbGVtZW50ID0gZWxlbWVudHNbaV07CisgICAg ICAgICAgICBpZiAoZWxlbWVudCkKKyAgICAgICAgICAgICAgICBlbGVtLmFwcGVuZENoaWxkKGVs ZW1lbnQpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGVsZW0uYXBwZW5kQ2hp bGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoInVuZGVmaW5lZCIpKQorICAgICAgICAgICAgaWYg KGkgPCBlbGVtZW50cy5sZW5ndGggLSAxKQorICAgICAgICAgICAgICAgIGVsZW0uYXBwZW5kQ2hp bGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoIiwgIikpOwogICAgICAgICB9Ci0gICAgICAgIElu amVjdGVkU2NyaXB0QWNjZXNzLmdldFByb3BlcnRpZXMoYXJyLCBmYWxzZSwgcHJpbnRSZXN1bHQp OworICAgICAgICBlbGVtLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCJdIikp OwogICAgIH0sCiAKICAgICBfZm9ybWF0bm9kZTogZnVuY3Rpb24ob2JqZWN0LCBlbGVtKQo=