145661 2015-06-04 14:43:58 -0700 Web Inspector: Class constructor appearing as Object Tree property does not include parameters 2015-06-04 21:34:05 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1099625 0 joepeck 2015-06-04 14:43:58 -0700 * SUMMARY Class constructor appearing as Object Tree property does not include parameters. * TEST <script> var MyClass = class MyClass { constructor(name) {} }; console.dir(new MyClass); </script> * STEPS TO REPRODUCE 1. Inspect test page 2. Expand MyClass's prototype => "constructor" should show "function(name)" instead shows just "function()" 1099628 1 254302 joepeck 2015-06-04 14:48:41 -0700 Created attachment 254302 [PATCH] Proposed Fix 1099755 2 254302 commit-queue 2015-06-04 21:34:02 -0700 Comment on attachment 254302 [PATCH] Proposed Fix Clearing flags on attachment: 254302 Committed r185237: <http://trac.webkit.org/changeset/185237> 1099756 3 commit-queue 2015-06-04 21:34:05 -0700 All reviewed patches have been landed. Closing bug. 254302 2015-06-04 14:48:41 -0700 2015-06-04 21:34:02 -0700 [PATCH] Proposed Fix class-constructor.patch text/plain 11260 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjOTZiMDU4Li5iMWFiZTJjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTUtMDYt MDQgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBDbGFzcyBjb25zdHJ1Y3RvciBhcHBlYXJpbmcgYXMgT2JqZWN0IFRyZWUgcHJv cGVydHkgZG9lcyBub3QgaW5jbHVkZSBwYXJhbWV0ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU2NjEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0 LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0b3IvbW9kZWwvcmVtb3RlLW9iamVjdC5o dG1sOgorICAgICAgICBVcGRhdGUgZXhwZWN0ZWQgcmVzdWx0cyBhbmQgdGVzdCB3ZSBnZXQgZXhw ZWN0ZWQgdmFsdWVzIGZvciBjbGFzcyBjb25zdHJ1Y3RvcnMuCisKIDIwMTUtMDYtMDQgIEJyZW50 IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIFdLMSB2ZXJzaW9u cyBvZiB0ZXN0cyBmcm9tIEJ1Z3MgMTQ1NjM3IGFuZCAxNDU2NDIKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0LWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0LWV4cGVjdGVkLnR4dAppbmRleCBl YjVmMzdhLi43YTlhMGFkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvbW9kZWwv cmVtb3RlLW9iamVjdC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21v ZGVsL3JlbW90ZS1vYmplY3QtZXhwZWN0ZWQudHh0CkBAIC0zODk5LDcgKzM4OTksNyBAQCBFWFBS RVNTSU9OOiBQcm9taXNlLnJlc29sdmUoe3Jlc3VsdDoxfSkKIH0KIAogLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KLUVYUFJFU1NJT046IFBlcnNv biA9IGNsYXNzIFBlcnNvbiB7IGNvbnN0cnVjdG9yKCl7fSBnZXQgZnVsbE5hbWUoKXt9IG1ldGhv ZE5hbWUocDEsIHAyKXt9IH07IFBlcnNvbgorRVhQUkVTU0lPTjogUGVyc29uID0gY2xhc3MgUGVy c29uIHsgY29uc3RydWN0b3IobmFtZSl7fSBnZXQgZnVsbE5hbWUoKXt9IG1ldGhvZE5hbWUocDEs IHAyKXt9IH07IFBlcnNvbgogewogICAiX3R5cGUiOiAiZnVuY3Rpb24iLAogICAiX3N1YnR5cGUi OiAiY2xhc3MiLApAQCAtMzkwOSw3ICszOTA5LDggQEAgRVhQUkVTU0lPTjogUGVyc29uID0gY2xh c3MgUGVyc29uIHsgY29uc3RydWN0b3IoKXt9IGdldCBmdWxsTmFtZSgpe30gbWV0aG9kTmFtZSgK ICAgICAiX3R5cGUiOiAib2JqZWN0IiwKICAgICAiX29iamVjdElkIjogIjxmaWx0ZXJlZD4iLAog ICAgICJfZGVzY3JpcHRpb24iOiAiUGVyc29uIgotICB9CisgIH0sCisgICJfZnVuY3Rpb25EZXNj cmlwdGlvbiI6ICJmdW5jdGlvbiBQZXJzb24obmFtZSl7fSIKIH0KIAogLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KQEAgLTM5MzEsNyArMzkzMiw4 IEBAIEVYUFJFU1NJT046IEFscGhhID0gY2xhc3MgQSB7IG1ldGhvZEEoKXt9IH07IEJldGEgPSBj bGFzcyBCIGV4dGVuZHMgQWxwaGEgeyBtZXRoCiAgICAgIl90eXBlIjogIm9iamVjdCIsCiAgICAg Il9vYmplY3RJZCI6ICI8ZmlsdGVyZWQ+IiwKICAgICAiX2Rlc2NyaXB0aW9uIjogIkIiCi0gIH0K KyAgfSwKKyAgIl9mdW5jdGlvbkRlc2NyaXB0aW9uIjogImZ1bmN0aW9uIEIoKSB7IHN1cGVyKC4u LmFyZ3VtZW50cyk7IH0iCiB9CiAKIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCkBAIC0zOTU0LDcgKzM5NTYsNyBAQCBFWFBSRVNTSU9OOiBbQmV0 YV0KICAgICAgICAgIl9uYW1lIjogIjAiLAogICAgICAgICAiX3R5cGUiOiAiZnVuY3Rpb24iLAog ICAgICAgICAiX3N1YnR5cGUiOiAiY2xhc3MiLAotICAgICAgICAiX3ZhbHVlIjogIkIiCisgICAg ICAgICJfdmFsdWUiOiAiY2xhc3MgQiIKICAgICAgIH0KICAgICBdLAogICAgICJfZW50cmllcyI6 IG51bGwKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2Jq ZWN0Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvbW9kZWwvcmVtb3RlLW9iamVjdC5odG1s CmluZGV4IGU1ODNmZjYuLmQwZjZkNmMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rv ci9tb2RlbC9yZW1vdGUtb2JqZWN0Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21v ZGVsL3JlbW90ZS1vYmplY3QuaHRtbApAQCAtMTYzLDcgKzE2Myw3IEBAIGZ1bmN0aW9uIHRlc3Qo KQogCiAgICAgLy8gQ2xhc3NlcwogCi0gICAgICAgIHtleHByZXNzaW9uOiAiUGVyc29uID0gY2xh c3MgUGVyc29uIHsgY29uc3RydWN0b3IoKXt9IGdldCBmdWxsTmFtZSgpe30gbWV0aG9kTmFtZShw MSwgcDIpe30gfTsgUGVyc29uIn0sIC8vIENvbnN0cnVjdG9yID0+IGNsYXNzIHR5cGUKKyAgICAg ICAge2V4cHJlc3Npb246ICJQZXJzb24gPSBjbGFzcyBQZXJzb24geyBjb25zdHJ1Y3RvcihuYW1l KXt9IGdldCBmdWxsTmFtZSgpe30gbWV0aG9kTmFtZShwMSwgcDIpe30gfTsgUGVyc29uIn0sIC8v IENvbnN0cnVjdG9yID0+IGNsYXNzIHR5cGUKICAgICAgICAge2V4cHJlc3Npb246ICJQZXJzb24u cHJvdG90eXBlLm1ldGhvZE5hbWUifSwgLy8gTWV0aG9kID0+IGp1c3QgYSBmdW5jdGlvbiB0eXBl CiAgICAgICAgIHtleHByZXNzaW9uOiAiQWxwaGEgPSBjbGFzcyBBIHsgbWV0aG9kQSgpe30gfTsg QmV0YSA9IGNsYXNzIEIgZXh0ZW5kcyBBbHBoYSB7IG1ldGhvZEIoKXt9IH07IEJldGEifSwKICAg ICAgICAge2V4cHJlc3Npb246ICJbQmV0YV0ifSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4 IDAzNmZiZDIuLjBkNDcwOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE1LTA2LTA0ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisK KyAgICAgICAgV2ViIEluc3BlY3RvcjogQ2xhc3MgY29uc3RydWN0b3IgYXBwZWFyaW5nIGFzIE9i amVjdCBUcmVlIHByb3BlcnR5IGRvZXMgbm90IGluY2x1ZGUgcGFyYW1ldGVycworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1NjYxCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5qZWN0 ZWRTY3JpcHRTb3VyY2UuanM6CisgICAgICAgIChJbmplY3RlZFNjcmlwdC5wcm90b3R5cGUuX2Ns YXNzUHJldmlldyk6CisgICAgICAgIChJbmplY3RlZFNjcmlwdC5SZW1vdGVPYmplY3QucHJvdG90 eXBlLl9hcHBlbmRQcm9wZXJ0eVByZXZpZXdzKToKKyAgICAgICAgVGhlIHN0cmluZyB3ZSB3aWxs IHJldHVybiBmb3IgcHJldmlld3Mgb2YgY2xhc3MgY29uc3RydWN0b3IgZnVuY3Rpb25zLgorCisg ICAgICAgIChJbmplY3RlZFNjcmlwdC5SZW1vdGVPYmplY3QpOgorICAgICAgICAoSW5qZWN0ZWRT Y3JpcHQuUmVtb3RlT2JqZWN0LnByb3RvdHlwZS5fZGVzY3JpYmUpOgorICAgICAgICBObyBsb25n ZXIgcmV0dXJuIHRoZSBjbGFzcyBuYW1lIGFzIHRoZSBkZXNjcmlwdGlvbiBzdHJpbmcuCisgICAg ICAgIEluc3RlYWQgcmV0dXJuIHRoZSBjbGFzcyBuYW1lIGZvciB0aGUgUmVtb3RlT2JqZWN0LmNs YXNzTmFtZS4KKwogMjAxNS0wNi0wNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgog CiAgICAgICAgIFtXSzJdIFBydW5lIG1vcmUgcmVzb3VyY2VzIGZyb20gdGhlIE1lbW9yeUNhY2hl IGJlZm9yZSBwcm9jZXNzIHN1c3BlbnNpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzCmluZGV4IDc3ZGU0NmYuLjNk MzA1YjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0 ZWRTY3JpcHRTb3VyY2UuanMKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9J bmplY3RlZFNjcmlwdFNvdXJjZS5qcwpAQCAtNzc0LDYgKzc3NCwxMSBAQCBJbmplY3RlZFNjcmlw dC5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICB9LAogCisgICAgX2NsYXNzUHJldmlldzog ZnVuY3Rpb24oY2xhc3NDb25zdHJ1Y3RvclZhbHVlKQorICAgIHsKKyAgICAgICAgcmV0dXJuICJj bGFzcyAiICsgY2xhc3NDb25zdHJ1Y3RvclZhbHVlLm5hbWU7CisgICAgfSwKKwogICAgIF9ub2Rl UHJldmlldzogZnVuY3Rpb24obm9kZSkKICAgICB7CiAgICAgICAgIHZhciBpc1hNTERvY3VtZW50 ID0gbm9kZS5vd25lckRvY3VtZW50ICYmICEhbm9kZS5vd25lckRvY3VtZW50LnhtbFZlcnNpb247 CkBAIC04MjksOSArODM0LDYgQEAgSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewogICAgICAg ICBpZiAoc3VidHlwZSA9PT0gImFycmF5IikKICAgICAgICAgICAgIHJldHVybiBjbGFzc05hbWU7 CiAKLSAgICAgICAgaWYgKHN1YnR5cGUgPT09ICJjbGFzcyIpCi0gICAgICAgICAgICByZXR1cm4g b2JqLm5hbWU7Ci0KICAgICAgICAgLy8gTm9kZUxpc3QgaW4gSlNDIGlzIGEgZnVuY3Rpb24sIGNo ZWNrIGZvciBhcnJheSBwcmlvciB0byB0aGlzLgogICAgICAgICBpZiAodHlwZW9mIG9iaiA9PT0g ImZ1bmN0aW9uIikKICAgICAgICAgICAgIHJldHVybiB0b1N0cmluZyhvYmopOwpAQCAtOTg0LDgg Kzk4NiwxMCBAQCBJbmplY3RlZFNjcmlwdC5SZW1vdGVPYmplY3QgPSBmdW5jdGlvbihvYmplY3Qs IG9iamVjdEdyb3VwTmFtZSwgZm9yY2VWYWx1ZVR5cGUsCiAgICAgICAgIHRoaXMuc2l6ZSA9IElu amVjdGVkU2NyaXB0SG9zdC53ZWFrTWFwU2l6ZShvYmplY3QpOwogICAgIGVsc2UgaWYgKHN1YnR5 cGUgPT09ICJ3ZWFrc2V0IikKICAgICAgICAgdGhpcy5zaXplID0gSW5qZWN0ZWRTY3JpcHRIb3N0 LndlYWtTZXRTaXplKG9iamVjdCk7Ci0gICAgZWxzZSBpZiAoc3VidHlwZSA9PT0gImNsYXNzIikK KyAgICBlbHNlIGlmIChzdWJ0eXBlID09PSAiY2xhc3MiKSB7CiAgICAgICAgIHRoaXMuY2xhc3NQ cm90b3R5cGUgPSBpbmplY3RlZFNjcmlwdC5fd3JhcE9iamVjdChvYmplY3QucHJvdG90eXBlLCBv YmplY3RHcm91cE5hbWUpOworICAgICAgICB0aGlzLmNsYXNzTmFtZSA9IG9iamVjdC5uYW1lOwor ICAgIH0KIAogICAgIGlmIChnZW5lcmF0ZVByZXZpZXcgJiYgdGhpcy50eXBlID09PSAib2JqZWN0 IikKICAgICAgICAgdGhpcy5wcmV2aWV3ID0gdGhpcy5fZ2VuZXJhdGVQcmV2aWV3KG9iamVjdCwg dW5kZWZpbmVkLCBjb2x1bW5OYW1lcyk7CkBAIC0xMTcwLDcgKzExNzQsMTMgQEAgSW5qZWN0ZWRT Y3JpcHQuUmVtb3RlT2JqZWN0LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIH0gZWxzZSB7CiAg ICAgICAgICAgICAgICAgdmFyIGRlc2NyaXB0aW9uID0gIiI7CiAgICAgICAgICAgICAgICAgaWYg KHR5cGUgIT09ICJmdW5jdGlvbiIgfHwgc3VidHlwZSA9PT0gImNsYXNzIikgewotICAgICAgICAg ICAgICAgICAgICB2YXIgZnVsbERlc2NyaXB0aW9uID0gc3VidHlwZSA9PT0gIm5vZGUiID8gaW5q ZWN0ZWRTY3JpcHQuX25vZGVQcmV2aWV3KHZhbHVlKSA6IGluamVjdGVkU2NyaXB0Ll9kZXNjcmli ZSh2YWx1ZSk7CisgICAgICAgICAgICAgICAgICAgIHZhciBmdWxsRGVzY3JpcHRpb247CisgICAg ICAgICAgICAgICAgICAgIGlmIChzdWJ0eXBlID09PSAiY2xhc3MiKQorICAgICAgICAgICAgICAg ICAgICAgICAgZnVsbERlc2NyaXB0aW9uID0gImNsYXNzICIgKyB2YWx1ZS5uYW1lOworICAgICAg ICAgICAgICAgICAgICBlbHNlIGlmIChzdWJ0eXBlID09PSAibm9kZSIpCisgICAgICAgICAgICAg ICAgICAgICAgICBmdWxsRGVzY3JpcHRpb24gPSBpbmplY3RlZFNjcmlwdC5fbm9kZVByZXZpZXco dmFsdWUpOworICAgICAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgICAg ICBmdWxsRGVzY3JpcHRpb24gPSBpbmplY3RlZFNjcmlwdC5fZGVzY3JpYmUodmFsdWUpOwogICAg ICAgICAgICAgICAgICAgICBkZXNjcmlwdGlvbiA9IHRoaXMuX2FiYnJldmlhdGVTdHJpbmcoZnVs bERlc2NyaXB0aW9uLCBtYXhMZW5ndGgsIHN1YnR5cGUgPT09ICJyZWdleHAiKTsKICAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICAgICAgcHJvcGVydHkudmFsdWUgPSBkZXNjcmlwdGlvbjsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGExNWE1NWYuLmQ3NGMzMjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE1LTA2LTA0ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ2xhc3Mg Y29uc3RydWN0b3IgYXBwZWFyaW5nIGFzIE9iamVjdCBUcmVlIHByb3BlcnR5IGRvZXMgbm90IGlu Y2x1ZGUgcGFyYW1ldGVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTQ1NjYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Byb3RvY29sL1JlbW90ZU9iamVjdC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJl bW90ZU9iamVjdC5mcm9tUHJpbWl0aXZlVmFsdWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJl bW90ZU9iamVjdC5mcm9tUGF5bG9hZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVtb3RlT2Jq ZWN0LnByb3RvdHlwZS5nZXQgZnVuY3Rpb25EZXNjcmlwdGlvbik6CisgICAgICAgIEluY2x1ZGUg dGhlIGNsYXNzTmFtZSBhcyBvbmx5IHVzZSBpdCBmb3IgImNsYXNzIiB0eXBlcyB0byBvdmVycmlk ZQorICAgICAgICB0aGUgbm9ybWFsIGRlc2NyaXB0aW9uIHN0cmluZy4gU3Rhc2ggdGhlIGFjdHVh bCBmdW5jdGlvbiBkZXNjcmlwdGlvbgorICAgICAgICBpbiBhIHByb3BlcnR5IHdlIGNhbiBhY2Nl c3MgbGF0ZXIuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVQcm9w ZXJ0eVRyZWVFbGVtZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFRyZWVQcm9w ZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZS5fZnVuY3Rpb25QYXJhbWV0ZXJTdHJpbmcpOgorICAg ICAgICBFdmVuIGlmIHRoaXMgcHJvcGVydHkgaXMgYSAiY2xhc3MiIHdlIHdhbnQgdG8gc3BlY2lm aWNhbGx5IHBhcnNlIGl0J3MKKyAgICAgICAgZnVuY3Rpb24gZGVzY3JpcHRpb24gc3RyaW5nLiBT byB1c2UgZnVuY3Rpb25EZXNjcmlwdGlvbi4KKwogMjAxNS0wNi0wMyAgRGV2aW4gUm91c3NvICA8 ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogaWYgYSBrbm93biBD U1MgcHJvcGVydHkgaGFzIGFuIHVuc3VwcG9ydGVkIHZhbHVlLCBvbmx5IHN0cmlrZXRocm91Z2gg dGhlIHZhbHVlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Qcm90b2NvbC9SZW1vdGVPYmplY3QuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Qcm90b2NvbC9SZW1vdGVPYmplY3QuanMKaW5kZXggZGJjMTg2Mi4uYTU5MGUzOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wv UmVtb3RlT2JqZWN0LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1Byb3RvY29sL1JlbW90ZU9iamVjdC5qcwpAQCAtMzEsNyArMzEsNyBAQAogCiBXZWJJbnNwZWN0 b3IuUmVtb3RlT2JqZWN0ID0gY2xhc3MgUmVtb3RlT2JqZWN0CiB7Ci0gICAgY29uc3RydWN0b3Io b2JqZWN0SWQsIHR5cGUsIHN1YnR5cGUsIHZhbHVlLCBkZXNjcmlwdGlvbiwgc2l6ZSwgY2xhc3NQ cm90b3R5cGUsIHByZXZpZXcpCisgICAgY29uc3RydWN0b3Iob2JqZWN0SWQsIHR5cGUsIHN1YnR5 cGUsIHZhbHVlLCBkZXNjcmlwdGlvbiwgc2l6ZSwgY2xhc3NQcm90b3R5cGUsIGNsYXNzTmFtZSwg cHJldmlldykKICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHR5cGUpOwogICAgICAgICBj b25zb2xlLmFzc2VydCghcHJldmlldyB8fCBwcmV2aWV3IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9y Lk9iamVjdFByZXZpZXcpOwpAQCAtNTIsOCArNTIsMTAgQEAgV2ViSW5zcGVjdG9yLlJlbW90ZU9i amVjdCA9IGNsYXNzIFJlbW90ZU9iamVjdAogICAgICAgICAgICAgdGhpcy5fY2xhc3NQcm90b3R5 cGUgPSBjbGFzc1Byb3RvdHlwZTsKICAgICAgICAgICAgIHRoaXMuX3ByZXZpZXcgPSBwcmV2aWV3 OwogCi0gICAgICAgICAgICBpZiAoc3VidHlwZSA9PT0gImNsYXNzIikKLSAgICAgICAgICAgICAg ICB0aGlzLl9kZXNjcmlwdGlvbiA9ICJjbGFzcyAiICsgdGhpcy5fZGVzY3JpcHRpb247CisgICAg ICAgICAgICBpZiAoc3VidHlwZSA9PT0gImNsYXNzIikgeworICAgICAgICAgICAgICAgIHRoaXMu X2Z1bmN0aW9uRGVzY3JpcHRpb24gPSB0aGlzLl9kZXNjcmlwdGlvbjsKKyAgICAgICAgICAgICAg ICB0aGlzLl9kZXNjcmlwdGlvbiA9ICJjbGFzcyAiICsgY2xhc3NOYW1lOworICAgICAgICAgICAg fQogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgLy8gUHJpbWl0aXZlIG9yIG51bGwuCiAg ICAgICAgICAgICBjb25zb2xlLmFzc2VydCh0eXBlICE9PSAib2JqZWN0IiB8fCB2YWx1ZSA9PT0g bnVsbCk7CkBAIC02OSw3ICs3MSw3IEBAIFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QgPSBjbGFz cyBSZW1vdGVPYmplY3QKIAogICAgIHN0YXRpYyBmcm9tUHJpbWl0aXZlVmFsdWUodmFsdWUpCiAg ICAgewotICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QodW5kZWZp bmVkLCB0eXBlb2YgdmFsdWUsIHVuZGVmaW5lZCwgdmFsdWUsIHVuZGVmaW5lZCwgdW5kZWZpbmVk LCB1bmRlZmluZWQpOworICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5SZW1vdGVPYmpl Y3QodW5kZWZpbmVkLCB0eXBlb2YgdmFsdWUsIHVuZGVmaW5lZCwgdmFsdWUsIHVuZGVmaW5lZCwg dW5kZWZpbmVkLCB1bmRlZmluZWQsIHVuZGVmaW5lZCk7CiAgICAgfQogCiAgICAgc3RhdGljIGZy b21QYXlsb2FkKHBheWxvYWQpCkBAIC0xMDIsNyArMTA0LDcgQEAgV2ViSW5zcGVjdG9yLlJlbW90 ZU9iamVjdCA9IGNsYXNzIFJlbW90ZU9iamVjdAogICAgICAgICAgICAgcGF5bG9hZC5wcmV2aWV3 ID0gV2ViSW5zcGVjdG9yLk9iamVjdFByZXZpZXcuZnJvbVBheWxvYWQocGF5bG9hZC5wcmV2aWV3 KTsKICAgICAgICAgfQogCi0gICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLlJlbW90ZU9i amVjdChwYXlsb2FkLm9iamVjdElkLCBwYXlsb2FkLnR5cGUsIHBheWxvYWQuc3VidHlwZSwgcGF5 bG9hZC52YWx1ZSwgcGF5bG9hZC5kZXNjcmlwdGlvbiwgcGF5bG9hZC5zaXplLCBwYXlsb2FkLmNs YXNzUHJvdG90eXBlLCBwYXlsb2FkLnByZXZpZXcpOworICAgICAgICByZXR1cm4gbmV3IFdlYklu c3BlY3Rvci5SZW1vdGVPYmplY3QocGF5bG9hZC5vYmplY3RJZCwgcGF5bG9hZC50eXBlLCBwYXls b2FkLnN1YnR5cGUsIHBheWxvYWQudmFsdWUsIHBheWxvYWQuZGVzY3JpcHRpb24sIHBheWxvYWQu c2l6ZSwgcGF5bG9hZC5jbGFzc1Byb3RvdHlwZSwgcGF5bG9hZC5jbGFzc05hbWUsIHBheWxvYWQu cHJldmlldyk7CiAgICAgfQogCiAgICAgc3RhdGljIGNyZWF0ZUNhbGxBcmd1bWVudCh2YWx1ZU9y T2JqZWN0KQpAQCAtMTYzLDYgKzE2NSwxMyBAQCBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0ID0g Y2xhc3MgUmVtb3RlT2JqZWN0CiAgICAgICAgIHJldHVybiB0aGlzLl9kZXNjcmlwdGlvbjsKICAg ICB9CiAKKyAgICBnZXQgZnVuY3Rpb25EZXNjcmlwdGlvbigpCisgICAgeworICAgICAgICBjb25z b2xlLmFzc2VydCh0aGlzLnR5cGUgPT09ICJmdW5jdGlvbiIpOworCisgICAgICAgIHJldHVybiB0 aGlzLl9mdW5jdGlvbkRlc2NyaXB0aW9uIHx8IHRoaXMuX2Rlc2NyaXB0aW9uOworICAgIH0KKwog ICAgIGdldCBoYXNDaGlsZHJlbigpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5faGFzQ2hp bGRyZW47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9PYmplY3RUcmVlUHJvcGVydHlUcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVQcm9wZXJ0eVRyZWVFbGVtZW50Lmpz CmluZGV4IDQyNWRiZGUuLjk2NzU4MDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVQcm9wZXJ0eVRyZWVFbGVtZW50LmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVQ cm9wZXJ0eVRyZWVFbGVtZW50LmpzCkBAIC0yODEsNyArMjgxLDcgQEAgV2ViSW5zcGVjdG9yLk9i amVjdFRyZWVQcm9wZXJ0eVRyZWVFbGVtZW50ID0gY2xhc3MgT2JqZWN0VHJlZVByb3BlcnR5VHJl ZUVsZW1lbnQKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIHZhciBtYXRjaCA9 IHJlc29sdmVkVmFsdWUuZGVzY3JpcHRpb24ubWF0Y2goL15mdW5jdGlvbi4qPyhcKFteKV0qP1wp KS8pOworICAgICAgICB2YXIgbWF0Y2ggPSByZXNvbHZlZFZhbHVlLmZ1bmN0aW9uRGVzY3JpcHRp b24ubWF0Y2goL15mdW5jdGlvbi4qPyhcKFteKV0qP1wpKS8pOwogICAgICAgICByZXR1cm4gbWF0 Y2ggPyBtYXRjaFsxXSA6ICIoKSI7CiAgICAgfQogCg==