127270 2014-01-20 00:40:22 -0800 Web Inspector: Make the TimelineRecordTreeElement location subtitle live 2014-01-20 19:05:46 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy graouts joepeck timothy webkit-bug-importer oldest_to_newest 969749 0 timothy 2014-01-20 00:40:22 -0800 Fix the FIXME about this. 969752 1 221629 timothy 2014-01-20 00:47:44 -0800 Created attachment 221629 Patch 969757 2 webkit-bug-importer 2014-01-20 00:59:46 -0800 <rdar://problem/15857024> 969922 3 221629 joepeck 2014-01-20 11:00:27 -0800 Comment on attachment 221629 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=221629&action=review r=me > Source/WebInspectorUI/UserInterface/SourceCodeLocation.js:55 > + None: "none", // File name not included. > + Short: "short", // Only the file name. > + Full: "full" // Full URL is used. Nit: would be nice to line up the comments. Makes reading what each does much easier. > Source/WebInspectorUI/UserInterface/SourceCodeLocation.js:300 > + // Legacy support for when nameStyle was fullURL and a boolean. > + if (!nameStyle || typeof nameStyle === "boolean") > + nameStyle = nameStyle ? WebInspector.SourceCodeLocation.NameStyle.Full : WebInspector.SourceCodeLocation.NameStyle.Short; I'd rather we update the call sites to use the new enum and nameStyle is never a boolean. > Source/WebInspectorUI/UserInterface/TimelineRecordTreeElement.js:40 > + if (showFullLocationSubtitle) > + this._sourceCodeLocation.populateLiveDisplayLocationString(subtitle, "textContent"); Though the boolean says "showFullLocationSubtitle" it looks like this would defaults to the Short location subtitle. 970136 4 timothy 2014-01-20 19:05:46 -0800 https://trac.webkit.org/changeset/162421 221629 2014-01-20 00:47:44 -0800 2014-01-20 11:00:26 -0800 Patch bug-127270-20140120004744.patch text/plain 14036 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMjk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBi YmFkZmQ3YzVmNTkyZGI5M2E1OTdhMTE2NTkwZTdlMzg1YTA1ZGQwLi5mOTQ0NWI4NWQ0OWRiNThm NDQ0YWEyY2MyODIwMzllY2JkMDUxMDBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOCBAQAorMjAxNC0wMS0yMCAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CisKKyAgICAgICAgTWFrZSB0aGUgVGltZWxpbmVSZWNvcmRUcmVlRWxlbWVudCBsb2NhdGlv biBzdWJ0aXRsZSBsaXZlLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjcyNzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczog VXBkYXRlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvU291cmNlQ29kZUxvY2F0aW9uLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVMb2NhdGlvbi5wcm90b3R5cGUub3Jp Z2luYWxMb2NhdGlvblN0cmluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlQ29kZUxv Y2F0aW9uLnByb3RvdHlwZS5mb3JtYXR0ZWRMb2NhdGlvblN0cmluZyk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU291cmNlQ29kZUxvY2F0aW9uLnByb3RvdHlwZS5kaXNwbGF5TG9jYXRpb25TdHJp bmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVMb2NhdGlvbi5wcm90b3R5cGUu dXBkYXRlRGlzcGxheVN0cmluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlQ29kZUxv Y2F0aW9uLnByb3RvdHlwZS5fbG9jYXRpb25TdHJpbmcpOgorICAgICAgICBTdXBwb3J0IGZvciBh IG5ldyBuYW1lU3R5bGUgZW51bSBhbmQgYSBwcmVmaXggZm9yIHRoZSBsb2NhdGlvbiBzdHJpbmcu CisgICAgICAgIFBhc3NpbmcgdGhlIHByZWZpeCBoZXJlIGxldHMgaXQgYmUgaXRhbGljaXplZCB3 aXRoIHRoZSBsaW5lIG51bWJlci4KKyAgICAgICAgU3VwcG9ydCBjb2x1bW4gbnVtYmVyIGZvciBT b3VyY2VDb2RlJ3Mgd2l0aG91dCBhIFVSTCB0b28uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1RpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVSZWNvcmRUcmVlRWxlbWVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVS ZWNvcmRUcmVlRWxlbWVudC5wcm90b3R5cGUub25hdHRhY2gpOgorICAgICAgICBDcmVhdGUgYSBz dWJ0aXRsZSBzcGFuIHRvIHVwZGF0ZSB0aGUgbG9jYXRpb24gaW5zaWRlLiBVcGRhdGUgdGhlIHRv b2x0aXAgb24gYXR0YWNoLgorCiAyMDE0LTAxLTE5ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5 QGFwcGxlLmNvbT4KIAogICAgICAgICBHZW5lcmF0ZSBiZXR0ZXIgZGlzcGxheSBuYW1lcyBmb3Ig dGltZXIgYW5kIGV2ZW50IFRpbWVsaW5lIHJlY29yZHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3Ry aW5ncy5qcwppbmRleCBhZDAxMDUwODdlMjFlYWJjZGFjZTQzM2Q1OWJmYWNlOTYzOWMxNzZhLi4w MmM1N2ZmYTJjMzE2MDkzZDI5MzYxNDQyNGJhOWFkMTlkYTIzZjFkIDEwMDY0NApHSVQgYmluYXJ5 IHBhdGNoCmRlbHRhIDk3Mwp6Y21hS3JVcjE5PzlMTFl5dUpielF5dChgcjh7US0oI215Tl9FelB0 QFcyU144c2dSaV9YdzlrM01DeFN7Nz8/QlYKemB5d0dAXmJscEM9NWMkRntgZTMraldGOXxrV2xv eyElISZkQ0Z8VT0rcXk0My0yM318ZSYySWA9WFdeMi1AK2EzCnppeXM+Ty1mdUVXdTg8bzwhZmYp disyUz0hSlFIVWxCRmdYRDtOPTgqb0QxdHYrblMkI2lBZHhHYHw/UXZAdiFBNQp6VE5+KzQlS019 ZyR0KmBDM3FkJSZDcWNBUWU1NlN8JjYyeEc1OXVXP2U5OTxPQHB4RyZoRDA3ZUdZLVFMKVo8JTUK ejh9clNuRW99OEx4eWsrPilIUnp9VHVTPlZNbjw2UWR9fWgoS0dSb0AmU2Y2UmYjMFUxb3dufT1q Wn0hMlJvUVM9CnpuUGopRitKUjhqPiV6WnY9OTkhLSZYQjk1cE50U21RODlrJTc+IWdyXmphMnlw YGxKSS18VCF0c2Z3ZXtyV2t3QQp6SSNqeUNPd1ZRZXlOUWU0IXArWEdrXndUdlk7UWM8ZV5lIzY7 SXljNkUzRHtZWFAhenxTa1lANUReJDl8UUQ7NTIKem57P0VFRXxRQVJSdVEhd016b0NENVYpdj0q ZGRfME9+UFYoNHptJCN3NDNRLWB6c151Pll3QndFKlBseWRJeWk0CnowVWxrMDA9RTExcXJUWSlx ZyNpV0lGQmAjcG1Aa2d6WUdjLUJvOXgkIStVOXpfaW0tb2lPQ314JT1uNjgmKklDJgp6eXc0KUx5 WjFebD9HdElgdzhTdy07TWx3U2FgQktXZiEpV2B3KTxORzloKGNKIX5nZ0p0MDQ+YU1JKWpNMHk+ eyQKekY/UTBMcihJZmxZcEkqI0J6KX00akZ0M1pOdzFhclJBI3hQJjFDfnFwSEY0MFJHRkRkSDx4 ZDdpUWRKOTZeRHVyCnooYT8mWU9QMHRQSFpIeGB0dS1NVTZ0S1EzVkUkU3EpPFpufXRLQ3tRMmwl eUc1VlFNQzZ8czBZRDglQDMmPkZZZAp6Mm4zSkR7Q0J+a3hIVWxedlNUeUl1TFIzRWBYJl82KHY3 dV5CI1ZvNnI8P1ZWSmE+dCVqWXFOVHZDXnFeMy08QGgKQ3ZNIU1UCgpkZWx0YSAxNzU4CnpjbWFK PlUySWNqODItLWNudlY1e1pGS0QhdDI9SlAwbyE1SnJEMUxrU2tQZ0cwbnRRZU5hSUdrcFNyZjIt M0EjVQp6OEhUdEZhVmdebzdoYjVDUEIyaDlsRnhXU2tRb3liNkU4NXotQUpaNENkMyM+aH5ZfX57 WjRuYmJMN0I5YHtzUzAKej1seUByY2tAeHZtRDlHOGU7KiVYZUpzdEN4JDdeP0hRdGI3YkFReEdG fDdCaXloWFpXQDdULSsycHdUYnJtIWU2CnpxaWwldnZue05hTWFhQFl6Z283NWpnaG9xOz13MSlw I21EQzd7XihQQn1uJE1uMSNRSWYhKyRXcTJRU3l7eTYxSwp6UVNNMCN6WFUjZVpeeDdzd340Qjwm TXZBZ0FtZGNlSUF1cyFfR0hmZWpDZjlDS3p0bCs7aW56SDdNSE1VTVdoS1IKemMtSXxXKUEmI0JP R1c0P2NqQytQdHQ0QnlyQH4kJnI+Vjw2US1fXjJkJFFyOFF7YFQ3bUF+dkQ+dD1oWDxrWlNZCnoj PDRSZTxNJEROI2pESGBEXnxxI0ZnaDBHc2BgKTkjJEhzUXdyJGE1YTkweU5aNFMofkVqRnhIWUZ6 QVZ3NVR7YAp6UWRVc31jZVYxWD9WKXV4R1UxKUJQTWNgJXtjeThNJitQNWledU19N0NTMkRFbSZ5 TXFPPG45WSMjRmttNXQ5OFkKeihWbF9vdjZvKkRtfTJYP2p2b3h5bX5kVSFAZWtoRVZad0RpdiRx VFB5WHw7K1VwYmZlZVA0Pj9WRmkmTUtnbTAjCnpocVB+RGZRRkw1ZnUwN0pMMStDcWIkQWFaZGE4 TSg9YSQ8ZVBBWDA8Nl4+V0lEKyMkS093RWVWJjRqVDFXU09NKQp6Q3ZkMTxeOyZYcF5EOC1FaUxr ZTVLYSo2PlhyITVZMmhUfXhQMTlvSGx+QVg1XjMyZjU9ZGhHP0AoVzNhZ3ltY3sKem9sM1FrWWlF SXVRM3dBYl8xR214c2ZNKCtnY3hueSY+RDZoX1hYYWg8dmc3c3ZSXm9QeDE+YXk0Tj1GU09tRDxr Cnpxek98VytEaS04SUpHfVdie1QhWD9aUz5uQyN2fF9YQDYwZm1gUmpQKDchJH0+YlJ6bV45Z0xW PWlZTklYZ31rfAp6P1YwQj49LVl9PFhYcDs7ejtEbUFZZj9KOWprbGxLRjdhPGFgbyUjVk9pJSZo TmlhVkBuak49PmdGSihhOXhUcWQKekBMaW4/X3Aoa0wkLTBHcHpQPUlSZDc7KjBJYV42RzF6dU4w bHYrSGpZdF52N3ZyVThARD5LWkVfQWVUfm8wVXo2CnopOVZXZ2syMiMjKk8mJD9oez9uQTM3ZEQr eXBXWl5gQWZiaDB4dyopWWl2VXAxS1ZLTGYtaFZpa30mKHQySHRxKAp6aF92PVRBIyppaygmYGJ+ d2kjMmA5UVl4Mzk+ZCY7I29XKGBiREI9aGo/U3I8MndNKit8MkNFdW9RVVR1YE8/QSQKelg9NzN4 ZzcmOzduUD8kTitmQjEhdlpuRmRoenc4TzVxSnR0WjJqSCheWkxCYWxfb1ZzITNIJHYtbntwSm1m aHQrClFLS3UyTCNyKlJkMFpDJjIwV2hNLURGNlRmCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvU291cmNlQ29kZUxvY2F0aW9uLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvU291cmNlQ29kZUxvY2F0aW9uLmpzCmluZGV4IDM1 MDQyYjk1ZTU1OGY3YjhkMzBmZjE2NzNmNWI1Y2U0NThjMjQ3ZDAuLjAzYjE5MzM4MzkxNWNhZmEz ZGE4MWU3MDBiMmVkZWRhZjc1NTZlNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1NvdXJjZUNvZGVMb2NhdGlvbi5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Tb3VyY2VDb2RlTG9jYXRpb24uanMKQEAgLTQ4LDExICs0 OCwxOCBAQCBXZWJJbnNwZWN0b3IuU291cmNlQ29kZUxvY2F0aW9uID0gZnVuY3Rpb24oc291cmNl Q29kZSwgbGluZU51bWJlciwgY29sdW1uTnVtYmVyKQogV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVM b2NhdGlvbi5EaXNwbGF5TG9jYXRpb25DbGFzc05hbWUgPSAiZGlzcGxheS1sb2NhdGlvbiI7CiAK IFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlTG9jYXRpb24uTGFyZ2VDb2x1bW5OdW1iZXIgPSA4MDsK KworV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVMb2NhdGlvbi5OYW1lU3R5bGUgPSB7CisgICAgTm9u ZTogIm5vbmUiLCAvLyBGaWxlIG5hbWUgbm90IGluY2x1ZGVkLgorICAgIFNob3J0OiAic2hvcnQi LCAvLyBPbmx5IHRoZSBmaWxlIG5hbWUuCisgICAgRnVsbDogImZ1bGwiIC8vIEZ1bGwgVVJMIGlz IHVzZWQuCit9OworCiBXZWJJbnNwZWN0b3IuU291cmNlQ29kZUxvY2F0aW9uLkNvbHVtblN0eWxl ID0gewogICAgIEhpZGRlbjogImhpZGRlbiIsICAgICAgICAgICAgIC8vIGNvbHVtbiBudW1iZXJz IGFyZSBub3QgaW5jbHVkZWQuCiAgICAgT25seUlmTGFyZ2U6ICJvbmx5LWlmLWxhcmdlIiwgLy8g Y29sdW1uIG51bWJlcnMgZ3JlYXRlciB0aGFuIDgwIGFyZSBzaG93bi4KICAgICBTaG93bjogInNo b3duIiAgICAgICAgICAgICAgICAvLyBub24temVybyBjb2x1bW4gbnVtYmVycyBhcmUgc2hvd24u Ci19Cit9OwogCiBXZWJJbnNwZWN0b3IuU291cmNlQ29kZUxvY2F0aW9uLkV2ZW50ID0gewogICAg IExvY2F0aW9uQ2hhbmdlZDogInNvdXJjZS1jb2RlLWxvY2F0aW9uLWxvY2F0aW9uLWNoYW5nZWQi LApAQCAtMTYyLDE5ICsxNjksMTkgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVMb2NhdGlvbi5w cm90b3R5cGUgPSB7CiAKICAgICAvLyBVc2VyIHByZXNlbnRhYmxlIGxvY2F0aW9uIHN0cmluZ3M6 ICJmaWxlOmxpbmVOdW1iZXI6Y29sdW1uTnVtYmVyIi4KIAotICAgIG9yaWdpbmFsTG9jYXRpb25T dHJpbmc6IGZ1bmN0aW9uKGNvbHVtblN0eWxlLCBmdWxsVVJMKQorICAgIG9yaWdpbmFsTG9jYXRp b25TdHJpbmc6IGZ1bmN0aW9uKGNvbHVtblN0eWxlLCBuYW1lU3R5bGUsIHByZWZpeCkKICAgICB7 Ci0gICAgICAgIHJldHVybiB0aGlzLl9sb2NhdGlvblN0cmluZyh0aGlzLnNvdXJjZUNvZGUsIHRo aXMubGluZU51bWJlciwgdGhpcy5jb2x1bW5OdW1iZXIsIGNvbHVtblN0eWxlLCBmdWxsVVJMKTsK KyAgICAgICAgcmV0dXJuIHRoaXMuX2xvY2F0aW9uU3RyaW5nKHRoaXMuc291cmNlQ29kZSwgdGhp cy5saW5lTnVtYmVyLCB0aGlzLmNvbHVtbk51bWJlciwgY29sdW1uU3R5bGUsIG5hbWVTdHlsZSwg cHJlZml4KTsKICAgICB9LAogCi0gICAgZm9ybWF0dGVkTG9jYXRpb25TdHJpbmc6IGZ1bmN0aW9u KGNvbHVtblN0eWxlLCBmdWxsVVJMKQorICAgIGZvcm1hdHRlZExvY2F0aW9uU3RyaW5nOiBmdW5j dGlvbihjb2x1bW5TdHlsZSwgbmFtZVN0eWxlLCBwcmVmaXgpCiAgICAgewotICAgICAgICByZXR1 cm4gdGhpcy5fbG9jYXRpb25TdHJpbmcodGhpcy5zb3VyY2VDb2RlLCB0aGlzLmZvcm1hdHRlZExp bmVOdW1iZXIsIHRoaXMuZm9ybWF0dGVkQ29sdW1uLCBjb2x1bW5TdHlsZSwgZnVsbFVSTCk7Cisg ICAgICAgIHJldHVybiB0aGlzLl9sb2NhdGlvblN0cmluZyh0aGlzLnNvdXJjZUNvZGUsIHRoaXMu Zm9ybWF0dGVkTGluZU51bWJlciwgdGhpcy5mb3JtYXR0ZWRDb2x1bW4sIGNvbHVtblN0eWxlLCBu YW1lU3R5bGUsIHByZWZpeCk7CiAgICAgfSwKIAotICAgIGRpc3BsYXlMb2NhdGlvblN0cmluZzog ZnVuY3Rpb24oY29sdW1uU3R5bGUsIGZ1bGxVUkwpCisgICAgZGlzcGxheUxvY2F0aW9uU3RyaW5n OiBmdW5jdGlvbihjb2x1bW5TdHlsZSwgbmFtZVN0eWxlLCBwcmVmaXgpCiAgICAgewotICAgICAg ICByZXR1cm4gdGhpcy5fbG9jYXRpb25TdHJpbmcodGhpcy5kaXNwbGF5U291cmNlQ29kZSwgdGhp cy5kaXNwbGF5TGluZU51bWJlciwgdGhpcy5kaXNwbGF5Q29sdW1uTnVtYmVyLCBjb2x1bW5TdHls ZSwgZnVsbFVSTCk7CisgICAgICAgIHJldHVybiB0aGlzLl9sb2NhdGlvblN0cmluZyh0aGlzLmRp c3BsYXlTb3VyY2VDb2RlLCB0aGlzLmRpc3BsYXlMaW5lTnVtYmVyLCB0aGlzLmRpc3BsYXlDb2x1 bW5OdW1iZXIsIGNvbHVtblN0eWxlLCBuYW1lU3R5bGUsIHByZWZpeCk7CiAgICAgfSwKIAogICAg IHRvb2x0aXBTdHJpbmc6IGZ1bmN0aW9uKCkKQEAgLTI0MCw3ICsyNDcsNyBAQCBXZWJJbnNwZWN0 b3IuU291cmNlQ29kZUxvY2F0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgfSwgdGhpcyk7CiAg ICAgfSwKIAotICAgIHBvcHVsYXRlTGl2ZURpc3BsYXlMb2NhdGlvblN0cmluZzogZnVuY3Rpb24o ZWxlbWVudCwgcHJvcGVydHlOYW1lKQorICAgIHBvcHVsYXRlTGl2ZURpc3BsYXlMb2NhdGlvblN0 cmluZzogZnVuY3Rpb24oZWxlbWVudCwgcHJvcGVydHlOYW1lLCBjb2x1bW5TdHlsZSwgbmFtZVN0 eWxlLCBwcmVmaXgpCiAgICAgewogICAgICAgICB2YXIgY3VycmVudERpc3BsYXkgPSB1bmRlZmlu ZWQ7CiAKQEAgLTI1MiwxNyArMjU5LDExIEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlTG9jYXRp b24ucHJvdG90eXBlID0gewogICAgICAgICAgICAgY3VycmVudERpc3BsYXkgPSBzaG93QWx0ZXJu YXRpdmVMb2NhdGlvbjsKIAogICAgICAgICAgICAgaWYgKCFzaG93QWx0ZXJuYXRpdmVMb2NhdGlv bikgewotICAgICAgICAgICAgICAgIGVsZW1lbnRbcHJvcGVydHlOYW1lXSA9IHRoaXMuZGlzcGxh eUxvY2F0aW9uU3RyaW5nKCk7Ci0KLSAgICAgICAgICAgICAgICBpZiAodGhpcy5oYXNEaWZmZXJl bnREaXNwbGF5TG9jYXRpb24oKSkKLSAgICAgICAgICAgICAgICAgICAgZWxlbWVudC5jbGFzc0xp c3QuYWRkKFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlTG9jYXRpb24uRGlzcGxheUxvY2F0aW9uQ2xh c3NOYW1lKTsKLSAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgIGVsZW1l bnQuY2xhc3NMaXN0LnJlbW92ZShXZWJJbnNwZWN0b3IuU291cmNlQ29kZUxvY2F0aW9uLkRpc3Bs YXlMb2NhdGlvbkNsYXNzTmFtZSk7Ci0gICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAg ICAgIGlmICh0aGlzLmhhc0RpZmZlcmVudERpc3BsYXlMb2NhdGlvbigpKSB7Ci0gICAgICAgICAg ICAgICAgICAgIGVsZW1lbnRbcHJvcGVydHlOYW1lXSA9IHRoaXMub3JpZ2luYWxMb2NhdGlvblN0 cmluZygpOwotICAgICAgICAgICAgICAgICAgICBlbGVtZW50LmNsYXNzTGlzdC5yZW1vdmUoV2Vi SW5zcGVjdG9yLlNvdXJjZUNvZGVMb2NhdGlvbi5EaXNwbGF5TG9jYXRpb25DbGFzc05hbWUpOwot ICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBlbGVtZW50W3Byb3BlcnR5TmFtZV0g PSB0aGlzLmRpc3BsYXlMb2NhdGlvblN0cmluZyhjb2x1bW5TdHlsZSwgbmFtZVN0eWxlLCBwcmVm aXgpOworICAgICAgICAgICAgICAgIGVsZW1lbnQuY2xhc3NMaXN0LnRvZ2dsZShXZWJJbnNwZWN0 b3IuU291cmNlQ29kZUxvY2F0aW9uLkRpc3BsYXlMb2NhdGlvbkNsYXNzTmFtZSwgdGhpcy5oYXNE aWZmZXJlbnREaXNwbGF5TG9jYXRpb24oKSk7CisgICAgICAgICAgICB9IGVsc2UgaWYgKHRoaXMu aGFzRGlmZmVyZW50RGlzcGxheUxvY2F0aW9uKCkpIHsKKyAgICAgICAgICAgICAgICBlbGVtZW50 W3Byb3BlcnR5TmFtZV0gPSB0aGlzLm9yaWdpbmFsTG9jYXRpb25TdHJpbmcoY29sdW1uU3R5bGUs IG5hbWVTdHlsZSwgcHJlZml4KTsKKyAgICAgICAgICAgICAgICBlbGVtZW50LmNsYXNzTGlzdC5y ZW1vdmUoV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVMb2NhdGlvbi5EaXNwbGF5TG9jYXRpb25DbGFz c05hbWUpOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAKQEAgLTI4OCwyNSArMjg5LDM5IEBA IFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlTG9jYXRpb24ucHJvdG90eXBlID0gewogCiAgICAgLy8g UHJpdmF0ZQogCi0gICAgX2xvY2F0aW9uU3RyaW5nOiBmdW5jdGlvbihzb3VyY2VDb2RlLCBsaW5l TnVtYmVyLCBjb2x1bW5OdW1iZXIsIGNvbHVtblN0eWxlLCBmdWxsVVJMKQorICAgIF9sb2NhdGlv blN0cmluZzogZnVuY3Rpb24oc291cmNlQ29kZSwgbGluZU51bWJlciwgY29sdW1uTnVtYmVyLCBj b2x1bW5TdHlsZSwgbmFtZVN0eWxlLCBwcmVmaXgpCiAgICAgewogICAgICAgICBjb25zb2xlLmFz c2VydChzb3VyY2VDb2RlKTsKICAgICAgICAgaWYgKCFzb3VyY2VDb2RlKQogICAgICAgICAgICAg cmV0dXJuICIiOwogCisgICAgICAgIC8vIExlZ2FjeSBzdXBwb3J0IGZvciB3aGVuIG5hbWVTdHls ZSB3YXMgZnVsbFVSTCBhbmQgYSBib29sZWFuLgorICAgICAgICBpZiAoIW5hbWVTdHlsZSB8fCB0 eXBlb2YgbmFtZVN0eWxlID09PSAiYm9vbGVhbiIpCisgICAgICAgICAgICBuYW1lU3R5bGUgPSBu YW1lU3R5bGUgPyBXZWJJbnNwZWN0b3IuU291cmNlQ29kZUxvY2F0aW9uLk5hbWVTdHlsZS5GdWxs IDogV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVMb2NhdGlvbi5OYW1lU3R5bGUuU2hvcnQ7CisKICAg ICAgICAgY29sdW1uU3R5bGUgPSBjb2x1bW5TdHlsZSB8fCBXZWJJbnNwZWN0b3IuU291cmNlQ29k ZUxvY2F0aW9uLkNvbHVtblN0eWxlLk9ubHlJZkxhcmdlOworICAgICAgICBuYW1lU3R5bGUgPSBu YW1lU3R5bGUgfHwgV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVMb2NhdGlvbi5OYW1lU3R5bGUuU2hv cnQ7CisgICAgICAgIHByZWZpeCA9IHByZWZpeCB8fCAiIjsKKworICAgICAgICB2YXIgbGluZVN0 cmluZyA9IGxpbmVOdW1iZXIgKyAxOyAvLyBUaGUgdXNlciB2aXNpYmxlIGxpbmUgbnVtYmVyIGlz IDEtYmFzZWQuCisgICAgICAgIGlmIChjb2x1bW5TdHlsZSA9PT0gV2ViSW5zcGVjdG9yLlNvdXJj ZUNvZGVMb2NhdGlvbi5Db2x1bW5TdHlsZS5TaG93biAmJiBjb2x1bW5OdW1iZXIgPiAwKQorICAg ICAgICAgICAgbGluZVN0cmluZyArPSAiOiIgKyAoY29sdW1uTnVtYmVyICsgMSk7IC8vIFRoZSB1 c2VyIHZpc2libGUgY29sdW1uIG51bWJlciBpcyAxLWJhc2VkLgorICAgICAgICBlbHNlIGlmIChj b2x1bW5TdHlsZSA9PT0gV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVMb2NhdGlvbi5Db2x1bW5TdHls ZS5Pbmx5SWZMYXJnZSAmJiBjb2x1bW5OdW1iZXIgPiBXZWJJbnNwZWN0b3IuU291cmNlQ29kZUxv Y2F0aW9uLkxhcmdlQ29sdW1uTnVtYmVyKQorICAgICAgICAgICAgbGluZVN0cmluZyArPSAiOiIg KyAoY29sdW1uTnVtYmVyICsgMSk7IC8vIFRoZSB1c2VyIHZpc2libGUgY29sdW1uIG51bWJlciBp cyAxLWJhc2VkLgorCisgICAgICAgIHN3aXRjaCAobmFtZVN0eWxlKSB7CisgICAgICAgIGNhc2Ug V2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVMb2NhdGlvbi5OYW1lU3R5bGUuTm9uZToKKyAgICAgICAg ICAgIHJldHVybiBwcmVmaXggKyBsaW5lU3RyaW5nOwogCi0gICAgICAgIHZhciBzdHJpbmcgPSBm dWxsVVJMICYmIHNvdXJjZUNvZGUudXJsID8gc291cmNlQ29kZS51cmwgOiBzb3VyY2VDb2RlLmRp c3BsYXlOYW1lOwotICAgICAgICBpZiAoc291cmNlQ29kZS51cmwpIHsKLSAgICAgICAgICAgIHN0 cmluZyArPSAiOiIgKyAobGluZU51bWJlciArIDEpOyAvLyBUaGUgdXNlciB2aXNpYmxlIGxpbmUg bnVtYmVyIGlzIDEtYmFzZWQuCi0gICAgICAgICAgICBpZiAoY29sdW1uU3R5bGUgPT09IFdlYklu c3BlY3Rvci5Tb3VyY2VDb2RlTG9jYXRpb24uQ29sdW1uU3R5bGUuU2hvd24gJiYgY29sdW1uTnVt YmVyID4gMCkKLSAgICAgICAgICAgICAgICBzdHJpbmcgKz0gIjoiICsgKGNvbHVtbk51bWJlciAr IDEpOyAvLyBUaGUgdXNlciB2aXNpYmxlIGNvbHVtbiBudW1iZXIgaXMgMS1iYXNlZC4KLSAgICAg ICAgICAgIGVsc2UgaWYgKGNvbHVtblN0eWxlID09PSBXZWJJbnNwZWN0b3IuU291cmNlQ29kZUxv Y2F0aW9uLkNvbHVtblN0eWxlLk9ubHlJZkxhcmdlICYmIGNvbHVtbk51bWJlciA+IFdlYkluc3Bl Y3Rvci5Tb3VyY2VDb2RlTG9jYXRpb24uTGFyZ2VDb2x1bW5OdW1iZXIpCi0gICAgICAgICAgICAg ICAgc3RyaW5nICs9ICI6IiArIChjb2x1bW5OdW1iZXIgKyAxKTsgLy8gVGhlIHVzZXIgdmlzaWJs ZSBjb2x1bW4gbnVtYmVyIGlzIDEtYmFzZWQuCi0gICAgICAgIH0gZWxzZQotICAgICAgICAgICAg c3RyaW5nICs9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiIChsaW5lICVkKSIpLmZvcm1hdChsaW5l TnVtYmVyICsgMSk7IC8vIFRoZSB1c2VyIHZpc2libGUgbGluZSBudW1iZXIgaXMgMS1iYXNlZC4K LQotICAgICAgICByZXR1cm4gc3RyaW5nOworICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5Tb3Vy Y2VDb2RlTG9jYXRpb24uTmFtZVN0eWxlLlNob3J0OgorICAgICAgICBjYXNlIFdlYkluc3BlY3Rv ci5Tb3VyY2VDb2RlTG9jYXRpb24uTmFtZVN0eWxlLkZ1bGw6CisgICAgICAgICAgICB2YXIgbGlu ZVN1ZmZpeCA9IHNvdXJjZUNvZGUudXJsID8gIjoiICsgbGluZVN0cmluZyA6IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiIChsaW5lICVzKSIpLmZvcm1hdChsaW5lU3RyaW5nKTsKKyAgICAgICAgICAg IHJldHVybiBwcmVmaXggKyAobmFtZVN0eWxlID09PSBXZWJJbnNwZWN0b3IuU291cmNlQ29kZUxv Y2F0aW9uLk5hbWVTdHlsZS5GdWxsICYmIHNvdXJjZUNvZGUudXJsID8gc291cmNlQ29kZS51cmwg OiBzb3VyY2VDb2RlLmRpc3BsYXlOYW1lKSArIGxpbmVTdWZmaXg7CisKKyAgICAgICAgZGVmYXVs dDoKKyAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIlVua25vd24gbmFtZVN0eWxlOiAiICsgbmFt ZVN0eWxlKTsKKyAgICAgICAgICAgIHJldHVybiBwcmVmaXggKyBsaW5lU3RyaW5nOworICAgICAg ICB9CiAgICAgfSwKIAogICAgIF9yZXNldE1hcHBlZExvY2F0aW9uOiBmdW5jdGlvbigpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZVJlY29y ZFRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGlt ZWxpbmVSZWNvcmRUcmVlRWxlbWVudC5qcwppbmRleCAwMWQ0NzM0MzJlMWFhMzRhZjczMTUwY2Vk OWQ0NTVkNGE1MWFlYTQ5Li4xYTI3ODRmMTY0NmFlZjhjYTNhYmIzNzdkMjI3ZTc0MzJmM2RlY2Fj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGlu ZVJlY29yZFRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1RpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQuanMKQEAgLTM0LDE1ICszNCwxMiBAQCBX ZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRUcmVlRWxlbWVudCA9IGZ1bmN0aW9uKHRpbWVsaW5l UmVjb3JkLCBzaG93RnVsbExvY2F0aQogICAgIHZhciBzdWJ0aXRsZSA9ICIiOwogCiAgICAgaWYg KHRoaXMuX3NvdXJjZUNvZGVMb2NhdGlvbikgewotICAgICAgICAvLyBGSVhNRTogVGhpcyBuZWVk cyB0byBsaXZlIHVwZGF0ZSB0aGUgc3VidGl0bGUgaW4gcmVzcG9uc2UgdG8gdGhlIFdlYkluc3Bl Y3Rvci5Tb3VyY2VDb2RlTG9jYXRpb24uRXZlbnQuRGlzcGxheUxvY2F0aW9uQ2hhbmdlZCBldmVu dC4KLQotICAgICAgICBpZiAoc2hvd0Z1bGxMb2NhdGlvblN1YnRpdGxlKSB7Ci0gICAgICAgICAg ICBzdWJ0aXRsZSA9IHRoaXMuX3NvdXJjZUNvZGVMb2NhdGlvbi5kaXNwbGF5TG9jYXRpb25TdHJp bmcoV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVMb2NhdGlvbi5Db2x1bW5TdHlsZS5Pbmx5SWZMYXJn ZSk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBzdWJ0aXRsZSA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygibGluZSAiKSArICh0aGlzLl9zb3VyY2VDb2RlTG9jYXRpb24uZGlzcGxheUxp bmVOdW1iZXIgKyAxKTsgLy8gVGhlIHVzZXIgdmlzaWJsZSBsaW5lIG51bWJlciBpcyAxLWJhc2Vk LgotICAgICAgICAgICAgaWYgKHRoaXMuX3NvdXJjZUNvZGVMb2NhdGlvbi5kaXNwbGF5Q29sdW1u TnVtYmVyID4gV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVMb2NhdGlvbi5MYXJnZUNvbHVtbk51bWJl cikKLSAgICAgICAgICAgICAgICBzdWJ0aXRsZSArPSAiOiIgKyAodGhpcy5fc291cmNlQ29kZUxv Y2F0aW9uLmRpc3BsYXlDb2x1bW5OdW1iZXIgKyAxKTsgLy8gVGhlIHVzZXIgdmlzaWJsZSBjb2x1 bW4gbnVtYmVyIGlzIDEtYmFzZWQuCi0gICAgICAgIH0KKyAgICAgICAgc3VidGl0bGUgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CisKKyAgICAgICAgaWYgKHNob3dGdWxsTG9jYXRp b25TdWJ0aXRsZSkKKyAgICAgICAgICAgIHRoaXMuX3NvdXJjZUNvZGVMb2NhdGlvbi5wb3B1bGF0 ZUxpdmVEaXNwbGF5TG9jYXRpb25TdHJpbmcoc3VidGl0bGUsICJ0ZXh0Q29udGVudCIpOworICAg ICAgICBlbHNlCisgICAgICAgICAgICB0aGlzLl9zb3VyY2VDb2RlTG9jYXRpb24ucG9wdWxhdGVM aXZlRGlzcGxheUxvY2F0aW9uU3RyaW5nKHN1YnRpdGxlLCAidGV4dENvbnRlbnQiLCBudWxsLCBX ZWJJbnNwZWN0b3IuU291cmNlQ29kZUxvY2F0aW9uLk5hbWVTdHlsZS5Ob25lLCBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoImxpbmUgIikpOwogICAgIH0KIAogICAgIHZhciBpY29uU3R5bGVDbGFzcyA9 IG51bGw7CkBAIC0xMDIsNiArOTksOSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRUcmVl RWxlbWVudCA9IGZ1bmN0aW9uKHRpbWVsaW5lUmVjb3JkLCBzaG93RnVsbExvY2F0aQogICAgIFdl Ykluc3BlY3Rvci5HZW5lcmFsVHJlZUVsZW1lbnQuY2FsbCh0aGlzLCBbaWNvblN0eWxlQ2xhc3Nd LCB0aXRsZSwgc3VidGl0bGUsIHJlcHJlc2VudGVkT2JqZWN0IHx8IHRpbWVsaW5lUmVjb3JkLCBm YWxzZSk7CiAKICAgICB0aGlzLnNtYWxsID0gdHJ1ZTsKKworICAgIGlmICh0aGlzLl9zb3VyY2VD b2RlTG9jYXRpb24pCisgICAgICAgIHRoaXMudG9vbHRpcEhhbmRsZWRTZXBhcmF0ZWx5ID0gdHJ1 ZTsKIH07CiAKIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZFRyZWVFbGVtZW50LlN0eWxlUmVj b3JkSWNvblN0eWxlQ2xhc3MgPSAic3R5bGUtcmVjb3JkIjsKQEAgLTEyNyw1ICsxMjcsMjAgQEAg V2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAg IHsKICAgICAgICAgdmFyIHVybCA9IHRoaXMuX3NvdXJjZUNvZGVMb2NhdGlvbiA/IHRoaXMuX3Nv dXJjZUNvZGVMb2NhdGlvbi5zb3VyY2VDb2RlLnVybCA6ICIiOwogICAgICAgICByZXR1cm4ge3Rl eHQ6IFt0aGlzLm1haW5UaXRsZSwgdXJsIHx8ICIiLCB0aGlzLl9yZWNvcmQuZGV0YWlscyB8fCAi Il19OworICAgIH0sCisKKyAgICAvLyBQcm90ZWN0ZWQKKworICAgIG9uYXR0YWNoOiBmdW5jdGlv bigpCisgICAgeworICAgICAgICBXZWJJbnNwZWN0b3IuR2VuZXJhbFRyZWVFbGVtZW50LnByb3Rv dHlwZS5vbmF0dGFjaC5jYWxsKHRoaXMpOworCisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMu ZWxlbWVudCk7CisKKyAgICAgICAgaWYgKCF0aGlzLnRvb2x0aXBIYW5kbGVkU2VwYXJhdGVseSkK KyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB2YXIgdG9vbHRpcFByZWZpeCA9IHRoaXMu bWFpblRpdGxlICsgIlxuIjsKKyAgICAgICAgdGhpcy5fc291cmNlQ29kZUxvY2F0aW9uLnBvcHVs YXRlTGl2ZURpc3BsYXlMb2NhdGlvblRvb2x0aXAodGhpcy5lbGVtZW50LCB0b29sdGlwUHJlZml4 KTsKICAgICB9CiB9Owo=