155765 2016-03-22 12:28:52 -0700 Web Inspector: remove the remaining TimelineSidebarPanel references 2016-03-22 13:29:46 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 mattbaker mattbaker bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1177087 0 mattbaker 2016-03-22 12:28:52 -0700 * SUMMARY Remove the remaining TimelineSidebarPanel references. 1177088 1 webkit-bug-importer 2016-03-22 12:29:07 -0700 <rdar://problem/25296980> 1177091 2 274676 mattbaker 2016-03-22 12:38:24 -0700 Created attachment 274676 [Patch] Proposed Fix 1177100 3 274676 commit-queue 2016-03-22 13:29:43 -0700 Comment on attachment 274676 [Patch] Proposed Fix Clearing flags on attachment: 274676 Committed r198548: <http://trac.webkit.org/changeset/198548> 1177101 4 commit-queue 2016-03-22 13:29:46 -0700 All reviewed patches have been landed. Closing bug. 274676 2016-03-22 12:38:24 -0700 2016-03-22 13:29:43 -0700 [Patch] Proposed Fix bug-155765-20160322123818.patch text/plain 8913 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTk4NTQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAw YmY5MWY3ZWJiMmU2OWI4MTFhNmM4MWIxODMxMTMyNTdiNzczYmJhLi44Mjg5N2FjODhiODYzYTAx NTMyNGVlZjk1ZWVjZGFiOTNmNmNhZjE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzNCBAQAogMjAxNi0wMy0yMiAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcmVtb3ZlIHRoZSByZW1haW5pbmcgVGltZWxpbmVT aWRlYmFyUGFuZWwgcmVmZXJlbmNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTU1NzY1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNTI5Njk4MD4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUg ZGVhZCBjb2RlIGZyb20gVGltZWxpbmVWaWV3IGFuZCBUaW1lbGluZVRhYkNvbnRlbnRWaWV3Lgor CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9PdmVydmlld1RpbWVsaW5lVmlldy5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5PdmVydmlld1RpbWVsaW5lVmlldy5wcm90b3R5cGUuY2Fu U2hvd0NvbnRlbnRWaWV3Rm9yVHJlZUVsZW1lbnQpOiBEZWxldGVkLgorICAgICAgICAoV2ViSW5z cGVjdG9yLk92ZXJ2aWV3VGltZWxpbmVWaWV3LnByb3RvdHlwZS5zaG93Q29udGVudFZpZXdGb3JU cmVlRWxlbWVudCk6IERlbGV0ZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jl bmRlcmluZ0ZyYW1lVGltZWxpbmVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlbmRl cmluZ0ZyYW1lVGltZWxpbmVWaWV3LnByb3RvdHlwZS5jYW5TaG93Q29udGVudFZpZXdGb3JUcmVl RWxlbWVudCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVuZGVyaW5nRnJhbWVU aW1lbGluZVZpZXcucHJvdG90eXBlLnNob3dDb250ZW50Vmlld0ZvclRyZWVFbGVtZW50KTogRGVs ZXRlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0RGV0YWlsc1RpbWVs aW5lVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHREZXRhaWxzVGltZWxpbmVW aWV3LnByb3RvdHlwZS5jYW5TaG93Q29udGVudFZpZXdGb3JUcmVlRWxlbWVudCk6IERlbGV0ZWQu CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0RGV0YWlsc1RpbWVsaW5lVmlldy5wcm90b3R5 cGUuc2hvd0NvbnRlbnRWaWV3Rm9yVHJlZUVsZW1lbnQpOiBEZWxldGVkLgorCisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRhYkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlRpbWVsaW5lVGFiQ29udGVudFZpZXcpOgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9UaW1lbGluZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVWaWV3LnByb3RvdHlwZS5jYW5TaG93Q29udGVudFZpZXdGb3JUcmVlRWxlbWVudCk6IERl bGV0ZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LnByb3RvdHlwZS5zaG93 Q29udGVudFZpZXdGb3JUcmVlRWxlbWVudCk6IERlbGV0ZWQuCisKKzIwMTYtMDMtMjIgIE1hdHQg QmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFRp bWVsaW5lcyBVSSByZWRlc2lnbjogUHJvdmlkZSBhIHdheSB0byBjb25maWd1cmUgd2hpY2ggaW5z dHJ1bWVudHMgdG8gdXNlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNTM2NzIKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI0NDE3NTc1PgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT3ZlcnZpZXdU aW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9PdmVydmlld1RpbWVsaW5lVmlldy5qcwppbmRleCBhOGJmNTJmNzRlNGFjMDQ0MTE3NmJjNjhj OTJjODcwY2MyZmQ0MzZjLi40NGUzYTA1ZmJiMjFiZWExNTYyMzI2ZjkwMjA1NTllNDE2ZDNlNzVj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9P dmVydmlld1RpbWVsaW5lVmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9PdmVydmlld1RpbWVsaW5lVmlldy5qcwpAQCAtMTI4LDMzICsxMjgsNiBA QCBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdUaW1lbGluZVZpZXcgPSBjbGFzcyBPdmVydmlld1RpbWVs aW5lVmlldyBleHRlbmRzIFdlYkluc3BlYwogICAgICAgICBkYXRhR3JpZE5vZGUucmV2ZWFsQW5k U2VsZWN0KCk7CiAgICAgfQogCi0gICAgY2FuU2hvd0NvbnRlbnRWaWV3Rm9yVHJlZUVsZW1lbnQo dHJlZUVsZW1lbnQpCi0gICAgewotICAgICAgICBpZiAodHJlZUVsZW1lbnQgaW5zdGFuY2VvZiBX ZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlRWxlbWVudCB8fCB0cmVlRWxlbWVudCBpbnN0YW5jZW9m IFdlYkluc3BlY3Rvci5TY3JpcHRUcmVlRWxlbWVudCkKLSAgICAgICAgICAgIHJldHVybiB0cnVl OwotICAgICAgICByZXR1cm4gc3VwZXIuY2FuU2hvd0NvbnRlbnRWaWV3Rm9yVHJlZUVsZW1lbnQo dHJlZUVsZW1lbnQpOwotICAgIH0KLQotICAgIHNob3dDb250ZW50Vmlld0ZvclRyZWVFbGVtZW50 KHRyZWVFbGVtZW50KQotICAgIHsKLSAgICAgICAgaWYgKHRyZWVFbGVtZW50IGluc3RhbmNlb2Yg V2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZUVsZW1lbnQgfHwgdHJlZUVsZW1lbnQgaW5zdGFuY2Vv ZiBXZWJJbnNwZWN0b3IuU2NyaXB0VHJlZUVsZW1lbnQpIHsKLSAgICAgICAgICAgIFdlYkluc3Bl Y3Rvci5zaG93U291cmNlQ29kZSh0cmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVjdCk7Ci0gICAg ICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAoISh0cmVlRWxlbWVudCBp bnN0YW5jZW9mIFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlVGltZWxpbmVUcmVlRWxlbWVudCkpIHsK LSAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIlVua25vd24gdHJlZSBlbGVtZW50IHNlbGVjdGVk LiIpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKCF0cmVl RWxlbWVudC5zb3VyY2VDb2RlVGltZWxpbmUuc291cmNlQ29kZUxvY2F0aW9uKSB7Ci0gICAgICAg ICAgICB0aGlzLnRpbWVsaW5lU2lkZWJhclBhbmVsLnNob3dUaW1lbGluZU92ZXJ2aWV3KCk7Ci0g ICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQotICAgICAgICBXZWJJbnNwZWN0b3Iuc2hv d09yaWdpbmFsT3JGb3JtYXR0ZWRTb3VyY2VDb2RlTG9jYXRpb24odHJlZUVsZW1lbnQuc291cmNl Q29kZVRpbWVsaW5lLnNvdXJjZUNvZGVMb2NhdGlvbik7Ci0gICAgfQotCiAgICAgbGF5b3V0KCkK ICAgICB7CiAgICAgICAgIGxldCBvbGRaZXJvVGltZSA9IHRoaXMuX3RpbWVsaW5lUnVsZXIuemVy b1RpbWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlbmRlcmluZ0ZyYW1lVGltZWxpbmVWaWV3LmpzCmluZGV4 IGM0ZTEzZDM4MjE5YjBjNjM0YzhiZTRmM2UwNzE4Mzg0MjdkMWRjNmMuLjliMjMwYzllYjRmYTRl NTRjNGQxMDkwODEwYjlmNDNlYzYyMTU0MzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlbmRlcmluZ0ZyYW1lVGltZWxpbmVWaWV3LmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlbmRlcmluZ0Zy YW1lVGltZWxpbmVWaWV3LmpzCkBAIC0xODAsMjQgKzE4MCw2IEBAIFdlYkluc3BlY3Rvci5SZW5k ZXJpbmdGcmFtZVRpbWVsaW5lVmlldyA9IGNsYXNzIFJlbmRlcmluZ0ZyYW1lVGltZWxpbmVWaWV3 IGV4dGVuCiAKICAgICAvLyBQcm90ZWN0ZWQKIAotICAgIGNhblNob3dDb250ZW50Vmlld0ZvclRy ZWVFbGVtZW50KHRyZWVFbGVtZW50KQotICAgIHsKLSAgICAgICAgaWYgKHRyZWVFbGVtZW50IGlu c3RhbmNlb2YgV2ViSW5zcGVjdG9yLlByb2ZpbGVOb2RlVHJlZUVsZW1lbnQpCi0gICAgICAgICAg ICByZXR1cm4gISF0cmVlRWxlbWVudC5wcm9maWxlTm9kZS5zb3VyY2VDb2RlTG9jYXRpb247Ci0g ICAgICAgIHJldHVybiBzdXBlci5jYW5TaG93Q29udGVudFZpZXdGb3JUcmVlRWxlbWVudCh0cmVl RWxlbWVudCk7Ci0gICAgfQotCi0gICAgc2hvd0NvbnRlbnRWaWV3Rm9yVHJlZUVsZW1lbnQodHJl ZUVsZW1lbnQpCi0gICAgewotICAgICAgICBpZiAodHJlZUVsZW1lbnQgaW5zdGFuY2VvZiBXZWJJ bnNwZWN0b3IuUHJvZmlsZU5vZGVUcmVlRWxlbWVudCkgewotICAgICAgICAgICAgaWYgKHRyZWVF bGVtZW50LnByb2ZpbGVOb2RlLnNvdXJjZUNvZGVMb2NhdGlvbikKLSAgICAgICAgICAgICAgICBX ZWJJbnNwZWN0b3Iuc2hvd09yaWdpbmFsT3JGb3JtYXR0ZWRTb3VyY2VDb2RlTG9jYXRpb24odHJl ZUVsZW1lbnQucHJvZmlsZU5vZGUuc291cmNlQ29kZUxvY2F0aW9uKTsKLSAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgfQotCi0gICAgICAgIHN1cGVyLnNob3dDb250ZW50Vmlld0ZvclRyZWVF bGVtZW50KHRyZWVFbGVtZW50KTsKLSAgICB9Ci0KICAgICBkYXRhR3JpZE5vZGVQYXRoQ29tcG9u ZW50U2VsZWN0ZWQoZXZlbnQpCiAgICAgewogICAgICAgICBsZXQgZGF0YUdyaWROb2RlID0gZXZl bnQuZGF0YS5wYXRoQ29tcG9uZW50LnRpbWVsaW5lRGF0YUdyaWROb2RlOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0RGV0YWlsc1Rp bWVsaW5lVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1NjcmlwdERldGFpbHNUaW1lbGluZVZpZXcuanMKaW5kZXggOWYwNWQzNWVmZDAwNjc5NDZhNjMy OTUyZjkzZDcyZmI5NTY0MGEzNS4uOWJmNTI2YmJmNzczNWI1NmFiMzNhMzIwYWYwZmJmZTlhZDYz MGFjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU2NyaXB0RGV0YWlsc1RpbWVsaW5lVmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHREZXRhaWxzVGltZWxpbmVWaWV3LmpzCkBAIC0x NDcsMjQgKzE0Nyw2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHREZXRhaWxzVGltZWxpbmVWaWV3ID0g Y2xhc3MgU2NyaXB0RGV0YWlsc1RpbWVsaW5lVmlldyBleHRlbmRzCiAKICAgICAvLyBQcm90ZWN0 ZWQKIAotICAgIGNhblNob3dDb250ZW50Vmlld0ZvclRyZWVFbGVtZW50KHRyZWVFbGVtZW50KQot ICAgIHsKLSAgICAgICAgaWYgKHRyZWVFbGVtZW50IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlBy b2ZpbGVOb2RlVHJlZUVsZW1lbnQpCi0gICAgICAgICAgICByZXR1cm4gISF0cmVlRWxlbWVudC5w cm9maWxlTm9kZS5zb3VyY2VDb2RlTG9jYXRpb247Ci0gICAgICAgIHJldHVybiBzdXBlci5jYW5T aG93Q29udGVudFZpZXdGb3JUcmVlRWxlbWVudCh0cmVlRWxlbWVudCk7Ci0gICAgfQotCi0gICAg c2hvd0NvbnRlbnRWaWV3Rm9yVHJlZUVsZW1lbnQodHJlZUVsZW1lbnQpCi0gICAgewotICAgICAg ICBpZiAodHJlZUVsZW1lbnQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuUHJvZmlsZU5vZGVUcmVl RWxlbWVudCkgewotICAgICAgICAgICAgaWYgKHRyZWVFbGVtZW50LnByb2ZpbGVOb2RlLnNvdXJj ZUNvZGVMb2NhdGlvbikKLSAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd09yaWdpbmFs T3JGb3JtYXR0ZWRTb3VyY2VDb2RlTG9jYXRpb24odHJlZUVsZW1lbnQucHJvZmlsZU5vZGUuc291 cmNlQ29kZUxvY2F0aW9uKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAg ICAgIHN1cGVyLnNob3dDb250ZW50Vmlld0ZvclRyZWVFbGVtZW50KHRyZWVFbGVtZW50KTsKLSAg ICB9Ci0KICAgICBkYXRhR3JpZE5vZGVQYXRoQ29tcG9uZW50U2VsZWN0ZWQoZXZlbnQpCiAgICAg ewogICAgICAgICBsZXQgZGF0YUdyaWROb2RlID0gZXZlbnQuZGF0YS5wYXRoQ29tcG9uZW50LnRp bWVsaW5lRGF0YUdyaWROb2RlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVGFiQ29udGVudFZpZXcuanMK aW5kZXggMzBjOGIzY2QxYTk4MDQ5ZWM0NjU4Y2I4ZmMxNjM1ODg1MDg0ODExYy4uZWVhZjgzMWQ2 NjI3YmYwNmQ3OWVmMTM5N2Q2M2JiOGJjODFhYTVhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50Vmlldy5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRh YkNvbnRlbnRWaWV3LmpzCkBAIC0zMSw3ICszMSw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVRh YkNvbnRlbnRWaWV3ID0gY2xhc3MgVGltZWxpbmVUYWJDb250ZW50VmlldyBleHRlbmRzIFdlYklu CiAgICAgICAgIGxldCB0YWJCYXJJdGVtID0gbmV3IFdlYkluc3BlY3Rvci5UYWJCYXJJdGVtKGlt YWdlLCB0aXRsZSk7CiAgICAgICAgIGxldCBkZXRhaWxzU2lkZWJhclBhbmVscyA9IFtXZWJJbnNw ZWN0b3IucmVzb3VyY2VEZXRhaWxzU2lkZWJhclBhbmVsLCBXZWJJbnNwZWN0b3IucHJvYmVEZXRh aWxzU2lkZWJhclBhbmVsXTsKIAotICAgICAgICBzdXBlcihpZGVudGlmaWVyIHx8ICJ0aW1lbGlu ZSIsICJ0aW1lbGluZSIsIHRhYkJhckl0ZW0sIFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQ YW5lbCwgZGV0YWlsc1NpZGViYXJQYW5lbHMpOworICAgICAgICBzdXBlcihpZGVudGlmaWVyIHx8 ICJ0aW1lbGluZSIsICJ0aW1lbGluZSIsIHRhYkJhckl0ZW0sIG51bGwsIGRldGFpbHNTaWRlYmFy UGFuZWxzKTsKIAogICAgICAgICAvLyBNYWludGFpbiBhbiBpbnZpc2libGUgdHJlZSBvdXRsaW5l IGNvbnRhaW5pbmcgdHJlZSBlbGVtZW50cyBmb3IgYWxsIHJlY29yZGluZ3MuCiAgICAgICAgIC8v IFRoZSB2aXNpYmxlIHJlY29yZGluZydzIHRyZWUgZWxlbWVudCBpcyBzZWxlY3RlZCB3aGVuIHRo ZSBjb250ZW50IHZpZXcgY2hhbmdlcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVmlldy5qcwppbmRleCBiYjBmNGI5OWZh ZGJkNDk3M2RhYTRlM2NmZThlMzM1NWIzY2I4NGQ1Li41Y2NmMTViYTAyYzc5Nzc3ZWFkYWI5YmY2 YWM5MGE5ZDBkNmJhNDkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9UaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVWaWV3LmpzCkBAIC0xNjQsMzMgKzE2NCw2IEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcgPSBjbGFzcyBUaW1lbGluZVZpZXcgZXh0ZW5kcyBX ZWJJbnNwZWN0b3IuQ29udGVudFZpZXcKIAogICAgIC8vIFByb3RlY3RlZAogCi0gICAgY2FuU2hv d0NvbnRlbnRWaWV3Rm9yVHJlZUVsZW1lbnQodHJlZUVsZW1lbnQpCi0gICAgewotICAgICAgICAv LyBJbXBsZW1lbnRlZCBieSBzdWItY2xhc3NlcyBpZiBuZWVkZWQuCi0KLSAgICAgICAgaWYgKHRy ZWVFbGVtZW50IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkVHJlZUVsZW1l bnQpCi0gICAgICAgICAgICByZXR1cm4gISF0cmVlRWxlbWVudC5zb3VyY2VDb2RlTG9jYXRpb247 Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9Ci0KLSAgICBzaG93Q29udGVudFZpZXdGb3JU cmVlRWxlbWVudCh0cmVlRWxlbWVudCkKLSAgICB7Ci0gICAgICAgIC8vIEltcGxlbWVudGVkIGJ5 IHN1Yi1jbGFzc2VzIGlmIG5lZWRlZC4KLQotICAgICAgICBpZiAoISh0cmVlRWxlbWVudCBpbnN0 YW5jZW9mIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZFRyZWVFbGVtZW50KSkgewotICAgICAg ICAgICAgY29uc29sZS5lcnJvcigiVW5rbm93biB0cmVlIGVsZW1lbnQgc2VsZWN0ZWQuIiwgdHJl ZUVsZW1lbnQpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgdmFy IHNvdXJjZUNvZGVMb2NhdGlvbiA9IHRyZWVFbGVtZW50LnNvdXJjZUNvZGVMb2NhdGlvbjsKLSAg ICAgICAgaWYgKCFzb3VyY2VDb2RlTG9jYXRpb24pIHsKLSAgICAgICAgICAgIHRoaXMuX3RpbWVs aW5lU2lkZWJhclBhbmVsLnNob3dUaW1lbGluZVZpZXdGb3JUaW1lbGluZSh0aGlzLnJlcHJlc2Vu dGVkT2JqZWN0KTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAgICAgIFdl Ykluc3BlY3Rvci5zaG93T3JpZ2luYWxPckZvcm1hdHRlZFNvdXJjZUNvZGVMb2NhdGlvbihzb3Vy Y2VDb2RlTG9jYXRpb24pOwotICAgIH0KLQogICAgIHVzZXJTZWxlY3RlZFJlY29yZEZyb21PdmVy dmlldyh0aW1lbGluZVJlY29yZCkKICAgICB7CiAgICAgICAgIC8vIEltcGxlbWVudGVkIGJ5IHN1 Yi1jbGFzc2VzIGlmIG5lZWRlZC4K