136982 2014-09-21 00:45:35 -0700 Web Inspector: fix TypeSet hierarchy in TypeTokenView 2014-09-21 23:58:44 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 saam saam commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 1036338 0 saam 2014-09-21 00:45:35 -0700 Take the example program: ` var x = {} x = 2; ` The type token displayed next to x will be Object, but it should be many. 1036339 1 webkit-bug-importer 2014-09-21 00:45:43 -0700 <rdar://problem/18405642> 1036340 2 238424 saam 2014-09-21 00:51:39 -0700 Created attachment 238424 proposed patch I think this patch should fix the issue, but I'm waiting on a build to verify. 1036355 3 saam 2014-09-21 12:20:47 -0700 Argh, it seems like the problem is deeper than this too. TypeSet::inspectorTypeSet seems to be broken when being passed over the protocol. I'm looking into fixing this now. 1036371 4 238433 saam 2014-09-21 13:49:22 -0700 Created attachment 238433 patch This should fix the problem: I was using TypeSet::doesTypeConformTo which checks a bound on a type, it does NOT check whether a TypeSet has ever been a specific type, which is the behavior we want. 1036423 5 238447 saam 2014-09-21 21:08:15 -0700 Created attachment 238447 patch 1036428 6 238447 joepeck 2014-09-21 22:04:14 -0700 Comment on attachment 238447 patch Oops!!! My fault :O. Should have seen that in review. r=me 1036440 7 238447 commit-queue 2014-09-21 23:58:41 -0700 Comment on attachment 238447 patch Clearing flags on attachment: 238447 Committed r173805: <http://trac.webkit.org/changeset/173805> 1036441 8 commit-queue 2014-09-21 23:58:44 -0700 All reviewed patches have been landed. Closing bug. 238424 2014-09-21 00:51:39 -0700 2014-09-21 13:49:22 -0700 proposed patch patch.diff text/plain 858 saam SW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1R5cGVUb2tl blZpZXcuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVHlwZVRva2VuVmlldy5qcwkocmV2aXNpb24gMTczNzk1KQorKysgU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHlwZVRva2VuVmlldy5qcwkod29ya2lu ZyBjb3B5KQpAQCAtMTQyLDcgKzE0Miw3IEBAIFdlYkluc3BlY3Rvci5UeXBlVG9rZW5WaWV3LnBy b3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHZhciB0eXBlU2V0ID0gV2ViSW5zcGVjdG9yLlR5 cGVTZXQuZnJvbVBheWxvYWQodGhpcy5fdHlwZXMpOwogCi0gICAgICAgIGlmICh0aGlzLl90eXBl cy5sZWFzdENvbW1vbkFuY2VzdG9yKSB7CisgICAgICAgIGlmICh0aGlzLl90eXBlcy5sZWFzdENv bW1vbkFuY2VzdG9yICYmICEodGhpcy5fdHlwZXMucHJpbWl0aXZlVHlwZU5hbWVzICYmIHRoaXMu X3R5cGVzLnByaW1pdGl2ZVR5cGVOYW1lcykpIHsKICAgICAgICAgICAgIGlmICh0eXBlU2V0Lmlz Q29udGFpbmVkSW4oV2ViSW5zcGVjdG9yLlR5cGVTZXQuVHlwZUJpdC5PYmplY3QpKQogICAgICAg ICAgICAgICAgIHJldHVybiB0aGlzLl90eXBlcy5sZWFzdENvbW1vbkFuY2VzdG9yOwogICAgICAg ICAgICAgaWYgKHR5cGVTZXQuaXNDb250YWluZWRJbihXZWJJbnNwZWN0b3IuVHlwZVNldC5UeXBl Qml0Lk9iamVjdCB8IFdlYkluc3BlY3Rvci5UeXBlU2V0Lk51bGxPclVuZGVmaW5lZFR5cGVCaXRz KSkK 238433 2014-09-21 13:49:22 -0700 2014-09-21 21:08:15 -0700 patch patch.diff text/plain 2968 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1R5cGVTZXQuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1R5cGVTZXQuY3BwCShyZXZpc2lv biAxNzM3OTUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9UeXBlU2V0LmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjY5LDE0ICsyNjksMTQgQEAgUGFzc1JlZlB0cjxJbnNwZWN0b3I6 OlByb3RvY29sOjpBcnJheTxJbgogUGFzc1JlZlB0cjxJbnNwZWN0b3I6OlByb3RvY29sOjpSdW50 aW1lOjpUeXBlU2V0PiBUeXBlU2V0OjppbnNwZWN0b3JUeXBlU2V0KCkgY29uc3QKIHsKICAgICBy ZXR1cm4gSW5zcGVjdG9yOjpQcm90b2NvbDo6UnVudGltZTo6VHlwZVNldDo6Y3JlYXRlKCkKLSAg ICAgICAgLnNldElzRnVuY3Rpb24oZG9lc1R5cGVDb25mb3JtVG8oVHlwZUZ1bmN0aW9uKSkKLSAg ICAgICAgLnNldElzVW5kZWZpbmVkKGRvZXNUeXBlQ29uZm9ybVRvKFR5cGVVbmRlZmluZWQpKQot ICAgICAgICAuc2V0SXNOdWxsKGRvZXNUeXBlQ29uZm9ybVRvKFR5cGVOdWxsKSkKLSAgICAgICAg LnNldElzQm9vbGVhbihkb2VzVHlwZUNvbmZvcm1UbyhUeXBlQm9vbGVhbikpCi0gICAgICAgIC5z ZXRJc0ludGVnZXIoZG9lc1R5cGVDb25mb3JtVG8oVHlwZU1hY2hpbmVJbnQpKQotICAgICAgICAu c2V0SXNOdW1iZXIoZG9lc1R5cGVDb25mb3JtVG8oVHlwZU51bWJlcikpCi0gICAgICAgIC5zZXRJ c1N0cmluZyhkb2VzVHlwZUNvbmZvcm1UbyhUeXBlU3RyaW5nKSkKLSAgICAgICAgLnNldElzT2Jq ZWN0KGRvZXNUeXBlQ29uZm9ybVRvKFR5cGVPYmplY3QpKQorICAgICAgICAuc2V0SXNGdW5jdGlv bigobV9zZWVuVHlwZXMgJiBUeXBlRnVuY3Rpb24pICE9IFR5cGVOb3RoaW5nKQorICAgICAgICAu c2V0SXNVbmRlZmluZWQoKG1fc2VlblR5cGVzICYgVHlwZVVuZGVmaW5lZCkgIT0gVHlwZU5vdGhp bmcpCisgICAgICAgIC5zZXRJc051bGwoKG1fc2VlblR5cGVzICYgVHlwZU51bGwpICE9IFR5cGVO b3RoaW5nKQorICAgICAgICAuc2V0SXNCb29sZWFuKChtX3NlZW5UeXBlcyAmIFR5cGVCb29sZWFu KSAhPSBUeXBlTm90aGluZykKKyAgICAgICAgLnNldElzSW50ZWdlcigobV9zZWVuVHlwZXMgJiBU eXBlTWFjaGluZUludCkgIT0gVHlwZU5vdGhpbmcpCisgICAgICAgIC5zZXRJc051bWJlcigobV9z ZWVuVHlwZXMgJiBUeXBlTnVtYmVyKSAhPSBUeXBlTm90aGluZykKKyAgICAgICAgLnNldElzU3Ry aW5nKChtX3NlZW5UeXBlcyAmIFR5cGVTdHJpbmcpICE9IFR5cGVOb3RoaW5nKQorICAgICAgICAu c2V0SXNPYmplY3QoKG1fc2VlblR5cGVzICYgVHlwZU9iamVjdCkgIT0gVHlwZU5vdGhpbmcpCiAg ICAgICAgIC5yZWxlYXNlKCk7CiB9CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9UeXBlU2V0LmpzCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9UeXBlU2V0LmpzCShyZXZpc2lvbiAx NzM3OTUpCisrKyBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvVHlw ZVNldC5qcwkod29ya2luZyBjb3B5KQpAQCAtODksNiArODksNiBAQCBXZWJJbnNwZWN0b3IuVHlw ZVNldC5wcm90b3R5cGUgPSB7CiAgICAgICAgIC8vIC0tLS0tLSAoQU5EKQogICAgICAgICAvLyAw YjAwMTAgIT0gYml0U3RyaW5nCiAKLSAgICAgICAgcmV0dXJuICh0aGlzLl9iaXRTdHJpbmcgJiB0 ZXN0KSA9PT0gdGhpcy5fYml0U3RyaW5nOworICAgICAgICByZXR1cm4gdGhpcy5fYml0U3RyaW5n ICYmICh0aGlzLl9iaXRTdHJpbmcgJiB0ZXN0KSA9PT0gdGhpcy5fYml0U3RyaW5nOwogICAgIH0K IH07CkluZGV4OiBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UeXBl VG9rZW5WaWV3LmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1R5cGVUb2tlblZpZXcuanMJKHJldmlzaW9uIDE3Mzc5NSkKKysrIFNvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1R5cGVUb2tlblZpZXcuanMJKHdv cmtpbmcgY29weSkKQEAgLTEzOCwxMSArMTM4LDExIEBAIFdlYkluc3BlY3Rvci5UeXBlVG9rZW5W aWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0sCiAKLSAgICBf ZGlzcGxheVR5cGVOYW1lOiBmdW5jdGlvbigpIAorICAgIF9kaXNwbGF5VHlwZU5hbWU6IGZ1bmN0 aW9uKCkKICAgICB7CiAgICAgICAgIHZhciB0eXBlU2V0ID0gV2ViSW5zcGVjdG9yLlR5cGVTZXQu ZnJvbVBheWxvYWQodGhpcy5fdHlwZXMpOwogCi0gICAgICAgIGlmICh0aGlzLl90eXBlcy5sZWFz dENvbW1vbkFuY2VzdG9yKSB7CisgICAgICAgIGlmICh0aGlzLl90eXBlcy5sZWFzdENvbW1vbkFu Y2VzdG9yICYmICEodGhpcy5fdHlwZXMucHJpbWl0aXZlVHlwZU5hbWVzICYmIHRoaXMuX3R5cGVz LnByaW1pdGl2ZVR5cGVOYW1lcy5sZW5ndGgpKSB7CiAgICAgICAgICAgICBpZiAodHlwZVNldC5p c0NvbnRhaW5lZEluKFdlYkluc3BlY3Rvci5UeXBlU2V0LlR5cGVCaXQuT2JqZWN0KSkKICAgICAg ICAgICAgICAgICByZXR1cm4gdGhpcy5fdHlwZXMubGVhc3RDb21tb25BbmNlc3RvcjsKICAgICAg ICAgICAgIGlmICh0eXBlU2V0LmlzQ29udGFpbmVkSW4oV2ViSW5zcGVjdG9yLlR5cGVTZXQuVHlw ZUJpdC5PYmplY3QgfCBXZWJJbnNwZWN0b3IuVHlwZVNldC5OdWxsT3JVbmRlZmluZWRUeXBlQml0 cykpCg== 238447 2014-09-21 21:08:15 -0700 2014-09-21 23:58:40 -0700 patch patch.diff text/plain 5034 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTczODA0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBA CisyMDE0LTA5LTIxICBTYWFtIEJhcmF0aSAgPHNhYW1iYXJhdGkxQGdtYWlsLmNvbT4KKworICAg ICAgICBXZWIgSW5zcGVjdG9yOiBmaXggVHlwZVNldCBoaWVyYXJjaHkgaW4gVHlwZVRva2VuVmll dworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2OTgy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVHlwZVNl dCB3YXMgY29tcHV0aW5nIHRoZSBzZXQgb2YgdHlwZSBib29sZWFucyBpbiB0aGUgSW5zcGVjdG9y OjpQcm90b2NvbDo6UnVudGltZTo6VHlwZVNldCAKKyAgICAgICAgb2JqZWN0IGluY29ycmVjdGx5 IGJlY2F1c2UgaXQgd2FzIGNhbGxpbmcgVHlwZVNldDo6ZG9lc1R5cGVDb25mb3JtVG8oVCkgd2hp Y2ggY2hlY2tzIGlmIHRoZSAKKyAgICAgICAgdHlwZSBzZXQgaGFzIG9ubHkgYmVlbiBvZiB0eXBl IFQuIEl0IG5vdyBjaGVja3MgJyhtX3NlZW5UeXBlcyAmIFQpICE9IFR5cGVOb3RoaW5nJyB0byBz ZWUgCisgICAgICAgIGlmIHR5cGUgVCBpcyBpbiB0aGUgc2V0IG9mIHNlZW4gdHlwZXMsIGJ1dCBu b3QgdGhlIGVudGlyZSBzZXQgaXRzZWxmLgorCisgICAgICAgICogcnVudGltZS9UeXBlU2V0LmNw cDoKKyAgICAgICAgKEpTQzo6VHlwZVNldDo6aW5zcGVjdG9yVHlwZVNldCk6CisKIDIwMTQtMDkt MjEgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBTdHJ1Y3R1cmUg c2hvdWxkIGhhdmUgYSBtZXRob2QgZm9yIGNvbmN1cnJlbnRseSBnZXR0aW5nIGFsbCBvZiB0aGUg cHJvcGVydHkgbWFwIGVudHJpZXMsIGFuZCB0aGlzIG1ldGhvZCBzaG91bGRuJ3QgaW52b2x2ZSBj b3B5LXBhc3RlCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9UeXBlU2V0LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9UeXBlU2V0LmNw cAkocmV2aXNpb24gMTczODAzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvVHlw ZVNldC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2OSwxNCArMjY5LDE0IEBAIFBhc3NSZWZQdHI8 SW5zcGVjdG9yOjpQcm90b2NvbDo6QXJyYXk8SW4KIFBhc3NSZWZQdHI8SW5zcGVjdG9yOjpQcm90 b2NvbDo6UnVudGltZTo6VHlwZVNldD4gVHlwZVNldDo6aW5zcGVjdG9yVHlwZVNldCgpIGNvbnN0 CiB7CiAgICAgcmV0dXJuIEluc3BlY3Rvcjo6UHJvdG9jb2w6OlJ1bnRpbWU6OlR5cGVTZXQ6OmNy ZWF0ZSgpCi0gICAgICAgIC5zZXRJc0Z1bmN0aW9uKGRvZXNUeXBlQ29uZm9ybVRvKFR5cGVGdW5j dGlvbikpCi0gICAgICAgIC5zZXRJc1VuZGVmaW5lZChkb2VzVHlwZUNvbmZvcm1UbyhUeXBlVW5k ZWZpbmVkKSkKLSAgICAgICAgLnNldElzTnVsbChkb2VzVHlwZUNvbmZvcm1UbyhUeXBlTnVsbCkp Ci0gICAgICAgIC5zZXRJc0Jvb2xlYW4oZG9lc1R5cGVDb25mb3JtVG8oVHlwZUJvb2xlYW4pKQot ICAgICAgICAuc2V0SXNJbnRlZ2VyKGRvZXNUeXBlQ29uZm9ybVRvKFR5cGVNYWNoaW5lSW50KSkK LSAgICAgICAgLnNldElzTnVtYmVyKGRvZXNUeXBlQ29uZm9ybVRvKFR5cGVOdW1iZXIpKQotICAg ICAgICAuc2V0SXNTdHJpbmcoZG9lc1R5cGVDb25mb3JtVG8oVHlwZVN0cmluZykpCi0gICAgICAg IC5zZXRJc09iamVjdChkb2VzVHlwZUNvbmZvcm1UbyhUeXBlT2JqZWN0KSkKKyAgICAgICAgLnNl dElzRnVuY3Rpb24oKG1fc2VlblR5cGVzICYgVHlwZUZ1bmN0aW9uKSAhPSBUeXBlTm90aGluZykK KyAgICAgICAgLnNldElzVW5kZWZpbmVkKChtX3NlZW5UeXBlcyAmIFR5cGVVbmRlZmluZWQpICE9 IFR5cGVOb3RoaW5nKQorICAgICAgICAuc2V0SXNOdWxsKChtX3NlZW5UeXBlcyAmIFR5cGVOdWxs KSAhPSBUeXBlTm90aGluZykKKyAgICAgICAgLnNldElzQm9vbGVhbigobV9zZWVuVHlwZXMgJiBU eXBlQm9vbGVhbikgIT0gVHlwZU5vdGhpbmcpCisgICAgICAgIC5zZXRJc0ludGVnZXIoKG1fc2Vl blR5cGVzICYgVHlwZU1hY2hpbmVJbnQpICE9IFR5cGVOb3RoaW5nKQorICAgICAgICAuc2V0SXNO dW1iZXIoKG1fc2VlblR5cGVzICYgVHlwZU51bWJlcikgIT0gVHlwZU5vdGhpbmcpCisgICAgICAg IC5zZXRJc1N0cmluZygobV9zZWVuVHlwZXMgJiBUeXBlU3RyaW5nKSAhPSBUeXBlTm90aGluZykK KyAgICAgICAgLnNldElzT2JqZWN0KChtX3NlZW5UeXBlcyAmIFR5cGVPYmplY3QpICE9IFR5cGVO b3RoaW5nKQogICAgICAgICAucmVsZWFzZSgpOwogfQogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJJbnNwZWN0b3JV SS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MzgwNCkKKysrIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBAQAorMjAxNC0wOS0yMSAgU2Fh bSBCYXJhdGkgIDxzYWFtYmFyYXRpMUBnbWFpbC5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogZml4IFR5cGVTZXQgaGllcmFyY2h5IGluIFR5cGVUb2tlblZpZXcKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjk4MgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBwcm90b2NvbCBvYmplY3QgcmVw cmVzZW50YXRpb24gb2YgVHlwZVNldCB3YXMgYmVpbmcgY29tcHV0ZWQgCisgICAgICAgIGluY29y cmVjdGx5IGluIEpTQzo6VHlwZVNldC4gVGhpcyBwYXRjaCBmaXhlcyB0aGF0IHByb2JsZW0KKyAg ICAgICAgYW5kIGFsc28gYXNzZXJ0cyB0aGF0IHRoZSB0eXBlIGluZm9ybWF0aW9uIHRoYXQgdGhl IFdlYiBJbnNwZWN0b3IKKyAgICAgICAgcmVjZWl2ZXMgaXMgbm90IGVtcHR5LgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9Nb2RlbHMvVHlwZVNldC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5UeXBlU2V0KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1R5cGVUb2tlblZpZXcu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVHlwZVRva2VuVmlldy5wcm90b3R5cGUuX2Rpc3Bs YXlUeXBlTmFtZSk6CisKIDIwMTQtMDktMjEgIFNhYW0gQmFyYXRpICA8c2FhbWJhcmF0aTFAZ21h aWwuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHVubG9jYWxpemVkICdtYW55JyBzdHJp bmcgaW4gdHlwZSBwcm9maWxlciBpbmxpbmUgYnViYmxlCkluZGV4OiBTb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvVHlwZVNldC5qcwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvVHlwZVNldC5qcwkocmV2aXNp b24gMTczODAzKQorKysgU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxz L1R5cGVTZXQuanMJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDYgKzQ3LDcgQEAgV2ViSW5zcGVjdG9y LlR5cGVTZXQgPSBmdW5jdGlvbihydW50aW1lVAogICAgIGlmICh0eXBlU2V0LmlzT2JqZWN0KQog ICAgICAgICBiaXRTdHJpbmcgfD0gV2ViSW5zcGVjdG9yLlR5cGVTZXQuVHlwZUJpdC5PYmplY3Q7 CiAKKyAgICBjb25zb2xlLmFzc2VydChiaXRTdHJpbmcpOwogICAgIHRoaXMuX2JpdFN0cmluZyA9 IGJpdFN0cmluZzsKIH07CiAKSW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1R5cGVUb2tlblZpZXcuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHlwZVRva2VuVmlldy5qcwkocmV2aXNpb24gMTcz ODAzKQorKysgU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHlwZVRv a2VuVmlldy5qcwkod29ya2luZyBjb3B5KQpAQCAtMTM4LDExICsxMzgsMTEgQEAgV2ViSW5zcGVj dG9yLlR5cGVUb2tlblZpZXcucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgfSwKIAotICAgIF9kaXNwbGF5VHlwZU5hbWU6IGZ1bmN0aW9uKCkgCisgICAgX2Rpc3BsYXlU eXBlTmFtZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdmFyIHR5cGVTZXQgPSBXZWJJbnNw ZWN0b3IuVHlwZVNldC5mcm9tUGF5bG9hZCh0aGlzLl90eXBlcyk7CiAKLSAgICAgICAgaWYgKHRo aXMuX3R5cGVzLmxlYXN0Q29tbW9uQW5jZXN0b3IpIHsKKyAgICAgICAgaWYgKHRoaXMuX3R5cGVz LmxlYXN0Q29tbW9uQW5jZXN0b3IgJiYgISh0aGlzLl90eXBlcy5wcmltaXRpdmVUeXBlTmFtZXMg JiYgdGhpcy5fdHlwZXMucHJpbWl0aXZlVHlwZU5hbWVzLmxlbmd0aCkpIHsKICAgICAgICAgICAg IGlmICh0eXBlU2V0LmlzQ29udGFpbmVkSW4oV2ViSW5zcGVjdG9yLlR5cGVTZXQuVHlwZUJpdC5P YmplY3QpKQogICAgICAgICAgICAgICAgIHJldHVybiB0aGlzLl90eXBlcy5sZWFzdENvbW1vbkFu Y2VzdG9yOwogICAgICAgICAgICAgaWYgKHR5cGVTZXQuaXNDb250YWluZWRJbihXZWJJbnNwZWN0 b3IuVHlwZVNldC5UeXBlQml0Lk9iamVjdCB8IFdlYkluc3BlY3Rvci5UeXBlU2V0Lk51bGxPclVu ZGVmaW5lZFR5cGVCaXRzKSkK