151424 2015-11-18 16:33:25 -0800 Web Inspector: move cookie url matching out of CookieStorageContentView and clean up some code 2015-11-18 22:27:52 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 151413 151408 1 bburg bburg bburg graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1143079 0 bburg 2015-11-18 16:33:25 -0800 Factoring this away from behavior changes so the test can be added with the behavior change it tests. 1143080 1 webkit-bug-importer 2015-11-18 16:33:48 -0800 <rdar://problem/23603756> 1143082 2 265808 bburg 2015-11-18 16:40:57 -0800 Created attachment 265808 Proposed Fix 1143174 3 265808 timothy 2015-11-18 21:01:31 -0800 Comment on attachment 265808 Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=265808&action=review > Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js:50 > + .then((payload) => { One line please. > Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js:54 > + .catch((error) => { Ditto. These really looks weird. > Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js:159 > + // The main resource isn't always in the list of resources, make sure to add it as a candidate. It never is. 1143192 4 bburg 2015-11-18 22:27:24 -0800 Committed r192614: <http://trac.webkit.org/changeset/192614> 265808 2015-11-18 16:40:57 -0800 2015-11-18 22:27:52 -0800 Proposed Fix bug-151424-20151118164045.patch text/plain 8999 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyNTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj NWE2YTU0NWY5OTkwYmY5ZDAwNGM5YWViY2NiM2IzZDg1MTg0OWE3Li40MDQ2OTI4MzhiODdiZjAy MzcxMmY0OGJlNDBmYzk2MmRkYWRkMzdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOSBAQAorMjAxNS0xMS0xOCAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBtb3ZlIGNvb2tpZSB1cmwgbWF0Y2hpbmcgb3V0IG9mIENv b2tpZVN0b3JhZ2VDb250ZW50VmlldyBhbmQgY2xlYW4gdXAgc29tZSBjb2RlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTE0MjQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIHRoZSBjb2RlIHRoYXQg ZGVjaWRlcyB3aGV0aGVyIGEgY29va2llIG1hdGNoZXMgYSByZXNvdXJjZSBVUkwgdG8gYSBtb2Rl bCBjbGFzcy4KKyAgICAgICAgVGhpcyB3aWxsIG1ha2UgaXQgcG9zc2libGUgdG8gdGVzdCB0aGlz IGNvZGUgZWFzaWx5IHdpdGhvdXQgcHVsbGluZyBWaWV3cyBpbnRvIHRlc3RzLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9Nb2RlbHMvQ29va2llU3RvcmFnZU9iamVjdC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5Db29raWVTdG9yYWdlT2JqZWN0LmNvb2tpZU1hdGNoZXNSZXNvdXJjZVVS TCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29va2llU3RvcmFnZU9iamVjdC5jb29raWVEb21h aW5NYXRjaGVzUmVzb3VyY2VEb21haW4pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvb2tpZVN0 b3JhZ2VPYmplY3QucHJvdG90eXBlLnNhdmVJZGVudGl0eVRvQ29va2llKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Db29raWVTdG9yYWdlT2JqZWN0KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL0Nvb2tpZVN0b3JhZ2VDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Db29raWVTdG9yYWdlQ29udGVudFZpZXcucHJvdG90eXBlLnVwZGF0ZSk6IHVzZSBQcm9taXNl cy4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db29raWVTdG9yYWdlQ29udGVudFZpZXcucHJvdG90 eXBlLl9yZWJ1aWxkVGFibGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvb2tpZVN0b3JhZ2VD b250ZW50Vmlldy5wcm90b3R5cGUuX2ZpbHRlckNvb2tpZXMpOgorCisgICAgICAgICAgICBVc2Ug QXJyYXkuZmlsdGVyKCkgYW5kIEFycmF5LnNvbWUoKSB0byBleHByZXNzIHRoaXMgbG9naWMgbW9y ZSBkaXJlY3RseS4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLkNvb2tpZVN0b3JhZ2VDb250ZW50 Vmlldy5jb29raWVNYXRjaGVzUmVzb3VyY2VVUkwpOiBEZWxldGVkLgorICAgICAgICAoV2ViSW5z cGVjdG9yLkNvb2tpZVN0b3JhZ2VDb250ZW50Vmlldy5jb29raWVEb21haW5NYXRjaGVzUmVzb3Vy Y2VEb21haW4pOiBEZWxldGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvb2tpZVN0b3JhZ2VD b250ZW50Vmlldy5wcm90b3R5cGUudXBkYXRlLmNhbGxiYWNrKTogRGVsZXRlZC4KKwogMjAxNS0x MS0xOCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIElu c3BlY3RvcjogV2F0Y2ggRXhwcmVzc2lvbnMgZGV0YWlscyBzZWN0aW9uIHNob3VsZCB1c2UgTmF2 aWdhdGlvbkJhcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvTW9kZWxzL0Nvb2tpZVN0b3JhZ2VPYmplY3QuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvQ29va2llU3RvcmFnZU9iamVjdC5qcwppbmRleCAzODZiOTE3 MjM2MjliMDQ1MmQzNDE5NTI4YmI1YTMxYWViYjgxNjVmLi45ZTYzOGE3ODkzOTJkNDUyMGNlNGIz YWEwMWFiMDM5YWI3YWQxYjdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvQ29va2llU3RvcmFnZU9iamVjdC5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ29va2llU3RvcmFnZU9iamVjdC5qcwpA QCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTMgQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEzLCAyMDE1IEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwg YXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAt MzAsNiArMzAsMjYgQEAgV2ViSW5zcGVjdG9yLkNvb2tpZVN0b3JhZ2VPYmplY3QgPSBjbGFzcyBD b29raWVTdG9yYWdlT2JqZWN0CiAgICAgICAgIHRoaXMuX2hvc3QgPSBob3N0OwogICAgIH0KIAor ICAgIC8vIFN0YXRpYworCisgICAgc3RhdGljIGNvb2tpZU1hdGNoZXNSZXNvdXJjZVVSTChjb29r aWUsIHJlc291cmNlVVJMKQorICAgIHsKKyAgICAgICAgdmFyIHBhcnNlZFVSTCA9IHBhcnNlVVJM KHJlc291cmNlVVJMKTsKKyAgICAgICAgaWYgKCFwYXJzZWRVUkwgfHwgIVdlYkluc3BlY3Rvci5D b29raWVTdG9yYWdlT2JqZWN0LmNvb2tpZURvbWFpbk1hdGNoZXNSZXNvdXJjZURvbWFpbihjb29r aWUuZG9tYWluLCBwYXJzZWRVUkwuaG9zdCkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisK KyAgICAgICAgcmV0dXJuIChwYXJzZWRVUkwucGF0aC5zdGFydHNXaXRoKGNvb2tpZS5wYXRoKQor ICAgICAgICAgICAgJiYgKCFjb29raWUucG9ydCB8fCBwYXJzZWRVUkwucG9ydCA9PT0gY29va2ll LnBvcnQpCisgICAgICAgICAgICAmJiAoIWNvb2tpZS5zZWN1cmUgfHwgcGFyc2VkVVJMLnNjaGVt ZSA9PT0gImh0dHBzIikpOworICAgIH0KKworICAgIHN0YXRpYyBjb29raWVEb21haW5NYXRjaGVz UmVzb3VyY2VEb21haW4oY29va2llRG9tYWluLCByZXNvdXJjZURvbWFpbikKKyAgICB7CisgICAg ICAgIGlmIChjb29raWVEb21haW4uY2hhckF0KDApICE9PSAiLiIpCisgICAgICAgICAgICByZXR1 cm4gcmVzb3VyY2VEb21haW4gPT09IGNvb2tpZURvbWFpbjsKKyAgICAgICAgcmV0dXJuICEhcmVz b3VyY2VEb21haW4ubWF0Y2gobmV3IFJlZ0V4cCgiXihbXlxcLl0rXFwuKT8iICsgY29va2llRG9t YWluLnN1YnN0cmluZygxKS5lc2NhcGVGb3JSZWdFeHAoKSArICIkIiksICJpIik7CisgICAgfQor CiAgICAgLy8gUHVibGljCiAKICAgICBnZXQgaG9zdCgpCkBAIC0zOSw3ICs1OSw3IEBAIFdlYklu c3BlY3Rvci5Db29raWVTdG9yYWdlT2JqZWN0ID0gY2xhc3MgQ29va2llU3RvcmFnZU9iamVjdAog CiAgICAgc2F2ZUlkZW50aXR5VG9Db29raWUoY29va2llKQogICAgIHsKLSAgICAgICAgLy8gRklY TUU6IFRoaXMgY2xhc3Mgd2lsbCBuZWVkIHRvIGxvb2sgdXAgY29va2llcyB0aGF0IGFyZSBzZXQg Zm9yIHRoaXMgaG9zdC4KKyAgICAgICAgLy8gRklYTUUgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE1 MTQxMz46IFRoaXMgY2xhc3Mgc2hvdWxkIGFjdHVhbGx5IHN0b3JlIGNvb2tpZSBkYXRhIGZvciB0 aGlzIGhvc3QuCiAgICAgICAgIGNvb2tpZVtXZWJJbnNwZWN0b3IuQ29va2llU3RvcmFnZU9iamVj dC5Db29raWVIb3N0Q29va2llS2V5XSA9IHRoaXMuaG9zdDsKICAgICB9ICAgIAogfTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Nvb2tpZVN0 b3JhZ2VDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0Nvb2tpZVN0b3JhZ2VDb250ZW50Vmlldy5qcwppbmRleCAwZGJiNWJiMzVjZTM3Mjlm YzBkNjk5N2ZiZTFkMTlmMjZmNTkwNjhkLi45Y2EwMDgxNDQyMzQ2Y2NhZWNhM2IzNDVlMzRkNjM4 M2IyNzQ0YjJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Db29raWVTdG9yYWdlQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3LmpzCkBA IC0zNywyNiArMzcsNiBAQCBXZWJJbnNwZWN0b3IuQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3ID0g Y2xhc3MgQ29va2llU3RvcmFnZUNvbnRlbnRWaWV3IGV4dGVuZHMgVwogICAgICAgICB0aGlzLnVw ZGF0ZSgpOwogICAgIH0KIAotICAgIC8vIFN0YXRpYwotCi0gICAgc3RhdGljIGNvb2tpZU1hdGNo ZXNSZXNvdXJjZVVSTChjb29raWUsIHJlc291cmNlVVJMKQotICAgIHsKLSAgICAgICAgdmFyIHBh cnNlZFVSTCA9IHBhcnNlVVJMKHJlc291cmNlVVJMKTsKLSAgICAgICAgaWYgKCFwYXJzZWRVUkwg fHwgIVdlYkluc3BlY3Rvci5Db29raWVTdG9yYWdlQ29udGVudFZpZXcuY29va2llRG9tYWluTWF0 Y2hlc1Jlc291cmNlRG9tYWluKGNvb2tpZS5kb21haW4sIHBhcnNlZFVSTC5ob3N0KSkKLSAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgICAgICByZXR1cm4gKHBhcnNlZFVSTC5wYXRoLnN0 YXJ0c1dpdGgoY29va2llLnBhdGgpCi0gICAgICAgICAgICAmJiAoIWNvb2tpZS5wb3J0IHx8IHBh cnNlZFVSTC5wb3J0ID09PSBjb29raWUucG9ydCkKLSAgICAgICAgICAgICYmICghY29va2llLnNl Y3VyZSB8fCBwYXJzZWRVUkwuc2NoZW1lID09PSAiaHR0cHMiKSk7Ci0gICAgfQotCi0gICAgc3Rh dGljIGNvb2tpZURvbWFpbk1hdGNoZXNSZXNvdXJjZURvbWFpbihjb29raWVEb21haW4sIHJlc291 cmNlRG9tYWluKQotICAgIHsKLSAgICAgICAgaWYgKGNvb2tpZURvbWFpbi5jaGFyQXQoMCkgIT09 ICIuIikKLSAgICAgICAgICAgIHJldHVybiByZXNvdXJjZURvbWFpbiA9PT0gY29va2llRG9tYWlu OwotICAgICAgICByZXR1cm4gISFyZXNvdXJjZURvbWFpbi5tYXRjaChuZXcgUmVnRXhwKCJeKFte XFwuXStcXC4pPyIgKyBjb29raWVEb21haW4uc3Vic3RyaW5nKDEpLmVzY2FwZUZvclJlZ0V4cCgp ICsgIiQiKSwgImkiKTsKLSAgICB9Ci0KICAgICAvLyBQdWJsaWMKIAogICAgIGdldCBuYXZpZ2F0 aW9uSXRlbXMoKQpAQCAtNjYsMTYgKzQ2LDE0IEBAIFdlYkluc3BlY3Rvci5Db29raWVTdG9yYWdl Q29udGVudFZpZXcgPSBjbGFzcyBDb29raWVTdG9yYWdlQ29udGVudFZpZXcgZXh0ZW5kcyBXCiAK ICAgICB1cGRhdGUoKQogICAgIHsKLSAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2soZXJyb3IsIGNv b2tpZXMpCi0gICAgICAgIHsKLSAgICAgICAgICAgIGlmIChlcnJvcikKLSAgICAgICAgICAgICAg ICByZXR1cm47Ci0KLSAgICAgICAgICAgIHRoaXMuX2Nvb2tpZXMgPSB0aGlzLl9maWx0ZXJDb29r aWVzKGNvb2tpZXMpOworICAgICAgICBQYWdlQWdlbnQuZ2V0Q29va2llcygpCisgICAgICAgIC50 aGVuKChwYXlsb2FkKSA9PiB7CisgICAgICAgICAgICB0aGlzLl9jb29raWVzID0gdGhpcy5fZmls dGVyQ29va2llcyhwYXlsb2FkLmNvb2tpZXMpOwogICAgICAgICAgICAgdGhpcy5fcmVidWlsZFRh YmxlKCk7Ci0gICAgICAgIH0KLQotICAgICAgICBQYWdlQWdlbnQuZ2V0Q29va2llcyhjYWxsYmFj ay5iaW5kKHRoaXMpKTsKKyAgICAgICAgfSkKKyAgICAgICAgLmNhdGNoKChlcnJvcikgPT4gewor ICAgICAgICAgICAgY29uc29sZS5lcnJvcigiQ291bGQgbm90IGZldGNoIGNvb2tpZXM6ICIsIGVy cm9yKTsKKyAgICAgICAgfSk7CiAgICAgfQogCiAgICAgc2F2ZVRvQ29va2llKGNvb2tpZSkKQEAg LTk1LDggKzczLDcgQEAgV2ViSW5zcGVjdG9yLkNvb2tpZVN0b3JhZ2VDb250ZW50VmlldyA9IGNs YXNzIENvb2tpZVN0b3JhZ2VDb250ZW50VmlldyBleHRlbmRzIFcKIAogICAgIF9yZWJ1aWxkVGFi bGUoKQogICAgIHsKLSAgICAgICAgLy8gRklYTUU6IElmIHRoZXJlIGFyZSBubyBjb29raWVzLCBk byB3ZSB3YW50IHRvIHNob3cgYW4gZW1wdHkgZGF0YWdyaWQsIG9yIGRvIHNvbWV0aGluZyBsaWtl IHRoZSBvbGQKLSAgICAgICAgLy8gaW5zcGVjdG9yIGFuZCBzaG93IHNvbWUgdGV4dCBzYXlpbmcg dGhlcmUgYXJlIG5vIGNvb2tpZXM/CisgICAgICAgIC8vIEZJWE1FIDxodHRwczovL3dlYmtpdC5v cmcvYi8xNTE0MDA+OiBJZiB0aGVyZSBhcmUgbm8gY29va2llcywgYWRkIHBsYWNlaG9sZGVyIGV4 cGxhbmF0b3J5IHRleHQuCiAgICAgICAgIGlmICghdGhpcy5fZGF0YUdyaWQpIHsKICAgICAgICAg ICAgIHZhciBjb2x1bW5zID0ge25hbWU6IHt9LCB2YWx1ZToge30sIGRvbWFpbjoge30sIHBhdGg6 IHt9LCBleHBpcmVzOiB7fSwgc2l6ZToge30sIGh0dHA6IHt9LCBzZWN1cmU6IHt9fTsKIApAQCAt MTcyLDM1ICsxNDksMjUgQEAgV2ViSW5zcGVjdG9yLkNvb2tpZVN0b3JhZ2VDb250ZW50VmlldyA9 IGNsYXNzIENvb2tpZVN0b3JhZ2VDb250ZW50VmlldyBleHRlbmRzIFcKIAogICAgIF9maWx0ZXJD b29raWVzKGNvb2tpZXMpCiAgICAgewotICAgICAgICB2YXIgZmlsdGVyZWRDb29raWVzID0gW107 Ci0gICAgICAgIHZhciByZXNvdXJjZXNGb3JEb21haW4gPSBbXTsKLQotICAgICAgICB2YXIgZnJh bWVzID0gV2ViSW5zcGVjdG9yLmZyYW1lUmVzb3VyY2VNYW5hZ2VyLmZyYW1lczsKLSAgICAgICAg Zm9yICh2YXIgaSA9IDA7IGkgPCBmcmFtZXMubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIHZh ciByZXNvdXJjZXMgPSBmcmFtZXNbaV0ucmVzb3VyY2VzOwotICAgICAgICAgICAgZm9yICh2YXIg aiA9IDA7IGogPCByZXNvdXJjZXMubGVuZ3RoOyArK2opIHsKLSAgICAgICAgICAgICAgICB2YXIg dXJsQ29tcG9uZW50cyA9IHJlc291cmNlc1tqXS51cmxDb21wb25lbnRzOwotICAgICAgICAgICAg ICAgIGlmICh1cmxDb21wb25lbnRzICYmIHVybENvbXBvbmVudHMuaG9zdCAmJiB1cmxDb21wb25l bnRzLmhvc3QgPT09IHRoaXMucmVwcmVzZW50ZWRPYmplY3QuaG9zdCkKLSAgICAgICAgICAgICAg ICAgICAgcmVzb3VyY2VzRm9yRG9tYWluLnB1c2gocmVzb3VyY2VzW2pdLnVybCk7Ci0gICAgICAg ICAgICB9Ci0KLSAgICAgICAgICAgIC8vIFRoZSBtYWluIHJlc291cmNlIGlzbid0IGFsd2F5cyBp biB0aGUgbGlzdCBvZiByZXNvdXJjZXMsIG1ha2Ugc3VyZSB0byBhZGQgaXQgdG8gdGhlIGxpc3Qg b2YgcmVzb3VyY2VzCi0gICAgICAgICAgICAvLyB3ZSBnZXQgdGhlIFVSTHMgZnJvbS4KLSAgICAg ICAgICAgIHZhciBtYWluUmVzb3VyY2VVUkxDb21wb25lbnRzID0gZnJhbWVzW2ldLm1haW5SZXNv dXJjZS51cmxDb21wb25lbnRzOwotICAgICAgICAgICAgaWYgKG1haW5SZXNvdXJjZVVSTENvbXBv bmVudHMgJiYgbWFpblJlc291cmNlVVJMQ29tcG9uZW50cy5ob3N0ICYmIG1haW5SZXNvdXJjZVVS TENvbXBvbmVudHMuaG9zdCA9PT0gdGhpcy5yZXByZXNlbnRlZE9iamVjdC5ob3N0KQotICAgICAg ICAgICAgICAgIHJlc291cmNlc0ZvckRvbWFpbi5wdXNoKGZyYW1lc1tpXS5tYWluUmVzb3VyY2Uu dXJsKTsKKyAgICAgICAgbGV0IHJlc291cmNlTWF0Y2hlc1N0b3JhZ2VEb21haW4gPSAocmVzb3Vy Y2UpID0+IHsKKyAgICAgICAgICAgIGxldCB1cmxDb21wb25lbnRzID0gcmVzb3VyY2UudXJsQ29t cG9uZW50czsKKyAgICAgICAgICAgIHJldHVybiB1cmxDb21wb25lbnRzICYmIHVybENvbXBvbmVu dHMuaG9zdCAmJiB1cmxDb21wb25lbnRzLmhvc3QgPT09IHRoaXMucmVwcmVzZW50ZWRPYmplY3Qu aG9zdDsKICAgICAgICAgfQogCi0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgY29va2llcy5s ZW5ndGg7ICsraSkgewotICAgICAgICAgICAgZm9yICh2YXIgaiA9IDA7IGogPCByZXNvdXJjZXNG b3JEb21haW4ubGVuZ3RoOyArK2opIHsKLSAgICAgICAgICAgICAgICBpZiAoV2ViSW5zcGVjdG9y LkNvb2tpZVN0b3JhZ2VDb250ZW50Vmlldy5jb29raWVNYXRjaGVzUmVzb3VyY2VVUkwoY29va2ll c1tpXSwgcmVzb3VyY2VzRm9yRG9tYWluW2pdKSkgewotICAgICAgICAgICAgICAgICAgICBmaWx0 ZXJlZENvb2tpZXMucHVzaChjb29raWVzW2ldKTsKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7 Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfQorICAgICAgICBsZXQgYWxsUmVzb3Vy Y2VzID0gW107CisgICAgICAgIGZvciAobGV0IGZyYW1lIG9mIFdlYkluc3BlY3Rvci5mcmFtZVJl c291cmNlTWFuYWdlci5mcmFtZXMpIHsKKyAgICAgICAgICAgIC8vIFRoZSBtYWluIHJlc291cmNl IGlzbid0IGFsd2F5cyBpbiB0aGUgbGlzdCBvZiByZXNvdXJjZXMsIG1ha2Ugc3VyZSB0byBhZGQg aXQgYXMgYSBjYW5kaWRhdGUuCisgICAgICAgICAgICBhbGxSZXNvdXJjZXMgPSBhbGxSZXNvdXJj ZXMuY29uY2F0KFsuLi5mcmFtZS5yZXNvdXJjZXMsIGZyYW1lLm1haW5SZXNvdXJjZV0pOwogICAg ICAgICB9CiAKLSAgICAgICAgcmV0dXJuIGZpbHRlcmVkQ29va2llczsKKyAgICAgICAgbGV0IHJl c291cmNlc0ZvckRvbWFpbiA9IGFsbFJlc291cmNlcy5maWx0ZXIocmVzb3VyY2VNYXRjaGVzU3Rv cmFnZURvbWFpbik7CisKKyAgICAgICAgbGV0IGNvb2tpZXNGb3JEb21haW4gPSBjb29raWVzLmZp bHRlcigoY29va2llKSA9PiB7CisgICAgICAgICAgICByZXR1cm4gcmVzb3VyY2VzRm9yRG9tYWlu LnNvbWUoKHJlc291cmNlKSA9PiB7CisgICAgICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rv ci5Db29raWVTdG9yYWdlT2JqZWN0LmNvb2tpZU1hdGNoZXNSZXNvdXJjZVVSTChjb29raWUsIHJl c291cmNlLnVybCk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfSk7CisgICAgICAgIHJldHVy biBjb29raWVzRm9yRG9tYWluOwogICAgIH0KIAogICAgIF9zb3J0RGF0YUdyaWQoKQo=