142125 2015-02-27 19:55:16 -0800 Web Inspector: Add Context Menus to Object Tree properties 2015-03-02 11:33:57 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck webkit-unassigned graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1072970 0 joepeck 2015-02-27 19:55:16 -0800 * SUMMARY Add Context Menus to Object Tree properties. Things like: - copy path to property - jump to function definition - reveal node in DOM tree 1072971 1 247584 joepeck 2015-02-27 20:00:31 -0800 Created attachment 247584 [PATCH] Proposed Fix This avoids context menus on Array indexes. I will have to come up with a better way to share the code between ArrayTreeElement and PropertyTreeElement. I'm thinking of making an ObjectTreeBaseTreeElement for the shared logic. 1072977 2 247584 timothy 2015-02-27 21:03:04 -0800 Comment on attachment 247584 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=247584&action=review > Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp:169 > + // FIXME: This should provide better details for JSBoundFunctions. Yes! 1072978 3 timothy 2015-02-27 21:03:36 -0800 ObjectTreeBaseTreeElement sounds like a good idea. 1073395 4 joepeck 2015-03-02 11:33:57 -0800 http://trac.webkit.org/changeset/180891 247584 2015-02-27 20:00:31 -0800 2015-03-02 11:31:31 -0800 [PATCH] Proposed Fix context-menus.patch text/plain 12375 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDk3ZTIxYWMuLmNjMzU3ZDggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE1LTAyLTI3ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkIENv bnRleHQgTWVudXMgdG8gT2JqZWN0IFRyZWUgcHJvcGVydGllcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyMTI1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSlNJbmplY3RlZFNjcmlw dEhvc3QuY3BwOgorICAgICAgICAoSW5zcGVjdG9yOjpKU0luamVjdGVkU2NyaXB0SG9zdDo6ZnVu Y3Rpb25EZXRhaWxzKToKKyAgICAgICAgVXBkYXRlIHRvIGluY2x1ZGUgY29sdW1uTnVtYmVyLgor CiAyMDE1LTAyLTI2ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAgICAg VW5yZXZpZXdlZCwgcm9sbCBvdXQgcjE4MDcyMy4gSXQgYnJva2UgYSBidW5jaCBvZiB0ZXN0cy4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSlNJbmplY3RlZFNj cmlwdEhvc3QuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0luamVjdGVk U2NyaXB0SG9zdC5jcHAKaW5kZXggNWIzZDNlNi4uZDI5ZDM2ZiAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0luamVjdGVkU2NyaXB0SG9zdC5jcHAKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0luamVjdGVkU2NyaXB0SG9zdC5jcHAK QEAgLTE2NiwxOSArMTY2LDI2IEBAIEpTVmFsdWUgSlNJbmplY3RlZFNjcmlwdEhvc3Q6OmZ1bmN0 aW9uRGV0YWlscyhFeGVjU3RhdGUqIGV4ZWMpCiAgICAgaWYgKCF2YWx1ZS5hc0NlbGwoKS0+aW5o ZXJpdHMoSlNGdW5jdGlvbjo6aW5mbygpKSkKICAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7 CiAKKyAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgcHJvdmlkZSBiZXR0ZXIgZGV0YWlscyBmb3Ig SlNCb3VuZEZ1bmN0aW9ucy4KKwogICAgIEpTRnVuY3Rpb24qIGZ1bmN0aW9uID0ganNDYXN0PEpT RnVuY3Rpb24qPih2YWx1ZSk7CiAgICAgY29uc3QgU291cmNlQ29kZSogc291cmNlQ29kZSA9IGZ1 bmN0aW9uLT5zb3VyY2VDb2RlKCk7CiAgICAgaWYgKCFzb3VyY2VDb2RlKQogICAgICAgICByZXR1 cm4ganNVbmRlZmluZWQoKTsKIAorICAgIC8vIEluIHRoZSBpbnNwZWN0b3IgcHJvdG9jb2wgYWxs IHBvc2l0aW9ucyBhcmUgMC1iYXNlZCB3aGlsZSBpbiBTb3VyY2VDb2RlIHRoZXkgYXJlIDEtYmFz ZWQKICAgICBpbnQgbGluZU51bWJlciA9IHNvdXJjZUNvZGUtPmZpcnN0TGluZSgpOwogICAgIGlm IChsaW5lTnVtYmVyKQotICAgICAgICBsaW5lTnVtYmVyIC09IDE7IC8vIEluIHRoZSBpbnNwZWN0 b3IgcHJvdG9jb2wgYWxsIHBvc2l0aW9ucyBhcmUgMC1iYXNlZCB3aGlsZSBpbiBTb3VyY2VDb2Rl IHRoZXkgYXJlIDEtYmFzZWQKKyAgICAgICAgbGluZU51bWJlciAtPSAxOworICAgIGludCBjb2x1 bW5OdW1iZXIgPSBzb3VyY2VDb2RlLT5zdGFydENvbHVtbigpOworICAgIGlmIChjb2x1bW5OdW1i ZXIpCisgICAgICAgIGNvbHVtbk51bWJlciAtPSAxOwogCiAgICAgU3RyaW5nIHNjcmlwdElEID0g U3RyaW5nOjpudW1iZXIoc291cmNlQ29kZS0+cHJvdmlkZXIoKS0+YXNJRCgpKTsKICAgICBKU09i amVjdCogbG9jYXRpb24gPSBjb25zdHJ1Y3RFbXB0eU9iamVjdChleGVjKTsKLSAgICBsb2NhdGlv bi0+cHV0RGlyZWN0KGV4ZWMtPnZtKCksIElkZW50aWZpZXIoZXhlYywgImxpbmVOdW1iZXIiKSwg anNOdW1iZXIobGluZU51bWJlcikpOwogICAgIGxvY2F0aW9uLT5wdXREaXJlY3QoZXhlYy0+dm0o KSwgSWRlbnRpZmllcihleGVjLCAic2NyaXB0SWQiKSwganNTdHJpbmcoZXhlYywgc2NyaXB0SUQp KTsKKyAgICBsb2NhdGlvbi0+cHV0RGlyZWN0KGV4ZWMtPnZtKCksIElkZW50aWZpZXIoZXhlYywg ImxpbmVOdW1iZXIiKSwganNOdW1iZXIobGluZU51bWJlcikpOworICAgIGxvY2F0aW9uLT5wdXRE aXJlY3QoZXhlYy0+dm0oKSwgSWRlbnRpZmllcihleGVjLCAiY29sdW1uTnVtYmVyIiksIGpzTnVt YmVyKGNvbHVtbk51bWJlcikpOwogCiAgICAgSlNPYmplY3QqIHJlc3VsdCA9IGNvbnN0cnVjdEVt cHR5T2JqZWN0KGV4ZWMpOwogICAgIHJlc3VsdC0+cHV0RGlyZWN0KGV4ZWMtPnZtKCksIElkZW50 aWZpZXIoZXhlYywgImxvY2F0aW9uIiksIGxvY2F0aW9uKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9n CmluZGV4IDU5YWQ5M2MuLjM1OTM2NDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSw1 ICsxLDI4IEBACiAyMDE1LTAyLTI3ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5j b20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkIENvbnRleHQgTWVudXMgdG8gT2JqZWN0 IFRyZWUgcHJvcGVydGllcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTQyMTI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBMb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6Cisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlw ZS5fZnVuY3Rpb25Db250ZXh0TWVudUV2ZW50RmlyZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk9iamVjdFByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlLl9mdW5jdGlvbkNvbnRleHRNZW51 RXZlbnRGaXJlZC5yZXZlYWxGdW5jdGlvbik6CisgICAgICAgIEZpeCBsZWdhY3kgaW1wbGVtZW50 YXRpb24uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVBcnJheUlu ZGV4VHJlZUVsZW1lbnQuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RU cmVlUHJvcGVydHlUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PYmplY3RU cmVlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUuX2NyZWF0ZVRpdGxlUHJvdG90eXBlKToK KyAgICAgICAgR2l2ZSBwcm90b3R5cGUgYnV0dG9ucyBhIHRvb2x0aXAuCisKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5PYmplY3RUcmVlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUub25jb250 ZXh0bWVudSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT2JqZWN0VHJlZVByb3BlcnR5VHJlZUVs ZW1lbnQucHJvdG90eXBlLl9jb250ZXh0TWVudUhhbmRsZXIpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLk9iamVjdFRyZWVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZS5fYXBwZW5kTWVudXNJ dGVtc0Zvck9iamVjdCk6CisgICAgICAgIENvbnRleHQgTWVudXMgYmFzZWQgb24gdGhlIHNlbGVj dGVkIG9iamVjdC4KKworMjAxNS0wMi0yNyAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBw bGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFVzZSBNYXBzIGluIFJlc291cmNlQ29s bGVjdGlvbiBpbnN0ZWFkIG9mIG9iamVjdHMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0MjEwMQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5q cwppbmRleCBjNjA3NTJiYjM2MjU1NWNhZWUzNzVjNmZjYmM1MDQyNzA4YjIxYjkxLi42NDIzYTRk MTE5Yjc4Mjg3ZTBkMTBlNjcxODhmNDRiYWUwMTUxYTUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXpl ZFN0cmluZ3MuanMKQEAgLTExOCw2ICsxMTgsNyBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJDb250aW51 ZSBzY3JpcHQgZXhlY3V0aW9uICglcyBvciAlcykiXSA9ICJDb250aW51ZSBzY3JpcHQgZXhlYwog bG9jYWxpemVkU3RyaW5nc1siQ29udGludWUgdG8gSGVyZSJdID0gIkNvbnRpbnVlIHRvIEhlcmUi OwogbG9jYWxpemVkU3RyaW5nc1siQ29udHJvbHMiXSA9ICJDb250cm9scyI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJDb29raWVzIl0gPSAiQ29va2llcyI7Citsb2NhbGl6ZWRTdHJpbmdzWyJDb3B5IFBh dGggdG8gUHJvcGVydHkiXSA9ICJDb3B5IFBhdGggdG8gUHJvcGVydHkiOwogbG9jYWxpemVkU3Ry aW5nc1siQ29weSBSb3ciXSA9ICJDb3B5IFJvdyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDb3B5IGFz IEhUTUwiXSA9ICJDb3B5IGFzIEhUTUwiOwogbG9jYWxpemVkU3RyaW5nc1siQ291bGQgbm90IGZl dGNoIHByb3BlcnRpZXMuIE9iamVjdCBtYXkgbm8gbG9uZ2VyIGV4aXN0LiJdID0gIkNvdWxkIG5v dCBmZXRjaCBwcm9wZXJ0aWVzLiBPYmplY3QgbWF5IG5vIGxvbmdlciBleGlzdC4iOwpAQCAtMjYy LDYgKzI2Myw3IEBAIGxvY2FsaXplZFN0cmluZ3NbIkluc3BlY3QiXSA9ICJJbnNwZWN0IjsKIGxv Y2FsaXplZFN0cmluZ3NbIkludmFsaWQiXSA9ICJJbnZhbGlkIjsKIGxvY2FsaXplZFN0cmluZ3Nb Ikludm9rZSBnZXR0ZXIiXSA9ICJJbnZva2UgZ2V0dGVyIjsKIGxvY2FsaXplZFN0cmluZ3NbIkph dmFTY3JpcHQgJiBFdmVudHMiXSA9ICJKYXZhU2NyaXB0ICYgRXZlbnRzIjsKK2xvY2FsaXplZFN0 cmluZ3NbIkp1bXAgdG8gRGVmaW5pdGlvbiJdID0gIkp1bXAgdG8gRGVmaW5pdGlvbiI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJLZWVwIExvZyBvbiBSZWxvYWQiXSA9ICJLZWVwIExvZyBvbiBSZWxvYWQi OwogbG9jYWxpemVkU3RyaW5nc1siS2V5Il0gPSAiS2V5IjsKIGxvY2FsaXplZFN0cmluZ3NbIkxh YmVsIl0gPSAiTGFiZWwiOwpAQCAtNDEzLDcgKzQxNSw2IEBAIGxvY2FsaXplZFN0cmluZ3NbIlNo b3cgUmVwbGF5IENvbnRyb2xzIl0gPSAiU2hvdyBSZXBsYXkgQ29udHJvbHMiOwogbG9jYWxpemVk U3RyaW5nc1siU2hvdyBjb21wb3NpdGluZyBib3JkZXJzIl0gPSAiU2hvdyBjb21wb3NpdGluZyBi b3JkZXJzIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgY29uc29sZSAoJXMpIl0gPSAiU2hvdyBj b25zb2xlICglcykiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBmdWxsLWhlaWdodCBjb25zb2xl Il0gPSAiU2hvdyBmdWxsLWhlaWdodCBjb25zb2xlIjsKLWxvY2FsaXplZFN0cmluZ3NbIlNob3cg ZnVuY3Rpb24gZGVmaW5pdGlvbiJdID0gIlNob3cgZnVuY3Rpb24gZGVmaW5pdGlvbiI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJTaG93IHNoYWRvdyBET00gbm9kZXMiXSA9ICJTaG93IHNoYWRvdyBET00g bm9kZXMiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBzcGxpdCBjb25zb2xlIl0gPSAiU2hvdyBz cGxpdCBjb25zb2xlIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgdGhlICVzIGRldGFpbHMgc2lk ZWJhciJdID0gIlNob3cgdGhlICVzIGRldGFpbHMgc2lkZWJhciI7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RQcm9wZXJ0aWVzU2Vj dGlvbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVj dFByb3BlcnRpZXNTZWN0aW9uLmpzCmluZGV4IDI4NGFlNDIuLjYzZDBiOTYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFByb3BlcnRp ZXNTZWN0aW9uLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzCkBAIC0yNTcsMjAgKzI1NywyNSBAQCBXZWJJ bnNwZWN0b3IuT2JqZWN0UHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgewog ICAgICAgICBmdW5jdGlvbiBkaWRHZXRMb2NhdGlvbihlcnJvciwgcmVzcG9uc2UpCiAgICAgICAg IHsKLSAgICAgICAgICAgIGlmIChlcnJvcikgewotICAgICAgICAgICAgICAgIGNvbnNvbGUuZXJy b3IoZXJyb3IpOworICAgICAgICAgICAgaWYgKGVycm9yKQogICAgICAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0 cy5zaG93RnVuY3Rpb25EZWZpbml0aW9uKHJlc3BvbnNlKTsKKworICAgICAgICAgICAgdmFyIGxv Y2F0aW9uID0gcmVzcG9uc2UubG9jYXRpb247CisgICAgICAgICAgICB2YXIgc291cmNlQ29kZSA9 IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIuc2NyaXB0Rm9ySWRlbnRpZmllcihsb2NhdGlv bi5zY3JpcHRJZCk7CisgICAgICAgICAgICBpZiAoIXNvdXJjZUNvZGUpCisgICAgICAgICAgICAg ICAgcmV0dXJuOworCisgICAgICAgICAgICB2YXIgc291cmNlQ29kZUxvY2F0aW9uID0gc291cmNl Q29kZS5jcmVhdGVTb3VyY2VDb2RlTG9jYXRpb24obG9jYXRpb24ubGluZU51bWJlciwgbG9jYXRp b24uY29sdW1uTnVtYmVyIHx8IDApOworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnJlc291cmNl U2lkZWJhclBhbmVsLnNob3dTb3VyY2VDb2RlTG9jYXRpb24oc291cmNlQ29kZUxvY2F0aW9uKTsK ICAgICAgICAgfQogCiAgICAgICAgIGZ1bmN0aW9uIHJldmVhbEZ1bmN0aW9uKCkKICAgICAgICAg ewotICAgICAgICAgICAgRGVidWdnZXJBZ2VudC5nZXRGdW5jdGlvbkxvY2F0aW9uKHRoaXMucHJv cGVydHkudmFsdWUub2JqZWN0SWQsIGRpZEdldExvY2F0aW9uLmJpbmQodGhpcykpOworICAgICAg ICAgICAgRGVidWdnZXJBZ2VudC5nZXRGdW5jdGlvbkRldGFpbHModGhpcy5wcm9wZXJ0eS52YWx1 ZS5vYmplY3RJZCwgZGlkR2V0TG9jYXRpb24pOwogICAgICAgICB9CiAKICAgICAgICAgdmFyIGNv bnRleHRNZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudShldmVudCk7Ci0gICAgICAg IGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaG93IGZ1bmN0 aW9uIGRlZmluaXRpb24iKSwgcmV2ZWFsRnVuY3Rpb24uYmluZCh0aGlzKSk7CisgICAgICAgIGNv bnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJKdW1wIHRvIERlZmlu aXRpb24iKSwgcmV2ZWFsRnVuY3Rpb24uYmluZCh0aGlzKSk7CiAgICAgICAgIGNvbnRleHRNZW51 LnNob3coKTsKICAgICB9LAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9PYmplY3RUcmVlQXJyYXlJbmRleFRyZWVFbGVtZW50LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZUFycmF5SW5k ZXhUcmVlRWxlbWVudC5qcwppbmRleCAwODJiMjNiLi4wYTU4YmFhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RUcmVlQXJyYXlJbmRl eFRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL09iamVjdFRyZWVBcnJheUluZGV4VHJlZUVsZW1lbnQuanMKQEAgLTIzLDcgKzIzLDcg QEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCi0vLyBGSVhNRTog VGhpcyBzaG91bGQgc2hhcmUgbW9yZSBjb2RlIHdpdGggT2JqZWN0VHJlZVByb3BlcnR5VHJlZUVs ZW1lbnQuCisvLyBGSVhNRTogVGhpcyBzaG91bGQgc2hhcmUgbW9yZSBjb2RlIHdpdGggT2JqZWN0 VHJlZVByb3BlcnR5VHJlZUVsZW1lbnQuIChnZXR0ZXJzLCByZXNvbHZlZCB2YWx1ZXMsIGNvbnRl eHQgbWVudXMpCiAKIFdlYkluc3BlY3Rvci5PYmplY3RUcmVlQXJyYXlJbmRleFRyZWVFbGVtZW50 ID0gZnVuY3Rpb24ocHJvcGVydHksIHByb3BlcnR5UGF0aCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVQcm9wZXJ0eVRy ZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv T2JqZWN0VHJlZVByb3BlcnR5VHJlZUVsZW1lbnQuanMKaW5kZXggZDJmN2RmMC4uNGQ3MjAwOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2Jq ZWN0VHJlZVByb3BlcnR5VHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVByb3BlcnR5VHJlZUVsZW1lbnQuanMKQEAg LTg4LDYgKzg4LDExIEBAIFdlYkluc3BlY3Rvci5PYmplY3RUcmVlUHJvcGVydHlUcmVlRWxlbWVu dC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9wcmV2aWV3Vmlldy5zaG93UHJldmll dygpOwogICAgIH0sCiAKKyAgICBvbmNvbnRleHRtZW51OiBmdW5jdGlvbihldmVudCkKKyAgICB7 CisgICAgICAgIHRoaXMuX2NvbnRleHRNZW51SGFuZGxlcihldmVudCk7CisgICAgfSwKKwogICAg IC8vIFByaXZhdGUKIAogICAgIF9yZXNvbHZlZFZhbHVlOiBmdW5jdGlvbigpCkBAIC0xODUsNiAr MTkwLDcgQEAgV2ViSW5zcGVjdG9yLk9iamVjdFRyZWVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3Rv dHlwZSA9IHsKICAgICAgICAgdmFyIG5hbWVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgic3BhbiIpOwogICAgICAgICBuYW1lRWxlbWVudC5jbGFzc05hbWUgPSAicHJvdG90eXBlLW5h bWUiOwogICAgICAgICBuYW1lRWxlbWVudC50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiJXMgUHJvdG90eXBlIikuZm9ybWF0KHRoaXMuX3Nhbml0aXplZFByb3RvdHlwZVN0cmlu Zyh0aGlzLl9wcm9wZXJ0eS52YWx1ZSkpOworICAgICAgICBuYW1lRWxlbWVudC50aXRsZSA9IHRo aXMuX3Byb3BlcnR5UGF0aFN0cmluZyh0aGlzLl90aGlzUHJvcGVydHlQYXRoKCkpOwogICAgICAg ICByZXR1cm4gbmFtZUVsZW1lbnQ7CiAgICAgfSwKIApAQCAtMjE5LDcgKzIyNSw2IEBAIFdlYklu c3BlY3Rvci5PYmplY3RUcmVlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICAgICAgICAgIHZhbHVlT3JHZXR0ZXJFbGVtZW50LnRleHRDb250ZW50ID0gdGhpcy5f ZnVuY3Rpb25Qcm9wZXJ0eVN0cmluZygpOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAv LyBGSVhNRTogQ29udGV4dCBNZW51IGZvciBWYWx1ZS4gKFNlZSBPYmplY3RQcm9wZXJ0aWVzU2Vj dGlvbikuCiAgICAgICAgICAgICAvLyBGSVhNRTogT3B0aW9uK0NsaWNrIGZvciBWYWx1ZS4KICAg ICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIHZhbHVlT3JHZXR0ZXJFbGVtZW50ID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwpAQCAtNDY2LDUgKzQ3MSw2MSBAQCBXZWJJbnNwZWN0 b3IuT2JqZWN0VHJlZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICAg ICAgdmFyIGVtcHR5TWVzc2FnZUVsZW1lbnQgPSBXZWJJbnNwZWN0b3IuT2JqZWN0VHJlZVZpZXcu ZW1wdHlNZXNzYWdlRWxlbWVudChXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk5vIFByb3BlcnRpZXMu IikpOwogICAgICAgICAgICAgdGhpcy5hcHBlbmRDaGlsZChuZXcgVHJlZUVsZW1lbnQoZW1wdHlN ZXNzYWdlRWxlbWVudCwgbnVsbCwgZmFsc2UpKTsKICAgICAgICAgfQorICAgIH0sCisKKyAgICBf Y29udGV4dE1lbnVIYW5kbGVyOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHZhciBy ZXNvbHZlZFZhbHVlID0gdGhpcy5fcmVzb2x2ZWRWYWx1ZSgpOworICAgICAgICBpZiAoIXJlc29s dmVkVmFsdWUpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgdmFyIGNvbnRleHRNZW51 ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudShldmVudCk7CisKKyAgICAgICAgdmFyIHBy b3BlcnR5UGF0aCA9IHRoaXMuX3Jlc29sdmVkVmFsdWVQcm9wZXJ0eVBhdGgoKTsKKyAgICAgICAg aWYgKHByb3BlcnR5UGF0aCAmJiAhcHJvcGVydHlQYXRoLmlzRnVsbFBhdGhJbXBvc3NpYmxlKCkp IHsKKyAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJDb3B5IFBhdGggdG8gUHJvcGVydHkiKSwgZnVuY3Rpb24oKSB7CisgICAgICAgICAgICAg ICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNvcHlUZXh0KHByb3BlcnR5UGF0aC5kaXNwbGF5UGF0 aChXZWJJbnNwZWN0b3IuUHJvcGVydHlQYXRoLlR5cGUuVmFsdWUpKTsKKyAgICAgICAgICAgIH0u YmluZCh0aGlzKSk7CisgICAgICAgIH0KKworICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRTZXBh cmF0b3IoKTsKKworICAgICAgICB0aGlzLl9hcHBlbmRNZW51c0l0ZW1zRm9yT2JqZWN0KGNvbnRl eHRNZW51LCByZXNvbHZlZFZhbHVlKTsKKworICAgICAgICBpZiAoIWNvbnRleHRNZW51LmlzRW1w dHkoKSkKKyAgICAgICAgICAgIGNvbnRleHRNZW51LnNob3coKTsKKyAgICB9LAorCisgICAgX2Fw cGVuZE1lbnVzSXRlbXNGb3JPYmplY3Q6IGZ1bmN0aW9uKGNvbnRleHRNZW51LCByZXNvbHZlZFZh bHVlKQorICAgIHsKKyAgICAgICAgaWYgKHJlc29sdmVkVmFsdWUudHlwZSA9PT0gImZ1bmN0aW9u IikgeworICAgICAgICAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBiZXR0ZXIgaGFuZGxlIGJvdW5k IGZ1bmN0aW9ucy4KKyAgICAgICAgICAgIGlmICghaXNGdW5jdGlvblN0cmluZ05hdGl2ZUNvZGUo cmVzb2x2ZWRWYWx1ZS5kZXNjcmlwdGlvbikpIHsKKyAgICAgICAgICAgICAgICBjb250ZXh0TWVu dS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiSnVtcCB0byBEZWZpbml0aW9uIiks IGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAgICAgICBEZWJ1Z2dlckFnZW50LmdldEZ1bmN0 aW9uRGV0YWlscyhyZXNvbHZlZFZhbHVlLm9iamVjdElkLCBmdW5jdGlvbihlcnJvciwgcmVzcG9u c2UpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChlcnJvcikKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgICAgICAgICAgICAgIHZhciBsb2Nh dGlvbiA9IHJlc3BvbnNlLmxvY2F0aW9uOworICAgICAgICAgICAgICAgICAgICAgICAgdmFyIHNv dXJjZUNvZGUgPSBXZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5hZ2VyLnNjcmlwdEZvcklkZW50aWZp ZXIobG9jYXRpb24uc2NyaXB0SWQpOworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKCFzb3Vy Y2VDb2RlKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAg ICAgICAgICAgICAgICAgdmFyIHNvdXJjZUNvZGVMb2NhdGlvbiA9IHNvdXJjZUNvZGUuY3JlYXRl U291cmNlQ29kZUxvY2F0aW9uKGxvY2F0aW9uLmxpbmVOdW1iZXIsIGxvY2F0aW9uLmNvbHVtbk51 bWJlciB8fCAwKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5yZXNvdXJj ZVNpZGViYXJQYW5lbC5zaG93U291cmNlQ29kZUxvY2F0aW9uKHNvdXJjZUNvZGVMb2NhdGlvbik7 CisgICAgICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgICAgIH0pOworICAgICAgICAg ICAgfQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgaWYgKHJlc29s dmVkVmFsdWUuc3VidHlwZSA9PT0gIm5vZGUiKSB7CisgICAgICAgICAgICBjb250ZXh0TWVudS5h cHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmV2ZWFsIGluIERPTSBUcmVlIiksIGZ1 bmN0aW9uKCkgeworICAgICAgICAgICAgICAgIHJlc29sdmVkVmFsdWUucHVzaE5vZGVUb0Zyb250 ZW5kKGZ1bmN0aW9uKG5vZGVJZCkgeworICAgICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iu ZG9tVHJlZU1hbmFnZXIuaW5zcGVjdEVsZW1lbnQobm9kZUlkKTsKKyAgICAgICAgICAgICAgICB9 KTsKKyAgICAgICAgICAgIH0pOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CiAgICAg fQogfTsK