142008 2015-02-24 23:14:06 -0800 Web Inspector: Improve PropertyPath display strings for getters / values 2015-02-25 07:04:11 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1071980 0 joepeck 2015-02-24 23:14:06 -0800 * SUMMARY Improve PropertyPath display strings for getters / values. js> dir([{property: {get value() { return 10; }}}]) <- ▼ 0: Object ▼ property: Object ▼ value: (...) Hovering value here should say: obj[0].property.__lookupGetter__("value") Once invoking the getter. Hovering value should say: obj[0].property.value We should elide __proto__ when dealing with values. We could probably keep them for getters, but lets leave them in to guarentee the absolute path. 1071981 1 webkit-bug-importer 2015-02-24 23:14:18 -0800 <rdar://problem/19949817> 1071982 2 247315 joepeck 2015-02-24 23:18:36 -0800 Created attachment 247315 [PATCH] Proposed Fix 1072053 3 247315 commit-queue 2015-02-25 07:04:06 -0800 Comment on attachment 247315 [PATCH] Proposed Fix Clearing flags on attachment: 247315 Committed r180624: <http://trac.webkit.org/changeset/180624> 1072054 4 commit-queue 2015-02-25 07:04:11 -0800 All reviewed patches have been landed. Closing bug. 247315 2015-02-24 23:18:36 -0800 2015-02-25 07:04:06 -0800 [PATCH] Proposed Fix displayPath.patch text/plain 9996 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDA2YjE4MzMuLmI5MmVlMGYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQyIEBACiAyMDE1LTAyLTI0ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSW1wcm92 ZSBQcm9wZXJ0eVBhdGggZGlzcGxheSBzdHJpbmdzIGZvciBnZXR0ZXJzIC8gdmFsdWVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDIwMDgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvQmFzZS9VdGlsaXRpZXMuanM6CisgICAgICAgIChkb3VibGVRdW90ZWRTdHJpbmcpOgorICAg ICAgICBIZWxwZXIgdG8gZG91YmxlIHF1b3RlIGEgc3RyaW5nIGFuZCBlc2NhcGUgZG91YmxlIHF1 b3RlcyB3aXRoLWluIGl0LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvUHJvcGVy dHlQYXRoLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb3BlcnR5UGF0aC5wcm90b3R5cGUu Z2V0IHJlZHVjZWRQYXRoKToKKyAgICAgICAgQ29tcHV0ZSB0aGUgcGF0aCBlbGltaW5hdGluZyB1 bm5lY2Vzc2FyeSBfX3Byb3RvX19zLiBOb3RlIHdlIGRvbid0CisgICAgICAgIHByb3BlcnR5IGhh bmRsZSB0aGUgY2FzZSB3aGVyZSBhIC5fX3Byb3RvX18ueCBpcyBvdmVycmlkZSBlYXJsaWVyCisg ICAgICAgIGJ5IGEgLngsIGJ1dCB0aGF0IGNhc2UgaXMgcmFyZS4KKworICAgICAgICAoV2ViSW5z cGVjdG9yLlByb3BlcnR5UGF0aC5wcm90b3R5cGUuZGlzcGxheVBhdGgpOgorICAgICAgICBIZWxw ZXIgZm9yIGNob29zaW5nIGZ1bGxQYXRoIG9yIHJlZHVjZWRQYXRoIGRpc3BsYXkgc3RyaW5ncy4K KworICAgICAgICAoV2ViSW5zcGVjdG9yLlByb3BlcnR5UGF0aC5wcm90b3R5cGUuYXBwZW5kUHJv cGVydHlOYW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9wZXJ0eVBhdGgucHJvdG90eXBl LmFwcGVuZEdldHRlclByb3BlcnR5TmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvcGVy dHlQYXRoLnByb3RvdHlwZS5hcHBlbmRTZXR0ZXJQcm9wZXJ0eU5hbWUpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlByb3BlcnR5UGF0aC5wcm90b3R5cGUuYXBwZW5kUHJvcGVydHlEZXNjcmlwdG9y KToKKyAgICAgICAgV2hlbiBhcHBlbmRpbmcgYSBkZXNjcmlwdG9yLCBzcGVjaWZ5IGlmIGl0IGlz IGZvciBhIGdldHRlci9zZXR0ZXIgb3IgdmFsdWUuCisgICAgICAgIEZvciBnZXR0ZXJzIC8gc2V0 dGVycyB0aGUgYWN0dWFsIGZ1bmN0aW9uIGNhbiBiZSBkaXJlY3RseSBmZXRjaGVkIHZpYQorICAg ICAgICBfX2xvb2t1cEdldHRlcl9fL19fbG9va3VwU2V0dGVyX18uIENvbnRpbnVlIHRvIHVzZSB0 aGUgcHJvcGVydHkgbmFtZSBmb3IgdmFsdWVzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9Gb3JtYXR0ZWRWYWx1ZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Gb3JtYXR0ZWRW YWx1ZS5jcmVhdGVFbGVtZW50Rm9yVHlwZXNBbmRWYWx1ZSk6CisKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVQcm9wZXJ0eVRyZWVFbGVtZW50LmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLk9iamVjdFRyZWVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZS5fcHJv cGVydHlQYXRoVHlwZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT2JqZWN0VHJlZVByb3BlcnR5 VHJlZUVsZW1lbnQucHJvdG90eXBlLl9yZXNvbHZlZFZhbHVlUHJvcGVydHlQYXRoKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5PYmplY3RUcmVlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUu X3RoaXNQcm9wZXJ0eVBhdGgpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFRyZWVQcm9w ZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZSk6CisKKzIwMTUtMDItMjQgIEpvc2VwaCBQZWNvcmFy byAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBFbGltaW5h dGUgY29uc29sZS1mb3JtYXR0ZWQtKiBjbGFzcyBuYW1lcyBpbiBmYXZvciBvZiBmb3JtYXR0ZWQt KgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxOTQ4 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2Uv VXRpbGl0aWVzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9V dGlsaXRpZXMuanMKaW5kZXggY2EzYjk5Yi4uNDA1ZmRmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMKQEAgLTEwMzEs NiArMTAzMSwxMSBAQCBmdW5jdGlvbiBpc0Z1bmN0aW9uU3RyaW5nTmF0aXZlQ29kZShzdHIpCiAg ICAgcmV0dXJuIHN0ci5lbmRzV2l0aCgie1xuICAgIFtuYXRpdmUgY29kZV1cbn0iKTsKIH0KIAor ZnVuY3Rpb24gZG91YmxlUXVvdGVkU3RyaW5nKHN0cikKK3sKKyAgICByZXR1cm4gIlwiIiArIHN0 ci5yZXBsYWNlKC8iL2csICJcXFwiIikgKyAiXCIiOworfQorCiBmdW5jdGlvbiBjbGFtcChtaW4s IHZhbHVlLCBtYXgpCiB7CiAgICAgcmV0dXJuIE1hdGgubWluKE1hdGgubWF4KG1pbiwgdmFsdWUp LCBtYXgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv TW9kZWxzL1Byb3BlcnR5UGF0aC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL01vZGVscy9Qcm9wZXJ0eVBhdGguanMKaW5kZXggMzgxZWRkYi4uYWY1MmI1MyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Byb3BlcnR5 UGF0aC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMv UHJvcGVydHlQYXRoLmpzCkBAIC01MCw2ICs1MCwxMiBAQCBXZWJJbnNwZWN0b3IuUHJvcGVydHlQ YXRoLlNwZWNpYWxQYXRoQ29tcG9uZW50ID0gewogICAgIEdldHRlclByb3BlcnR5TmFtZTogIkBn ZXR0ZXIiLAogfTsKIAorV2ViSW5zcGVjdG9yLlByb3BlcnR5UGF0aC5UeXBlID0geworICAgIFZh bHVlOiAidmFsdWUiLAorICAgIEdldHRlcjogImdldHRlciIsCisgICAgU2V0dGVyOiAic2V0dGVy IiwKK307CisKIFdlYkluc3BlY3Rvci5Qcm9wZXJ0eVBhdGgucHJvdG90eXBlID0gewogICAgIGNv bnN0cnVjdG9yOiBXZWJJbnNwZWN0b3IuUHJvcGVydHlQYXRoLAogICAgIF9fcHJvdG9fXzogV2Vi SW5zcGVjdG9yLk9iamVjdC5wcm90b3R5cGUsCkBAIC0xMDcsNiArMTEzLDM1IEBAIFdlYkluc3Bl Y3Rvci5Qcm9wZXJ0eVBhdGgucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gY29tcG9uZW50 cy5qb2luKCIiKTsKICAgICB9LAogCisgICAgZ2V0IHJlZHVjZWRQYXRoKCkKKyAgICB7CisgICAg ICAgIC8vIFRoZSBkaXNwbGF5IHBhdGggZm9yIGEgdmFsdWUgc2hvdWxkIG5vdCBpbmNsdWRlIF9f cHJvdG9fXy4KKyAgICAgICAgLy8gVGhlIHBhdGggZm9yICJmb28uX19wcm90b19fLmJhci5fX3By b3RvX18ueCIgaXMgYmV0dGVyIHNob3duIGFzICJmb28uYmFyLngiLgorICAgICAgICAvLyBGSVhN RTogV2Ugc2hvdWxkIGtlZXAgX19wcm90b19fIGlmIHRoaXMgcHJvcGVydHkgd2FzIG92ZXJyaWRk ZW4uCisgICAgICAgIHZhciBjb21wb25lbnRzID0gW107CisKKyAgICAgICAgdmFyIHAgPSB0aGlz OworCisgICAgICAgIC8vIEluY2x1ZGUgdHJhaWxpbmcgX19wcm90b19fcy4KKyAgICAgICAgZm9y ICg7IHAgJiYgcC5pc1Byb3RvdHlwZTsgcCA9IHAucGFyZW50KQorICAgICAgICAgICAgY29tcG9u ZW50cy5wdXNoKHAucGF0aENvbXBvbmVudCk7CisKKyAgICAgICAgLy8gU2tpcCBvdGhlciBfX3By b3RvX19zLgorICAgICAgICBmb3IgKDsgcCAmJiBwLnBhdGhDb21wb25lbnQ7IHAgPSBwLnBhcmVu dCkgeworICAgICAgICAgICAgaWYgKHAuaXNQcm90b3R5cGUpCisgICAgICAgICAgICAgICAgY29u dGludWU7CisgICAgICAgICAgICBjb21wb25lbnRzLnB1c2gocC5wYXRoQ29tcG9uZW50KTsKKyAg ICAgICAgfQorCisgICAgICAgIGNvbXBvbmVudHMucmV2ZXJzZSgpOworICAgICAgICByZXR1cm4g Y29tcG9uZW50cy5qb2luKCIiKTsgICAgICAgIAorICAgIH0sCisKKyAgICBkaXNwbGF5UGF0aDog ZnVuY3Rpb24odHlwZSkKKyAgICB7CisgICAgICAgIHJldHVybiB0eXBlID09PSBXZWJJbnNwZWN0 b3IuUHJvcGVydHlQYXRoLlR5cGUuVmFsdWUgPyB0aGlzLnJlZHVjZWRQYXRoIDogdGhpcy5mdWxs UGF0aDsKKyAgICB9LAorCiAgICAgaXNSb290OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBy ZXR1cm4gIXRoaXMuX3BhcmVudDsKQEAgLTEzMSw3ICsxNjYsNyBAQCBXZWJJbnNwZWN0b3IuUHJv cGVydHlQYXRoLnByb3RvdHlwZSA9IHsKICAgICBhcHBlbmRQcm9wZXJ0eU5hbWU6IGZ1bmN0aW9u KG9iamVjdCwgcHJvcGVydHlOYW1lKQogICAgIHsKICAgICAgICAgdmFyIGlzUHJvdG90eXBlID0g cHJvcGVydHlOYW1lID09PSAiX19wcm90b19fIjsKLSAgICAgICAgdmFyIGNvbXBvbmVudCA9IHRo aXMuX2NhblByb3BlcnR5TmFtZUJlRG90QWNjZXNzKHByb3BlcnR5TmFtZSkgPyAiLiIgKyBwcm9w ZXJ0eU5hbWUgOiAiW1wiIiArIHByb3BlcnR5TmFtZS5yZXBsYWNlKC8iLywgIlxcXCIiKSArICJc Il0iOworICAgICAgICB2YXIgY29tcG9uZW50ID0gdGhpcy5fY2FuUHJvcGVydHlOYW1lQmVEb3RB Y2Nlc3MocHJvcGVydHlOYW1lKSA/ICIuIiArIHByb3BlcnR5TmFtZSA6ICJbIiArIGRvdWJsZVF1 b3RlZFN0cmluZyhwcm9wZXJ0eU5hbWUpICsgIl0iOwogICAgICAgICByZXR1cm4gbmV3IFdlYklu c3BlY3Rvci5Qcm9wZXJ0eVBhdGgob2JqZWN0LCBjb21wb25lbnQsIHRoaXMsIGlzUHJvdG90eXBl KTsKICAgICB9LAogCkBAIC0xNDcsNiArMTgyLDE4IEBAIFdlYkluc3BlY3Rvci5Qcm9wZXJ0eVBh dGgucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5Qcm9wZXJ0 eVBhdGgob2JqZWN0LCBjb21wb25lbnQsIHRoaXMpOwogICAgIH0sCiAKKyAgICBhcHBlbmRHZXR0 ZXJQcm9wZXJ0eU5hbWU6IGZ1bmN0aW9uKG9iamVjdCwgcHJvcGVydHlOYW1lKQorICAgIHsKKyAg ICAgICAgdmFyIGNvbXBvbmVudCA9ICIuX19sb29rdXBHZXR0ZXJfXygiICsgZG91YmxlUXVvdGVk U3RyaW5nKHByb3BlcnR5TmFtZSkgKyAiKSI7CisgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVj dG9yLlByb3BlcnR5UGF0aChvYmplY3QsIGNvbXBvbmVudCwgdGhpcyk7CisgICAgfSwKKworICAg IGFwcGVuZFNldHRlclByb3BlcnR5TmFtZTogZnVuY3Rpb24ob2JqZWN0LCBwcm9wZXJ0eU5hbWUp CisgICAgeworICAgICAgICB2YXIgY29tcG9uZW50ID0gIi5fX2xvb2t1cFNldHRlcl9fKCIgKyBk b3VibGVRdW90ZWRTdHJpbmcocHJvcGVydHlOYW1lKSArICIpIjsKKyAgICAgICAgcmV0dXJuIG5l dyBXZWJJbnNwZWN0b3IuUHJvcGVydHlQYXRoKG9iamVjdCwgY29tcG9uZW50LCB0aGlzKTsKKyAg ICB9LAorCiAgICAgYXBwZW5kQXJyYXlJbmRleDogZnVuY3Rpb24ob2JqZWN0LCBpbmRleFN0cmlu ZykKICAgICB7CiAgICAgICAgIHZhciBjb21wb25lbnQgPSAiWyIgKyBpbmRleFN0cmluZyArICJd IjsKQEAgLTE1OSwxMSArMjA2LDE4IEBAIFdlYkluc3BlY3Rvci5Qcm9wZXJ0eVBhdGgucHJvdG90 eXBlID0gewogICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5Qcm9wZXJ0eVBhdGgob2Jq ZWN0LCBjb21wb25lbnQsIHRoaXMpOwogICAgIH0sCiAKLSAgICBhcHBlbmRQcm9wZXJ0eURlc2Ny aXB0b3I6IGZ1bmN0aW9uKG9iamVjdCwgZGVzY3JpcHRvcikKKyAgICBhcHBlbmRQcm9wZXJ0eURl c2NyaXB0b3I6IGZ1bmN0aW9uKG9iamVjdCwgZGVzY3JpcHRvciwgdHlwZSkKICAgICB7CiAgICAg ICAgIGlmIChkZXNjcmlwdG9yLmlzSW50ZXJuYWxQcm9wZXJ0eSkKICAgICAgICAgICAgIHJldHVy biB0aGlzLmFwcGVuZEludGVybmFsUHJvcGVydHlOYW1lKG9iamVjdCwgZGVzY3JpcHRvci5uYW1l KTsKIAorICAgICAgICBpZiAodHlwZSA9PT0gV2ViSW5zcGVjdG9yLlByb3BlcnR5UGF0aC5UeXBl LkdldHRlcikKKyAgICAgICAgICAgIHJldHVybiB0aGlzLmFwcGVuZEdldHRlclByb3BlcnR5TmFt ZShvYmplY3QsIGRlc2NyaXB0b3IubmFtZSk7CisgICAgICAgIGlmICh0eXBlID09PSBXZWJJbnNw ZWN0b3IuUHJvcGVydHlQYXRoLlR5cGUuU2V0dGVyKQorICAgICAgICAgICAgcmV0dXJuIHRoaXMu YXBwZW5kU2V0dGVyUHJvcGVydHlOYW1lKG9iamVjdCwgZGVzY3JpcHRvci5uYW1lKTsKKworICAg ICAgICBjb25zb2xlLmFzc2VydCh0eXBlID09PSBXZWJJbnNwZWN0b3IuUHJvcGVydHlQYXRoLlR5 cGUuVmFsdWUpOworCiAgICAgICAgIC8vIEZJWE1FOiBXZSBkb24ndCB5ZXQgaGF2ZSBTeW1ib2wg ZGVzY3JpcHRvcnMuCiAKICAgICAgICAgaWYgKHRoaXMuX29iamVjdC5zdWJ0eXBlID09PSAiYXJy YXkiICYmICFpc05hTihwYXJzZUludChkZXNjcmlwdG9yLm5hbWUpKSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Zvcm1hdHRlZFZhbHVlLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9ybWF0dGVkVmFs dWUuanMKaW5kZXggMGIxY2M5YS4uNTAwYWRiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9ybWF0dGVkVmFsdWUuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9ybWF0dGVkVmFsdWUuanMKQEAg LTgyLDcgKzgyLDcgQEAgV2ViSW5zcGVjdG9yLkZvcm1hdHRlZFZhbHVlLmNyZWF0ZUVsZW1lbnRG b3JUeXBlc0FuZFZhbHVlID0gZnVuY3Rpb24odHlwZSwgc3VidHkKIAogICAgIC8vIFN0cmluZzog cXVvdGVkIGFuZCByZXBsYWNlIG5ld2xpbmVzIGFzIG5pY2UgdW5pY29kZSBzeW1ib2xzLgogICAg IGlmICh0eXBlID09PSAic3RyaW5nIikgewotICAgICAgICBzcGFuLnRleHRDb250ZW50ID0gIlwi IiArIGRpc3BsYXlTdHJpbmcucmVwbGFjZSgvXG4vZywgIlx1MjFCNSIpLnJlcGxhY2UoLyIvZywg IlxcXCIiKSArICJcIiI7CisgICAgICAgIHNwYW4udGV4dENvbnRlbnQgPSBkb3VibGVRdW90ZWRT dHJpbmcoZGlzcGxheVN0cmluZy5yZXBsYWNlKC9cbi9nLCAiXHUyMUI1IikpOwogICAgICAgICBy ZXR1cm4gc3BhbjsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVQcm9wZXJ0eVRyZWVFbGVtZW50LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVByb3BlcnR5 VHJlZUVsZW1lbnQuanMKaW5kZXggYmI1MWU1ZS4uYjIyYWZhMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVByb3BlcnR5VHJl ZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvT2JqZWN0VHJlZVByb3BlcnR5VHJlZUVsZW1lbnQuanMKQEAgLTEwMSwyMyArMTAxLDMxIEBA IFdlYkluc3BlY3Rvci5PYmplY3RUcmVlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHJldHVybiBudWxsOwogICAgIH0sCiAKKyAgICBfcHJvcGVydHlQYXRoVHlwZTog ZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2dldHRlclZhbHVlIHx8IHRoaXMu X3Byb3BlcnR5Lmhhc1ZhbHVlKCkpCisgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlBy b3BlcnR5UGF0aC5UeXBlLlZhbHVlOworICAgICAgICBpZiAodGhpcy5fcHJvcGVydHkuaGFzR2V0 dGVyKCkpCisgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlByb3BlcnR5UGF0aC5UeXBl LkdldHRlcjsKKyAgICAgICAgaWYgKHRoaXMuX3Byb3BlcnR5Lmhhc1NldHRlcigpKQorICAgICAg ICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5Qcm9wZXJ0eVBhdGguVHlwZS5TZXR0ZXI7CisgICAg ICAgIHJldHVybiBXZWJJbnNwZWN0b3IuUHJvcGVydHlQYXRoLlR5cGUuVmFsdWU7CisgICAgfSwK KwogICAgIF9yZXNvbHZlZFZhbHVlUHJvcGVydHlQYXRoOiBmdW5jdGlvbigpCiAgICAgewotICAg ICAgICAvLyBGSVhNRTogV2UgY291bGQgbWFrZSBhIGJldHRlciBwYXRoIGhlcmUuCi0gICAgICAg IC8vIElmIHRoaXMgZ2V0dGVyIHdhcyBub3Qgb3ZlcnJpZGRlbiwgdGhlbiA8dGhpcy5fcHJvcGVy dHlQYXRoLmxhc3ROb25Qcm90b3R5cGVPYmplY3Q+Wzx0aGlzLl9wcm9wZXJ0eS5uYW1lPl0gaXMg YSB2YWxpZCBwYXRoLgotICAgICAgICAvLyBIb3dldmVyLCB3ZSBjYW5ub3QgZWFzaWx5IGRldGVy bWluZSBmcm9tIGhlcmUgaWYgdGhpcyBnZXR0ZXIgd2FzIG92ZXJyaWRkZW4gb3Igbm90LgogICAg ICAgICBpZiAodGhpcy5fZ2V0dGVyVmFsdWUpCi0gICAgICAgICAgICByZXR1cm4gbmV3IFdlYklu c3BlY3Rvci5Qcm9wZXJ0eVBhdGgodGhpcy5fZ2V0dGVyVmFsdWUsIFdlYkluc3BlY3Rvci5Qcm9w ZXJ0eVBhdGguU3BlY2lhbFBhdGhDb21wb25lbnQuR2V0dGVyUHJvcGVydHlOYW1lKTsKKyAgICAg ICAgICAgIHJldHVybiB0aGlzLl9wcm9wZXJ0eVBhdGguYXBwZW5kUHJvcGVydHlEZXNjcmlwdG9y KHRoaXMuX2dldHRlclZhbHVlLCB0aGlzLl9wcm9wZXJ0eSwgV2ViSW5zcGVjdG9yLlByb3BlcnR5 UGF0aC5UeXBlLlZhbHVlKTsKIAogICAgICAgICBpZiAodGhpcy5fcHJvcGVydHkuaGFzVmFsdWUo KSkKLSAgICAgICAgICAgIHJldHVybiB0aGlzLl9wcm9wZXJ0eVBhdGguYXBwZW5kUHJvcGVydHlE ZXNjcmlwdG9yKHRoaXMuX3Byb3BlcnR5LnZhbHVlLCB0aGlzLl9wcm9wZXJ0eSk7CisgICAgICAg ICAgICByZXR1cm4gdGhpcy5fcHJvcGVydHlQYXRoLmFwcGVuZFByb3BlcnR5RGVzY3JpcHRvcih0 aGlzLl9wcm9wZXJ0eS52YWx1ZSwgdGhpcy5fcHJvcGVydHksIFdlYkluc3BlY3Rvci5Qcm9wZXJ0 eVBhdGguVHlwZS5WYWx1ZSk7CiAKICAgICAgICAgcmV0dXJuIG51bGw7CiAgICAgfSwKIAogICAg IF90aGlzUHJvcGVydHlQYXRoOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICByZXR1cm4gdGhp cy5fcHJvcGVydHlQYXRoLmFwcGVuZFByb3BlcnR5RGVzY3JpcHRvcihudWxsLCB0aGlzLl9wcm9w ZXJ0eSk7CisgICAgICAgIHJldHVybiB0aGlzLl9wcm9wZXJ0eVBhdGguYXBwZW5kUHJvcGVydHlE ZXNjcmlwdG9yKG51bGwsIHRoaXMuX3Byb3BlcnR5LCB0aGlzLl9wcm9wZXJ0eVBhdGhUeXBlKCkp OwogICAgIH0sCiAKICAgICBfdXBkYXRlSGFzQ2hpbGRyZW46IGZ1bmN0aW9uKCkKQEAgLTM3NCw3 ICszODIsNyBAQCBXZWJJbnNwZWN0b3IuT2JqZWN0VHJlZVByb3BlcnR5VHJlZUVsZW1lbnQucHJv dG90eXBlID0gewogICAgICAgICBpZiAocHJvcGVydHlQYXRoLmlzRnVsbFBhdGhJbXBvc3NpYmxl KCkpCiAgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJVbmFibGUgdG8g ZGV0ZXJtaW5lIHBhdGggdG8gcHJvcGVydHkgZnJvbSByb290Iik7CiAKLSAgICAgICAgcmV0dXJu IHByb3BlcnR5UGF0aC5mdWxsUGF0aDsKKyAgICAgICAgcmV0dXJuIHByb3BlcnR5UGF0aC5kaXNw bGF5UGF0aCh0aGlzLl9wcm9wZXJ0eVBhdGhUeXBlKCkpOwogICAgIH0sCiAKICAgICBfdXBkYXRl Q2hpbGRyZW46IGZ1bmN0aW9uKCkK