127367 2014-01-21 14:17:09 -0800 Web Inspector: Show Resource and Record selection path in the navigation bar 2014-01-22 09:50:32 -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 970416 0 timothy 2014-01-21 14:17:09 -0800 Selecting a Resource in the Timeline does not show Resource details sidebar. This is because the selection path is missing. 970417 1 webkit-bug-importer 2014-01-21 14:17:46 -0800 <rdar://problem/15873932> 970418 2 221786 timothy 2014-01-21 14:19:19 -0800 Created attachment 221786 Patch 970425 3 221786 joepeck 2014-01-21 14:31:41 -0800 Comment on attachment 221786 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=221786&action=review r=me > Source/WebInspectorUI/UserInterface/OverviewTimelineView.js:118 > + console.log(treeElement); Debug! Unless you wanted to change this be a console.assert. 970723 4 timothy 2014-01-22 09:50:32 -0800 https://trac.webkit.org/r162527 221786 2014-01-21 14:19:19 -0800 2014-01-21 14:31:41 -0800 Patch bug-127367-20140121141918.patch text/plain 15363 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyNDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA1 NGM5N2IxZWMxOGM1NDcwMjlhZjExMWMyOTgwYjFhY2Q1NDFiOTQ3Li45NTc1MThlM2UwYTJjZDc1 Yzg4ZDBmNzVhMDQ2NzA2MDE3NDE5YzZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNCBAQAorMjAxNC0wMS0yMSAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CisKKyAgICAgICAgU2hvdyB0aGUgUmVzb3VyY2UgYW5kIFJlY29yZCBzZWxlY3Rpb24gcGF0 aCBpbiB0aGUgbmF2aWdhdGlvbiBiYXIgZm9yIFRpbWVsaW5lIHZpZXdzLgorCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjczNjcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTGF5 b3V0VGltZWxpbmVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5l Vmlldy5wcm90b3R5cGUudHJlZUVsZW1lbnRQYXRoQ29tcG9uZW50U2VsZWN0ZWQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lVmlldy5wcm90b3R5cGUuX2RhdGFHcmlkTm9k ZVNlbGVjdGVkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL05ldHdvcmtUaW1lbGluZVZpZXcu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lVmlldy5wcm90b3R5cGUu dHJlZUVsZW1lbnRQYXRoQ29tcG9uZW50U2VsZWN0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk5ldHdvcmtUaW1lbGluZVZpZXcucHJvdG90eXBlLl9kYXRhR3JpZE5vZGVTZWxlY3RlZCk6Cisg ICAgICAgICogVXNlckludGVyZmFjZS9PdmVydmlld1RpbWVsaW5lVmlldy5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5PdmVydmlld1RpbWVsaW5lVmlldy5wcm90b3R5cGUuZ2V0IHNlbGVjdGlv blBhdGhDb21wb25lbnRzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PdmVydmlld1RpbWVsaW5l Vmlldy5wcm90b3R5cGUudHJlZUVsZW1lbnRQYXRoQ29tcG9uZW50U2VsZWN0ZWQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGltZWxpbmVWaWV3LnByb3RvdHlwZS5fZGF0YUdyaWRO b2RlU2VsZWN0ZWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvU2NyaXB0VGltZWxpbmVWaWV3 LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lVmlldy5wcm90b3R5cGUu dHJlZUVsZW1lbnRQYXRoQ29tcG9uZW50U2VsZWN0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlNjcmlwdFRpbWVsaW5lVmlldy5wcm90b3R5cGUuX2RhdGFHcmlkTm9kZVNlbGVjdGVkKToKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1RpbWVsaW5lQ29udGVudFZpZXcuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuVGltZWxpbmVDb250ZW50Vmlldy5wcm90b3R5cGUuX3RpbWVsaW5lVmlld1Nl bGVjdGlvblBhdGhDb21wb25lbnRzRGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U aW1lbGluZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fc2hvd1RpbWVsaW5lVmlldyk6CisgICAgICAg ICogVXNlckludGVyZmFjZS9UaW1lbGluZURhdGFHcmlkLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRpbWVsaW5lRGF0YUdyaWQucHJvdG90eXBlLnRyZWVFbGVtZW50Rm9yRGF0YUdyaWROb2Rl KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLnByb3RvdHlwZS5kYXRh R3JpZE5vZGVGb3JUcmVlRWxlbWVudCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9UaW1lbGlu ZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LnByb3RvdHlwZS5n ZXQgc2VsZWN0aW9uUGF0aENvbXBvbmVudHMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVs aW5lVmlldy5wcm90b3R5cGUudHJlZUVsZW1lbnRQYXRoQ29tcG9uZW50U2VsZWN0ZWQpOgorCiAy MDE0LTAxLTIwICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KIAogICAgICAg ICBBZGQgdGhlIHJlY29yZGluZyBidXR0b24gYmFjayB0byB0aGUgVGltZWxpbmVzIHNpZGViYXIu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9MYXlvdXRU aW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9MYXlv dXRUaW1lbGluZVZpZXcuanMKaW5kZXggNDcwYTMwOTNhNjY1YWExNzRlNTk1YWI3ZWJhNDA0M2Nj ZmQ4Mzc3Yi4uMmM0ODc2MmM5OTRjMzU3M2ZiYWM5YmVjYmM0OWFhMTQ5OWQzN2JkOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTGF5b3V0VGltZWxpbmVW aWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0xheW91dFRp bWVsaW5lVmlldy5qcwpAQCAtNjEsNiArNjEsNyBAQCBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxp bmVWaWV3ID0gZnVuY3Rpb24ocmVjb3JkaW5nKQogCiAgICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcg V2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lRGF0YUdyaWQodGhpcy5uYXZpZ2F0aW9uU2lkZWJh clRyZWVPdXRsaW5lLCBjb2x1bW5zKTsKICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLkV2ZW50LkZpbHRlcnNEaWRDaGFuZ2Us IHRoaXMuX2RhdGFHcmlkRmlsdGVyc0RpZENoYW5nZSwgdGhpcyk7CisgICAgdGhpcy5fZGF0YUdy aWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGF0YUdyaWQuRXZlbnQuU2VsZWN0ZWRO b2RlQ2hhbmdlZCwgdGhpcy5fZGF0YUdyaWROb2RlU2VsZWN0ZWQsIHRoaXMpOwogCiAgICAgdGhp cy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lVmlldy5T dHlsZUNsYXNzTmFtZSk7CiAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2RhdGFH cmlkLmVsZW1lbnQpOwpAQCAtMTIwLDYgKzEyMSwxNiBAQCBXZWJJbnNwZWN0b3IuTGF5b3V0VGlt ZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQucmVzZXQoKTsK ICAgICB9LAogCisgICAgLy8gUHJvdGVjdGVkCisKKyAgICB0cmVlRWxlbWVudFBhdGhDb21wb25l bnRTZWxlY3RlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB2YXIgZGF0YUdyaWRO b2RlID0gdGhpcy5fZGF0YUdyaWQuZGF0YUdyaWROb2RlRm9yVHJlZUVsZW1lbnQoZXZlbnQuZGF0 YS5wYXRoQ29tcG9uZW50LmdlbmVyYWxUcmVlRWxlbWVudCk7CisgICAgICAgIGlmICghZGF0YUdy aWROb2RlKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBkYXRhR3JpZE5vZGUucmV2ZWFs QW5kU2VsZWN0KCk7CisgICAgfSwKKwogICAgIC8vIFByaXZhdGUKIAogICAgIF9wcm9jZXNzUGVu ZGluZ1JlY29yZHM6IGZ1bmN0aW9uKCkKQEAgLTE1Miw2ICsxNjMsMTEgQEAgV2ViSW5zcGVjdG9y LkxheW91dFRpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIFdlYkluc3BlY3Rvci50 aW1lbGluZVNpZGViYXJQYW5lbC51cGRhdGVGaWx0ZXIoKTsKICAgICB9LAogCisgICAgX2RhdGFH cmlkTm9kZVNlbGVjdGVkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHRoaXMuZGlz cGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcuRXZlbnQuU2Vs ZWN0aW9uUGF0aENvbXBvbmVudHNEaWRDaGFuZ2UpOworICAgIH0sCisKICAgICBfdHJlZUVsZW1l bnRTZWxlY3RlZDogZnVuY3Rpb24odHJlZUVsZW1lbnQsIHNlbGVjdGVkQnlVc2VyKQogICAgIHsK ICAgICAgICAgaWYgKHRoaXMuX2RhdGFHcmlkLnNob3VsZElnbm9yZVNlbGVjdGlvbkV2ZW50KCkp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9OZXR3b3Jr VGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTmV0 d29ya1RpbWVsaW5lVmlldy5qcwppbmRleCA5OGM3ZDdjMzhlMzg5YWU0NTlmMDY0ZWUxNWNiNTEx ZmFlYWRjZDM0Li4zMzY2YjkxNGMyMWFmYWFhMzU1OGJiMWJjNjUyOWMwNThmODMyZWU5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9OZXR3b3JrVGltZWxp bmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL05ldHdv cmtUaW1lbGluZVZpZXcuanMKQEAgLTc4LDYgKzc4LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtU aW1lbGluZVZpZXcgPSBmdW5jdGlvbihyZWNvcmRpbmcpCiAKICAgICB0aGlzLl9kYXRhR3JpZCA9 IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3JpZCh0aGlzLm5hdmlnYXRpb25TaWRlYmFy VHJlZU91dGxpbmUsIGNvbHVtbnMpOwogICAgIHRoaXMuX2RhdGFHcmlkLmFkZEV2ZW50TGlzdGVu ZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQuRXZlbnQuRmlsdGVyc0RpZENoYW5nZSwg dGhpcy5fZGF0YUdyaWRGaWx0ZXJzRGlkQ2hhbmdlLCB0aGlzKTsKKyAgICB0aGlzLl9kYXRhR3Jp ZC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudC5TZWxlY3RlZE5v ZGVDaGFuZ2VkLCB0aGlzLl9kYXRhR3JpZE5vZGVTZWxlY3RlZCwgdGhpcyk7CiAKICAgICB0aGlz LmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lVmlldy5T dHlsZUNsYXNzTmFtZSk7CiAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2RhdGFH cmlkLmVsZW1lbnQpOwpAQCAtMTM3LDYgKzEzOCwxNiBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1Rp bWVsaW5lVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnJlc2V0KCk7 CiAgICAgfSwKIAorICAgIC8vIFByb3RlY3RlZAorCisgICAgdHJlZUVsZW1lbnRQYXRoQ29tcG9u ZW50U2VsZWN0ZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdmFyIGRhdGFHcmlk Tm9kZSA9IHRoaXMuX2RhdGFHcmlkLmRhdGFHcmlkTm9kZUZvclRyZWVFbGVtZW50KGV2ZW50LmRh dGEucGF0aENvbXBvbmVudC5nZW5lcmFsVHJlZUVsZW1lbnQpOworICAgICAgICBpZiAoIWRhdGFH cmlkTm9kZSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgZGF0YUdyaWROb2RlLnJldmVh bEFuZFNlbGVjdCgpOworICAgIH0sCisKICAgICAvLyBQcml2YXRlCiAKICAgICBfcHJvY2Vzc1Bl bmRpbmdSZWNvcmRzOiBmdW5jdGlvbigpCkBAIC0xNzQsNiArMTg1LDExIEBAIFdlYkluc3BlY3Rv ci5OZXR3b3JrVGltZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgV2ViSW5zcGVjdG9y LnRpbWVsaW5lU2lkZWJhclBhbmVsLnVwZGF0ZUZpbHRlcigpOwogICAgIH0sCiAKKyAgICBfZGF0 YUdyaWROb2RlU2VsZWN0ZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5k aXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5FdmVudC5T ZWxlY3Rpb25QYXRoQ29tcG9uZW50c0RpZENoYW5nZSk7CisgICAgfSwKKwogICAgIF90cmVlRWxl bWVudFNlbGVjdGVkOiBmdW5jdGlvbih0cmVlRWxlbWVudCwgc2VsZWN0ZWRCeVVzZXIpCiAgICAg ewogICAgICAgICBpZiAodGhpcy5fZGF0YUdyaWQuc2hvdWxkSWdub3JlU2VsZWN0aW9uRXZlbnQo KSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL092ZXJ2 aWV3VGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv T3ZlcnZpZXdUaW1lbGluZVZpZXcuanMKaW5kZXggZDljY2IzZmJmZTYwYzU2M2UyMGU0OTQzY2Mz NmUxOTYxYjE2MzZjNy4uYjVmZjIzNzE2OWRkNWUxZTNhYjliNDkzMmVhZTA2ZGY0YTg3OWMzOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvT3ZlcnZpZXdU aW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv T3ZlcnZpZXdUaW1lbGluZVZpZXcuanMKQEAgLTMyLDcgKzMyLDkgQEAgV2ViSW5zcGVjdG9yLk92 ZXJ2aWV3VGltZWxpbmVWaWV3ID0gZnVuY3Rpb24ocmVjb3JkaW5nKQogICAgIHRoaXMubmF2aWdh dGlvblNpZGViYXJUcmVlT3V0bGluZS5vbnNlbGVjdCA9IHRoaXMuX3RyZWVFbGVtZW50U2VsZWN0 ZWQuYmluZCh0aGlzKTsKIAogICAgIHZhciBjb2x1bW5zID0geyJncmFwaCI6IHt3aWR0aDogIjEw MCUifX07CisKICAgICB0aGlzLl9kYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWQo Y29sdW1ucyk7CisgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuRGF0YUdyaWQuRXZlbnQuU2VsZWN0ZWROb2RlQ2hhbmdlZCwgdGhpcy5fZGF0YUdyaWROb2Rl U2VsZWN0ZWQsIHRoaXMpOwogCiAgICAgdGhpcy5fdHJlZU91dGxpbmVEYXRhR3JpZFN5bmNocm9u aXplciA9IG5ldyBXZWJJbnNwZWN0b3IuVHJlZU91dGxpbmVEYXRhR3JpZFN5bmNocm9uaXplcih0 aGlzLl9jb250ZW50VHJlZU91dGxpbmUsIHRoaXMuX2RhdGFHcmlkKTsKIApAQCAtMTAzLDYgKzEw NSwzOSBAQCBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdUaW1lbGluZVZpZXcucHJvdG90eXBlID0gewog ICAgICAgICB0aGlzLl9wcm9jZXNzUGVuZGluZ1JlcHJlc2VudGVkT2JqZWN0cygpOwogICAgIH0s CiAKKyAgICBnZXQgc2VsZWN0aW9uUGF0aENvbXBvbmVudHMoKQorICAgIHsKKyAgICAgICAgdmFy IGRhdGFHcmlkTm9kZSA9IHRoaXMuX2RhdGFHcmlkLnNlbGVjdGVkTm9kZTsKKyAgICAgICAgaWYg KCFkYXRhR3JpZE5vZGUpCisgICAgICAgICAgICByZXR1cm4gbnVsbDsKKworICAgICAgICB2YXIg cGF0aENvbXBvbmVudHMgPSBbXTsKKworICAgICAgICB3aGlsZSAoZGF0YUdyaWROb2RlICYmICFk YXRhR3JpZE5vZGUucm9vdCkgeworICAgICAgICAgICAgdmFyIHRyZWVFbGVtZW50ID0gdGhpcy5f dHJlZU91dGxpbmVEYXRhR3JpZFN5bmNocm9uaXplci50cmVlRWxlbWVudEZvckRhdGFHcmlkTm9k ZShkYXRhR3JpZE5vZGUpOworICAgICAgICAgICAgY29uc29sZS5sb2codHJlZUVsZW1lbnQpOwor ICAgICAgICAgICAgaWYgKCF0cmVlRWxlbWVudCkKKyAgICAgICAgICAgICAgICBicmVhazsKKwor ICAgICAgICAgICAgdmFyIHBhdGhDb21wb25lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkdlbmVyYWxU cmVlRWxlbWVudFBhdGhDb21wb25lbnQodHJlZUVsZW1lbnQpOworICAgICAgICAgICAgcGF0aENv bXBvbmVudC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5IaWVyYXJjaGljYWxQYXRoQ29t cG9uZW50LkV2ZW50LlNpYmxpbmdXYXNTZWxlY3RlZCwgdGhpcy50cmVlRWxlbWVudFBhdGhDb21w b25lbnRTZWxlY3RlZCwgdGhpcyk7CisgICAgICAgICAgICBwYXRoQ29tcG9uZW50cy51bnNoaWZ0 KHBhdGhDb21wb25lbnQpOworICAgICAgICAgICAgZGF0YUdyaWROb2RlID0gZGF0YUdyaWROb2Rl LnBhcmVudDsKKyAgICAgICAgfQorCisgICAgICAgIHJldHVybiBwYXRoQ29tcG9uZW50czsKKyAg ICB9LAorCisgICAgLy8gUHJvdGVjdGVkCisKKyAgICB0cmVlRWxlbWVudFBhdGhDb21wb25lbnRT ZWxlY3RlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB2YXIgZGF0YUdyaWROb2Rl ID0gdGhpcy5fdHJlZU91dGxpbmVEYXRhR3JpZFN5bmNocm9uaXplci5kYXRhR3JpZE5vZGVGb3JU cmVlRWxlbWVudChldmVudC5kYXRhLnBhdGhDb21wb25lbnQuZ2VuZXJhbFRyZWVFbGVtZW50KTsK KyAgICAgICAgaWYgKCFkYXRhR3JpZE5vZGUpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAg IGRhdGFHcmlkTm9kZS5yZXZlYWxBbmRTZWxlY3QoKTsKKyAgICB9LAorCiAgICAgLy8gUHJpdmF0 ZQogCiAgICAgX2NvbXBhcmVUcmVlRWxlbWVudHNCeURldGFpbHM6IGZ1bmN0aW9uKGEsIGIpCkBA IC0yNjYsNiArMzAxLDExIEBAIFdlYkluc3BlY3Rvci5PdmVydmlld1RpbWVsaW5lVmlldy5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHRoaXMubmVlZHNMYXlvdXQoKTsKICAgICB9LAogCisgICAgX2Rh dGFHcmlkTm9kZVNlbGVjdGVkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHRoaXMu ZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcuRXZlbnQu U2VsZWN0aW9uUGF0aENvbXBvbmVudHNEaWRDaGFuZ2UpOworICAgIH0sCisKICAgICBfdHJlZUVs ZW1lbnRTZWxlY3RlZDogZnVuY3Rpb24odHJlZUVsZW1lbnQsIHNlbGVjdGVkQnlVc2VyKQogICAg IHsKICAgICAgICAgaWYgKCFXZWJJbnNwZWN0b3IudGltZWxpbmVTaWRlYmFyUGFuZWwuY2FuU2hv d0RpZmZlcmVudENvbnRlbnRWaWV3KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9TY3JpcHRUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9TY3JpcHRUaW1lbGluZVZpZXcuanMKaW5kZXggOGMwOGFhZmMz MmM3NDVhNDMyYjczZTkwYjQ1N2E3OWU2NTIwZjMxOC4uN2E1ODAxMWE1N2YwNmE3ODcxYjhhOWY1 MThhNjZkYzUxNjc4NmQyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvU2NyaXB0VGltZWxpbmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1NjcmlwdFRpbWVsaW5lVmlldy5qcwpAQCAtNTUsNiArNTUsNyBAQCBX ZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVWaWV3ID0gZnVuY3Rpb24ocmVjb3JkaW5nKQogCiAg ICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lRGF0YUdy aWQodGhpcy5uYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lLCBjb2x1bW5zKTsKICAgICB0aGlz Ll9kYXRhR3JpZC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlk LkV2ZW50LkZpbHRlcnNEaWRDaGFuZ2UsIHRoaXMuX2RhdGFHcmlkRmlsdGVyc0RpZENoYW5nZSwg dGhpcyk7CisgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3Iu RGF0YUdyaWQuRXZlbnQuU2VsZWN0ZWROb2RlQ2hhbmdlZCwgdGhpcy5fZGF0YUdyaWROb2RlU2Vs ZWN0ZWQsIHRoaXMpOwogCiAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVj dG9yLlNjcmlwdFRpbWVsaW5lVmlldy5TdHlsZUNsYXNzTmFtZSk7CiAgICAgdGhpcy5lbGVtZW50 LmFwcGVuZENoaWxkKHRoaXMuX2RhdGFHcmlkLmVsZW1lbnQpOwpAQCAtMTE0LDYgKzExNSwxNiBA QCBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAg dGhpcy5fZGF0YUdyaWQucmVzZXQoKTsKICAgICB9LAogCisgICAgLy8gUHJvdGVjdGVkCisKKyAg ICB0cmVlRWxlbWVudFBhdGhDb21wb25lbnRTZWxlY3RlZDogZnVuY3Rpb24oZXZlbnQpCisgICAg eworICAgICAgICB2YXIgZGF0YUdyaWROb2RlID0gdGhpcy5fZGF0YUdyaWQuZGF0YUdyaWROb2Rl Rm9yVHJlZUVsZW1lbnQoZXZlbnQuZGF0YS5wYXRoQ29tcG9uZW50LmdlbmVyYWxUcmVlRWxlbWVu dCk7CisgICAgICAgIGlmICghZGF0YUdyaWROb2RlKQorICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICBkYXRhR3JpZE5vZGUucmV2ZWFsQW5kU2VsZWN0KCk7CisgICAgfSwKKwogICAgIC8vIFBy aXZhdGUKIAogICAgIF9wcm9jZXNzUGVuZGluZ1JlY29yZHM6IGZ1bmN0aW9uKCkKQEAgLTE0Niw2 ICsxNTcsMTEgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7 CiAgICAgICAgIFdlYkluc3BlY3Rvci50aW1lbGluZVNpZGViYXJQYW5lbC51cGRhdGVGaWx0ZXIo KTsKICAgICB9LAogCisgICAgX2RhdGFHcmlkTm9kZVNlbGVjdGVkOiBmdW5jdGlvbihldmVudCkK KyAgICB7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rv ci5UaW1lbGluZVZpZXcuRXZlbnQuU2VsZWN0aW9uUGF0aENvbXBvbmVudHNEaWRDaGFuZ2UpOwor ICAgIH0sCisKICAgICBfdHJlZUVsZW1lbnRTZWxlY3RlZDogZnVuY3Rpb24odHJlZUVsZW1lbnQs IHNlbGVjdGVkQnlVc2VyKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX2RhdGFHcmlkLnNob3Vs ZElnbm9yZVNlbGVjdGlvbkV2ZW50KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9UaW1lbGluZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVDb250ZW50Vmlldy5qcwppbmRleCBjMGIxYTA5 NzAyNzE0Mjc1MTNlMDJjYjYzNmQ5ZGM0ZWIzMzRlZjg1Li5lZGUzZDYxNWI4ZjZmNTZiY2QzOTUx ODViYzIyNWVlNjc5ODhhZDA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9UaW1lbGluZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lQ29udGVudFZpZXcuanMKQEAgLTEyOCw5ICsxMjgs OSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVDb250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAKICAg ICBnZXQgc2VsZWN0aW9uUGF0aENvbXBvbmVudHMoKQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlz Ll9jdXJyZW50VGltZWxpbmVWaWV3SWRlbnRpZmllcikKLSAgICAgICAgICAgIHJldHVybiBbXTsK LSAgICAgICAgcmV0dXJuIFt0aGlzLl9wYXRoQ29tcG9uZW50TWFwLmdldCh0aGlzLl9jdXJyZW50 VGltZWxpbmVWaWV3SWRlbnRpZmllcildOworICAgICAgICB2YXIgcGF0aENvbXBvbmVudHMgPSB0 aGlzLl9jdXJyZW50VGltZWxpbmVWaWV3SWRlbnRpZmllciA/IFt0aGlzLl9wYXRoQ29tcG9uZW50 TWFwLmdldCh0aGlzLl9jdXJyZW50VGltZWxpbmVWaWV3SWRlbnRpZmllcildIDogW107CisgICAg ICAgIHBhdGhDb21wb25lbnRzID0gcGF0aENvbXBvbmVudHMuY29uY2F0KHRoaXMuX2N1cnJlbnRU aW1lbGluZVZpZXcuc2VsZWN0aW9uUGF0aENvbXBvbmVudHMgfHwgW10pOworICAgICAgICByZXR1 cm4gcGF0aENvbXBvbmVudHM7CiAgICAgfSwKIAogICAgIGdldCBuYXZpZ2F0aW9uSXRlbXMoKQpA QCAtMjE3LDYgKzIxNywxMSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVDb250ZW50Vmlldy5wcm90 b3R5cGUgPSB7CiAgICAgICAgIFdlYkluc3BlY3Rvci50aW1lbGluZVNpZGViYXJQYW5lbC5zaG93 VGltZWxpbmVWaWV3KGV2ZW50LmRhdGEucGF0aENvbXBvbmVudC5yZXByZXNlbnRlZE9iamVjdCk7 CiAgICAgfSwKIAorICAgIF90aW1lbGluZVZpZXdTZWxlY3Rpb25QYXRoQ29tcG9uZW50c0RpZENo YW5nZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0 ZW5lcnMoV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3LkV2ZW50LlNlbGVjdGlvblBhdGhDb21wb25l bnRzRGlkQ2hhbmdlKTsKKyAgICB9LAorCiAgICAgX3Nob3dUaW1lbGluZVZpZXc6IGZ1bmN0aW9u KHRpbWVsaW5lVmlldywgaWRlbnRpZmllcikKICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0 KHRpbWVsaW5lVmlldyBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcpOwpAQCAt MjI1LDYgKzIzMCw4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3LnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBpZiAodGhpcy5fY3VycmVudFRp bWVsaW5lVmlldykgeworICAgICAgICAgICAgdGhpcy5fY3VycmVudFRpbWVsaW5lVmlldy5yZW1v dmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcuRXZlbnQuU2VsZWN0aW9u UGF0aENvbXBvbmVudHNEaWRDaGFuZ2UsIHRoaXMuX3RpbWVsaW5lVmlld1NlbGVjdGlvblBhdGhD b21wb25lbnRzRGlkQ2hhbmdlLCB0aGlzKTsKKwogICAgICAgICAgICAgdGhpcy5fY3VycmVudFRp bWVsaW5lVmlldy5oaWRkZW4oKTsKICAgICAgICAgICAgIHRoaXMuX2N1cnJlbnRUaW1lbGluZVZp ZXcuZWxlbWVudC5yZW1vdmUoKTsKICAgICAgICAgfQpAQCAtMjM2LDYgKzI0Myw4IEBAIFdlYklu c3BlY3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgV2ViSW5z cGVjdG9yLnRpbWVsaW5lU2lkZWJhclBhbmVsLmNvbnRlbnRUcmVlT3V0bGluZUxhYmVsID0gdGlt ZWxpbmVWaWV3ICYmIHRpbWVsaW5lVmlldy5uYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lTGFi ZWw7CiAKICAgICAgICAgaWYgKHRoaXMuX2N1cnJlbnRUaW1lbGluZVZpZXcpIHsKKyAgICAgICAg ICAgIHRoaXMuX2N1cnJlbnRUaW1lbGluZVZpZXcuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuVGltZWxpbmVWaWV3LkV2ZW50LlNlbGVjdGlvblBhdGhDb21wb25lbnRzRGlkQ2hhbmdlLCB0 aGlzLl90aW1lbGluZVZpZXdTZWxlY3Rpb25QYXRoQ29tcG9uZW50c0RpZENoYW5nZSwgdGhpcyk7 CisKICAgICAgICAgICAgIHRoaXMuX3ZpZXdDb250YWluZXIuYXBwZW5kQ2hpbGQodGhpcy5fY3Vy cmVudFRpbWVsaW5lVmlldy5lbGVtZW50KTsKIAogICAgICAgICAgICAgdGhpcy5fY3VycmVudFRp bWVsaW5lVmlldy5zdGFydFRpbWUgPSB0aGlzLl90aW1lbGluZU92ZXJ2aWV3LnNlbGVjdGlvblN0 YXJ0VGltZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1RpbWVsaW5lRGF0YUdyaWQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9UaW1lbGluZURhdGFHcmlkLmpzCmluZGV4IDEzZGM3MTAxNTU5M2Y2OTBiMzVmYjQ4MmM0MGQ1 ZjIzMmY5MThjMzMuLjZjOGEyOTNiYjA5MDYwODFlOWM2YjU0YmM2ZGFlNzYzYWJhMGRhZWQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lRGF0 YUdyaWQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxp bmVEYXRhR3JpZC5qcwpAQCAtMTE5LDYgKzExOSwxNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVE YXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2hpZGVQb3BvdmVyKCk7CiAgICAg fSwKIAorICAgIHRyZWVFbGVtZW50Rm9yRGF0YUdyaWROb2RlOiBmdW5jdGlvbihkYXRhR3JpZE5v ZGUpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fdHJlZU91dGxpbmVEYXRhR3JpZFN5bmNo cm9uaXplci50cmVlRWxlbWVudEZvckRhdGFHcmlkTm9kZShkYXRhR3JpZE5vZGUpOworICAgIH0s CisKKyAgICBkYXRhR3JpZE5vZGVGb3JUcmVlRWxlbWVudDogZnVuY3Rpb24odHJlZUVsZW1lbnQp CisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fdHJlZU91dGxpbmVEYXRhR3JpZFN5bmNocm9u aXplci5kYXRhR3JpZE5vZGVGb3JUcmVlRWxlbWVudCh0cmVlRWxlbWVudCk7CisgICAgfSwKKwog ICAgIGNhbGxGcmFtZVBvcG92ZXJBbmNob3JFbGVtZW50OiBmdW5jdGlvbigpCiAgICAgewogICAg ICAgICAvLyBJbXBsZW1lbnRlZCBieSBzdWJjbGFzc2VzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVWaWV3LmpzCmluZGV4IDFlOWY1NTQ1OTRl NTlhNGJlY2JlMDFkMDRjODhjOWZlMzkyZjM1NTYuLmYyYzdkZmFkNjEyMGJiYjM4ZWJkMDA4ZDFi YzNlMjU3ZTk1NTk1OTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1RpbWVsaW5lVmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9UaW1lbGluZVZpZXcuanMKQEAgLTQwLDYgKzQwLDEwIEBAIFdlYkluc3BlY3Rvci5U aW1lbGluZVZpZXcgPSBmdW5jdGlvbigpCiAKIFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcuU3R5 bGVDbGFzc05hbWUgPSAidGltZWxpbmUtdmlldyI7CiAKK1dlYkluc3BlY3Rvci5UaW1lbGluZVZp ZXcuRXZlbnQgPSB7CisgICAgU2VsZWN0aW9uUGF0aENvbXBvbmVudHNEaWRDaGFuZ2U6ICJ0aW1l bGluZS12aWV3LXNlbGVjdGlvbi1wYXRoLWNvbXBvbmVudHMtZGlkLWNoYW5nZSIKK307CisKIFdl Ykluc3BlY3Rvci5UaW1lbGluZVZpZXcucHJvdG90eXBlID0gewogICAgIGNvbnN0cnVjdG9yOiBX ZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LAogICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLk9i amVjdC5wcm90b3R5cGUsCkBAIC01Nyw2ICs2MSwxNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVW aWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIG51bGw7CiAgICAgfSwKIAorICAgIGdl dCBzZWxlY3Rpb25QYXRoQ29tcG9uZW50cygpCisgICAgeworICAgICAgICBpZiAoIXRoaXMuX2Nv bnRlbnRUcmVlT3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50KQorICAgICAgICAgICAgcmV0dXJu IG51bGw7CisKKyAgICAgICAgdmFyIHBhdGhDb21wb25lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkdl bmVyYWxUcmVlRWxlbWVudFBhdGhDb21wb25lbnQodGhpcy5fY29udGVudFRyZWVPdXRsaW5lLnNl bGVjdGVkVHJlZUVsZW1lbnQpOworICAgICAgICBwYXRoQ29tcG9uZW50LmFkZEV2ZW50TGlzdGVu ZXIoV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21wb25lbnQuRXZlbnQuU2libGluZ1dh c1NlbGVjdGVkLCB0aGlzLnRyZWVFbGVtZW50UGF0aENvbXBvbmVudFNlbGVjdGVkLCB0aGlzKTsK KyAgICAgICAgcmV0dXJuIFtwYXRoQ29tcG9uZW50XTsKKyAgICB9LAorCiAgICAgZ2V0IHplcm9U aW1lKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl96ZXJvVGltZTsKQEAgLTE3Niw2ICsx OTAsMTEgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7CiAKICAgICAv LyBQcm90ZWN0ZWQKIAorICAgIHRyZWVFbGVtZW50UGF0aENvbXBvbmVudFNlbGVjdGVkOiBmdW5j dGlvbihldmVudCkKKyAgICB7CisgICAgICAgIC8vIEltcGxlbWVudGVkIGJ5IHN1Yi1jbGFzc2Vz IGlmIG5lZWRlZC4KKyAgICB9LAorCiAgICAgbmVlZHNMYXlvdXQ6IGZ1bmN0aW9uKCkKICAgICB7 CiAgICAgICAgIGlmICghdGhpcy5fdmlzaWJsZSkK