144055 2015-04-22 11:20:51 -0700 Web Inspector: Support passing extra arguments to ContentViews during construction 2015-04-25 18:36:14 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 timothy timothy graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1087471 0 timothy 2015-04-22 11:20:51 -0700 This is needed to pass TimelineSidebarPanel to the Timeline views. 1087473 1 251343 timothy 2015-04-22 11:27:18 -0700 Created attachment 251343 Patch 1087542 2 251343 joepeck 2015-04-22 12:54:20 -0700 Comment on attachment 251343 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=251343&action=review > Source/WebInspectorUI/ChangeLog:3 > + Web Inspector: Suport passing extra arguments to ContentViews during construction Typo: "Suport" => "Support" > Source/WebInspectorUI/UserInterface/Views/ContentView.js:34 > - return new WebInspector.FrameContentView(representedObject); > + return new WebInspector.FrameContentView(representedObject.mainResource, extraArguments); Related intentional change? This would break some code inside FrameContentView without a related change, since it does: if (this.representedObject.isMainFrame()) Which doesn't make sense on the mainResource. 1087544 3 251343 timothy 2015-04-22 12:56:14 -0700 Comment on attachment 251343 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=251343&action=review >> Source/WebInspectorUI/UserInterface/Views/ContentView.js:34 >> + return new WebInspector.FrameContentView(representedObject.mainResource, extraArguments); > > Related intentional change? This would break some code inside FrameContentView without a related change, since it does: > > if (this.representedObject.isMainFrame()) > > Which doesn't make sense on the mainResource. Bad reverse merge on my part. In my tree the end result is: return new WebInspector.ResourceClusterContentView(representedObject.mainResource, extraArguments); FrameContentView will be going away. 1088645 4 timothy 2015-04-25 18:36:14 -0700 r183322 – r183342 http://trac.webkit.org/log/?revs=183322-183342 251343 2015-04-22 11:27:18 -0700 2015-04-22 12:54:20 -0700 Patch bug-144055-20150422112614.patch text/plain 31075 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAy MjFhN2NmNmIzZjA0NmRmMzc1NmJiOTM4ZTVjNGE4YzhhMTcyM2U3Li4yOWM4ODJkODgxN2U0M2Rh NmQ0N2QxZjY3MGJjY2I3NDExNDZmMTVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw1NiBAQAogMjAxNS0wNC0yMiAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogU3Vwb3J0IHBhc3NpbmcgZXh0cmEgYXJndW1l bnRzIHRvIENvbnRlbnRWaWV3cyBkdXJpbmcgY29uc3RydWN0aW9uCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQwNTUKKworICAgICAgICBUaGlzIGFs bG93cyB1cyB0byBwYXNzIHRoZSBUaW1lbGluZVNpZGViYXJQYW5lbCB0byBUaW1lbGluZSB2aWV3 cyBzaW5jZSBpbiB0aGUgZnV0dXJlCisgICAgICAgIHRoZXJlIGNvdWxkIGJlIG11bHRpcGxlIHRp bWVsaW5lIHNpZGViYXJzLCBvbmUgcGVyIHRhYi4gU28gdGhlIGdsb2JhbCBpbnN0YW5jZSB3aWxs CisgICAgICAgIGJlIGdvaW5nIGF3YXkuCisKKyAgICAgICAgVGhpcyBhbHNvIHJlbW92ZXMgdGhl IGV4Y2VwdGlvbiBjYXRjaGluZyBpbiBDb250ZW50Vmlld0NvbnRhaW5lci4gSXQgZG9lc24ndCBy ZWFsbHkKKyAgICAgICAgaGVscCB1cyBhbmQgaXQgbWFrZXMgZGVidWdnaW5nIGFuIGV4Y2VwdGlv biBoYXJkZXIuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyLnByb3RvdHlwZS5zaG93Q29udGVudFZpZXdGb3JSZXBy ZXNlbnRlZE9iamVjdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIucHJv dG90eXBlLmNvbnRlbnRWaWV3Rm9yUmVwcmVzZW50ZWRPYmplY3QpOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29u dGVudFZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudFZpZXdDb250 YWluZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGVudFZpZXdDb250YWluZXIucHJv dG90eXBlLmNvbnRlbnRWaWV3Rm9yUmVwcmVzZW50ZWRPYmplY3QpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkNvbnRlbnRWaWV3Q29udGFpbmVyLnByb3RvdHlwZS5zaG93Q29udGVudFZpZXdGb3JS ZXByZXNlbnRlZE9iamVjdCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRU aW1lbGluZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVWaWV3 LnByb3RvdHlwZS5fZGF0YUdyaWRGaWx0ZXJzRGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5MYXlvdXRUaW1lbGluZVZpZXcucHJvdG90eXBlLl90cmVlRWxlbWVudFNlbGVjdGVkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVZpZXcucHJvdG90eXBlLl9jbG9z ZVN0YXR1c0J1dHRvbkNsaWNrZWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmV0 d29ya1RpbWVsaW5lVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrVGltZWxp bmVWaWV3LnByb3RvdHlwZS5fZGF0YUdyaWRGaWx0ZXJzRGlkQ2hhbmdlKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5OZXR3b3JrVGltZWxpbmVWaWV3LnByb3RvdHlwZS5fdHJlZUVsZW1lbnRTZWxl Y3RlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lVmlldy5wcm90b3R5 cGUuX2Nsb3NlU3RhdHVzQnV0dG9uQ2xpY2tlZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9PdmVydmlld1RpbWVsaW5lVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PdmVy dmlld1RpbWVsaW5lVmlldy5wcm90b3R5cGUuX3RyZWVFbGVtZW50U2VsZWN0ZWQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGltZWxpbmVWaWV3LnByb3RvdHlwZS5fY2xvc2VTdGF0 dXNCdXR0b25DbGlja2VkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1JlbmRlcmlu Z0ZyYW1lVGltZWxpbmVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlbmRlcmluZ0Zy YW1lVGltZWxpbmVWaWV3KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRp bWVsaW5lVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVZpZXcp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lVmlldy5wcm90b3R5cGUuX2Rh dGFHcmlkRmlsdGVyc0RpZENoYW5nZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0VGlt ZWxpbmVWaWV3LnByb3RvdHlwZS5fdHJlZUVsZW1lbnRTZWxlY3RlZCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU2NyaXB0VGltZWxpbmVWaWV3LnByb3RvdHlwZS5fY2xvc2VTdGF0dXNCdXR0b25D bGlja2VkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5n Q29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdD b250ZW50Vmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250 ZW50Vmlldy5wcm90b3R5cGUuX2N1cnJlbnRDb250ZW50Vmlld0RpZENoYW5nZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5wcm90b3R5cGUuX2Nv bnRlbnRWaWV3U2VsZWN0aW9uUGF0aENvbXBvbmVudERpZENoYW5nZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5wcm90b3R5cGUuX3VwZGF0ZVRp bWVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3 LnByb3RvdHlwZS5fdGltZVJhbmdlU2VsZWN0aW9uQ2hhbmdlZCk6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1l bGluZVZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUu Z2V0IHRpbWVsaW5lU2lkZWJhclBhbmVsKToKKworMjAxNS0wNC0yMiAgVGltb3RoeSBIYXRjaGVy ICA8dGltb3RoeUBhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogUmVtb3ZlIGFu IHVudXNlZCBpbmRleCBhcmd1bWVudCBmcm9tIFNpZGViYXIucmVtb3ZlU2lkZWJhclBhbmVsCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQwNTQKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29u dGVudEJyb3dzZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9Db250ZW50QnJvd3Nlci5qcwppbmRleCA2N2EwNGJiOTc3NTcyZTQ0MTE2NGZlZGQxMmI3N2Nl OTU5OGM2NzU1Li4xMWI5ZDMzMjg3ZDkzYmQ2YmNkOGZjZGIzYTY3NjBjYjViYjJlMTlhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50 QnJvd3Nlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9Db250ZW50QnJvd3Nlci5qcwpAQCAtMTcxLDkgKzE3MSw5IEBAIFdlYkluc3BlY3Rvci5Db250 ZW50QnJvd3Nlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2NvbnRlbnRWaWV3Q29udGFp bmVyLnVwZGF0ZUxheW91dCgpOwogICAgIH0sCiAKLSAgICBzaG93Q29udGVudFZpZXdGb3JSZXBy ZXNlbnRlZE9iamVjdDogZnVuY3Rpb24ocmVwcmVzZW50ZWRPYmplY3QsIGNvb2tpZSkKKyAgICBz aG93Q29udGVudFZpZXdGb3JSZXByZXNlbnRlZE9iamVjdDogZnVuY3Rpb24ocmVwcmVzZW50ZWRP YmplY3QsIGNvb2tpZSwgZXh0cmFBcmd1bWVudHMpCiAgICAgewotICAgICAgICB2YXIgY29udGVu dFZpZXcgPSB0aGlzLmNvbnRlbnRWaWV3Rm9yUmVwcmVzZW50ZWRPYmplY3QocmVwcmVzZW50ZWRP YmplY3QpOworICAgICAgICB2YXIgY29udGVudFZpZXcgPSB0aGlzLmNvbnRlbnRWaWV3Rm9yUmVw cmVzZW50ZWRPYmplY3QocmVwcmVzZW50ZWRPYmplY3QsIGZhbHNlLCBleHRyYUFyZ3VtZW50cyk7 CiAgICAgICAgIHJldHVybiB0aGlzLl9jb250ZW50Vmlld0NvbnRhaW5lci5zaG93Q29udGVudFZp ZXcoY29udGVudFZpZXcsIGNvb2tpZSk7CiAgICAgfSwKIApAQCAtMTgyLDkgKzE4Miw5IEBAIFdl Ykluc3BlY3Rvci5Db250ZW50QnJvd3Nlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0 aGlzLl9jb250ZW50Vmlld0NvbnRhaW5lci5zaG93Q29udGVudFZpZXcoY29udGVudFZpZXcsIGNv b2tpZSk7CiAgICAgfSwKIAotICAgIGNvbnRlbnRWaWV3Rm9yUmVwcmVzZW50ZWRPYmplY3Q6IGZ1 bmN0aW9uKHJlcHJlc2VudGVkT2JqZWN0LCBvbmx5RXhpc3RpbmcpCisgICAgY29udGVudFZpZXdG b3JSZXByZXNlbnRlZE9iamVjdDogZnVuY3Rpb24ocmVwcmVzZW50ZWRPYmplY3QsIG9ubHlFeGlz dGluZywgZXh0cmFBcmd1bWVudHMpCiAgICAgewotICAgICAgICByZXR1cm4gdGhpcy5fY29udGVu dFZpZXdDb250YWluZXIuY29udGVudFZpZXdGb3JSZXByZXNlbnRlZE9iamVjdChyZXByZXNlbnRl ZE9iamVjdCwgb25seUV4aXN0aW5nKTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2NvbnRlbnRWaWV3 Q29udGFpbmVyLmNvbnRlbnRWaWV3Rm9yUmVwcmVzZW50ZWRPYmplY3QocmVwcmVzZW50ZWRPYmpl Y3QsIG9ubHlFeGlzdGluZywgZXh0cmFBcmd1bWVudHMpOwogICAgIH0sCiAKICAgICBjYW5Hb0Jh Y2s6IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0NvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQ29udGVudFZpZXcuanMKaW5kZXggNWQ1NTNlMjYyMzZkNjc1YThmN2Vh YzBlZmY1MTU2ODlhM2Y3Y2JkNy4uNDMzYmI2ZjE0YzJjYTE4OTU1MzlkOTEwYjI2NzMwNmVlNDE5 ZmYyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ29udGVudFZpZXcuanMKQEAgLTIzLDcgKzIzLDcgQEAKICAqIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCi1XZWJJbnNwZWN0b3IuQ29udGVudFZpZXcgPSBm dW5jdGlvbihyZXByZXNlbnRlZE9iamVjdCkKK1dlYkluc3BlY3Rvci5Db250ZW50VmlldyA9IGZ1 bmN0aW9uKHJlcHJlc2VudGVkT2JqZWN0LCBleHRyYUFyZ3VtZW50cykKIHsKICAgICBpZiAodGhp cy5jb25zdHJ1Y3RvciA9PT0gV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3KSB7CiAgICAgICAgIC8v IFdoZW4gaW5zdGFudGlhdGVkIGRpcmVjdGx5IHJldHVybiBhbiBpbnN0YW5jZSBvZiBhIHR5cGUt YmFzZWQgY29uY3JldGUgc3ViY2xhc3MuCkBAIC0zMSw2NCArMzEsNjQgQEAgV2ViSW5zcGVjdG9y LkNvbnRlbnRWaWV3ID0gZnVuY3Rpb24ocmVwcmVzZW50ZWRPYmplY3QpCiAgICAgICAgIGNvbnNv bGUuYXNzZXJ0KHJlcHJlc2VudGVkT2JqZWN0KTsKIAogICAgICAgICBpZiAocmVwcmVzZW50ZWRP YmplY3QgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuRnJhbWUpCi0gICAgICAgICAgICByZXR1cm4g bmV3IFdlYkluc3BlY3Rvci5GcmFtZUNvbnRlbnRWaWV3KHJlcHJlc2VudGVkT2JqZWN0KTsKKyAg ICAgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkZyYW1lQ29udGVudFZpZXcocmVwcmVz ZW50ZWRPYmplY3QubWFpblJlc291cmNlLCBleHRyYUFyZ3VtZW50cyk7CiAKICAgICAgICAgaWYg KHJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlJlc291cmNlKQotICAg ICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDbHVzdGVyQ29udGVudFZp ZXcocmVwcmVzZW50ZWRPYmplY3QpOworICAgICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0 b3IuUmVzb3VyY2VDbHVzdGVyQ29udGVudFZpZXcocmVwcmVzZW50ZWRPYmplY3QsIGV4dHJhQXJn dW1lbnRzKTsKIAogICAgICAgICBpZiAocmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXZWJJ bnNwZWN0b3IuU2NyaXB0KQotICAgICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuU2Ny aXB0Q29udGVudFZpZXcocmVwcmVzZW50ZWRPYmplY3QpOworICAgICAgICAgICAgcmV0dXJuIG5l dyBXZWJJbnNwZWN0b3IuU2NyaXB0Q29udGVudFZpZXcocmVwcmVzZW50ZWRPYmplY3QsIGV4dHJh QXJndW1lbnRzKTsKIAogICAgICAgICBpZiAocmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBX ZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmcpCi0gICAgICAgICAgICByZXR1cm4gbmV3IFdl Ykluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3KHJlcHJlc2VudGVkT2JqZWN0 KTsKKyAgICAgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5n Q29udGVudFZpZXcocmVwcmVzZW50ZWRPYmplY3QsIGV4dHJhQXJndW1lbnRzKTsKIAogICAgICAg ICBpZiAocmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuVGltZWxpbmUp IHsKICAgICAgICAgICAgIHZhciB0aW1lbGluZVR5cGUgPSByZXByZXNlbnRlZE9iamVjdC50eXBl OwogICAgICAgICAgICAgaWYgKHRpbWVsaW5lVHlwZSA9PT0gV2ViSW5zcGVjdG9yLlRpbWVsaW5l UmVjb3JkLlR5cGUuTmV0d29yaykKLSAgICAgICAgICAgICAgICByZXR1cm4gbmV3IFdlYkluc3Bl Y3Rvci5OZXR3b3JrVGltZWxpbmVWaWV3KHJlcHJlc2VudGVkT2JqZWN0KTsKKyAgICAgICAgICAg ICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5OZXR3b3JrVGltZWxpbmVWaWV3KHJlcHJlc2Vu dGVkT2JqZWN0LCBleHRyYUFyZ3VtZW50cyk7CiAKICAgICAgICAgICAgIGlmICh0aW1lbGluZVR5 cGUgPT09IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLkxheW91dCkKLSAgICAgICAg ICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVZpZXcocmVwcmVz ZW50ZWRPYmplY3QpOworICAgICAgICAgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkxh eW91dFRpbWVsaW5lVmlldyhyZXByZXNlbnRlZE9iamVjdCwgZXh0cmFBcmd1bWVudHMpOwogCiAg ICAgICAgICAgICBpZiAodGltZWxpbmVUeXBlID09PSBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNv cmQuVHlwZS5TY3JpcHQpCi0gICAgICAgICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3Iu U2NyaXB0VGltZWxpbmVWaWV3KHJlcHJlc2VudGVkT2JqZWN0KTsKKyAgICAgICAgICAgICAgICBy ZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVZpZXcocmVwcmVzZW50ZWRPYmpl Y3QsIGV4dHJhQXJndW1lbnRzKTsKIAogICAgICAgICAgICAgaWYgKHRpbWVsaW5lVHlwZSA9PT0g V2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuUmVuZGVyaW5nRnJhbWUpCi0gICAgICAg ICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuUmVuZGVyaW5nRnJhbWVUaW1lbGluZVZp ZXcocmVwcmVzZW50ZWRPYmplY3QpOworICAgICAgICAgICAgICAgIHJldHVybiBuZXcgV2ViSW5z cGVjdG9yLlJlbmRlcmluZ0ZyYW1lVGltZWxpbmVWaWV3KHJlcHJlc2VudGVkT2JqZWN0LCBleHRy YUFyZ3VtZW50cyk7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAocmVwcmVzZW50ZWRPYmplY3Qg aW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuRE9NU3RvcmFnZU9iamVjdCkKLSAgICAgICAgICAgIHJl dHVybiBuZXcgV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VDb250ZW50VmlldyhyZXByZXNlbnRlZE9i amVjdCk7CisgICAgICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5ET01TdG9yYWdlQ29u dGVudFZpZXcocmVwcmVzZW50ZWRPYmplY3QsIGV4dHJhQXJndW1lbnRzKTsKIAogICAgICAgICBp ZiAocmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuQ29va2llU3RvcmFn ZU9iamVjdCkKLSAgICAgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkNvb2tpZVN0b3Jh Z2VDb250ZW50VmlldyhyZXByZXNlbnRlZE9iamVjdCk7CisgICAgICAgICAgICByZXR1cm4gbmV3 IFdlYkluc3BlY3Rvci5Db29raWVTdG9yYWdlQ29udGVudFZpZXcocmVwcmVzZW50ZWRPYmplY3Qs IGV4dHJhQXJndW1lbnRzKTsKIAogICAgICAgICBpZiAocmVwcmVzZW50ZWRPYmplY3QgaW5zdGFu Y2VvZiBXZWJJbnNwZWN0b3IuRGF0YWJhc2VUYWJsZU9iamVjdCkKLSAgICAgICAgICAgIHJldHVy biBuZXcgV2ViSW5zcGVjdG9yLkRhdGFiYXNlVGFibGVDb250ZW50VmlldyhyZXByZXNlbnRlZE9i amVjdCk7CisgICAgICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5EYXRhYmFzZVRhYmxl Q29udGVudFZpZXcocmVwcmVzZW50ZWRPYmplY3QsIGV4dHJhQXJndW1lbnRzKTsKIAogICAgICAg ICBpZiAocmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuRGF0YWJhc2VP YmplY3QpCi0gICAgICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5EYXRhYmFzZUNvbnRl bnRWaWV3KHJlcHJlc2VudGVkT2JqZWN0KTsKKyAgICAgICAgICAgIHJldHVybiBuZXcgV2ViSW5z cGVjdG9yLkRhdGFiYXNlQ29udGVudFZpZXcocmVwcmVzZW50ZWRPYmplY3QsIGV4dHJhQXJndW1l bnRzKTsKIAogICAgICAgICBpZiAocmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXZWJJbnNw ZWN0b3IuSW5kZXhlZERhdGFiYXNlT2JqZWN0U3RvcmUpCi0gICAgICAgICAgICByZXR1cm4gbmV3 IFdlYkluc3BlY3Rvci5JbmRleGVkRGF0YWJhc2VPYmplY3RTdG9yZUNvbnRlbnRWaWV3KHJlcHJl c2VudGVkT2JqZWN0KTsKKyAgICAgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkluZGV4 ZWREYXRhYmFzZU9iamVjdFN0b3JlQ29udGVudFZpZXcocmVwcmVzZW50ZWRPYmplY3QsIGV4dHJh QXJndW1lbnRzKTsKIAogICAgICAgICBpZiAocmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBX ZWJJbnNwZWN0b3IuSW5kZXhlZERhdGFiYXNlT2JqZWN0U3RvcmVJbmRleCkKLSAgICAgICAgICAg IHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkluZGV4ZWREYXRhYmFzZU9iamVjdFN0b3JlQ29udGVu dFZpZXcocmVwcmVzZW50ZWRPYmplY3QpOworICAgICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNw ZWN0b3IuSW5kZXhlZERhdGFiYXNlT2JqZWN0U3RvcmVDb250ZW50VmlldyhyZXByZXNlbnRlZE9i amVjdCwgZXh0cmFBcmd1bWVudHMpOwogCiAgICAgICAgIGlmIChyZXByZXNlbnRlZE9iamVjdCBp bnN0YW5jZW9mIFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlRnJhbWUpCi0gICAgICAgICAg ICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlRnJhbWVDb250ZW50Vmll dyhyZXByZXNlbnRlZE9iamVjdCk7CisgICAgICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rv ci5BcHBsaWNhdGlvbkNhY2hlRnJhbWVDb250ZW50VmlldyhyZXByZXNlbnRlZE9iamVjdCwgZXh0 cmFBcmd1bWVudHMpOwogCiAgICAgICAgIGlmIChyZXByZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9m IFdlYkluc3BlY3Rvci5ET01UcmVlKQotICAgICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0 b3IuRnJhbWVET01UcmVlQ29udGVudFZpZXcocmVwcmVzZW50ZWRPYmplY3QpOworICAgICAgICAg ICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuRnJhbWVET01UcmVlQ29udGVudFZpZXcocmVwcmVz ZW50ZWRPYmplY3QsIGV4dHJhQXJndW1lbnRzKTsKIAogICAgICAgICBpZiAocmVwcmVzZW50ZWRP YmplY3QgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuTG9nT2JqZWN0KQotICAgICAgICAgICAgcmV0 dXJuIG5ldyBXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcocmVwcmVzZW50ZWRPYmplY3QpOwor ICAgICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcocmVwcmVz ZW50ZWRPYmplY3QsIGV4dHJhQXJndW1lbnRzKTsKIAogICAgICAgICBpZiAocmVwcmVzZW50ZWRP YmplY3QgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuQ29udGVudEZsb3cpCi0gICAgICAgICAgICBy ZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5Db250ZW50Rmxvd0RPTVRyZWVDb250ZW50VmlldyhyZXBy ZXNlbnRlZE9iamVjdCk7CisgICAgICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5Db250 ZW50Rmxvd0RPTVRyZWVDb250ZW50VmlldyhyZXByZXNlbnRlZE9iamVjdCwgZXh0cmFBcmd1bWVu dHMpOwogCiAgICAgICAgIGlmICh0eXBlb2YgcmVwcmVzZW50ZWRPYmplY3QgPT09ICJzdHJpbmci IHx8IHJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgU3RyaW5nKQotICAgICAgICAgICAgcmV0 dXJuIG5ldyBXZWJJbnNwZWN0b3IuVGV4dENvbnRlbnRWaWV3KHJlcHJlc2VudGVkT2JqZWN0KTsK KyAgICAgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLlRleHRDb250ZW50VmlldyhyZXBy ZXNlbnRlZE9iamVjdCwgZXh0cmFBcmd1bWVudHMpOwogCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0 KCFXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcuaXNWaWV3YWJsZShyZXByZXNlbnRlZE9iamVjdCkp OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9Db250ZW50Vmlld0NvbnRhaW5lci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0NvbnRlbnRWaWV3Q29udGFpbmVyLmpzCmluZGV4IGM4ZWYwMzBmNDY5M2Y4 NDk4ZTBjOWRiNTg4YmMxZjdiODA1NzkxYWUuLjJhNjc4OWFkYjI3MmQwNTc3OGRkYjIxMzdjYzFk OTYwMjljMWQwNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0NvbnRlbnRWaWV3Q29udGFpbmVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRWaWV3Q29udGFpbmVyLmpzCkBAIC04Miw3 ICs4Miw3IEBAIFdlYkluc3BlY3Rvci5Db250ZW50Vmlld0NvbnRhaW5lci5wcm90b3R5cGUgPSB7 CiAgICAgICAgICAgICBjdXJyZW50Q29udGVudFZpZXcudXBkYXRlTGF5b3V0KCk7CiAgICAgfSwK IAotICAgIGNvbnRlbnRWaWV3Rm9yUmVwcmVzZW50ZWRPYmplY3Q6IGZ1bmN0aW9uKHJlcHJlc2Vu dGVkT2JqZWN0LCBvbmx5RXhpc3RpbmcpCisgICAgY29udGVudFZpZXdGb3JSZXByZXNlbnRlZE9i amVjdDogZnVuY3Rpb24ocmVwcmVzZW50ZWRPYmplY3QsIG9ubHlFeGlzdGluZywgZXh0cmFBcmd1 bWVudHMpCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydChyZXByZXNlbnRlZE9iamVjdCk7 CiAgICAgICAgIGlmICghcmVwcmVzZW50ZWRPYmplY3QpCkBAIC0xMDcsMTMgKzEwNywxMiBAQCBX ZWJJbnNwZWN0b3IuQ29udGVudFZpZXdDb250YWluZXIucHJvdG90eXBlID0gewogICAgICAgICBp ZiAob25seUV4aXN0aW5nKQogICAgICAgICAgICAgcmV0dXJuIG51bGw7CiAKLSAgICAgICAgdHJ5 IHsKLSAgICAgICAgICAgIC8vIE5vIGV4aXN0aW5nIGNvbnRlbnQgdmlldyBmb3VuZCwgbWFrZSBh IG5ldyBvbmUuCi0gICAgICAgICAgICBjb250ZW50VmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuQ29u dGVudFZpZXcocmVwcmVzZW50ZWRPYmplY3QpOwotICAgICAgICB9IGNhdGNoIChlKSB7Ci0gICAg ICAgICAgICBjb25zb2xlLmVycm9yKGUpOworICAgICAgICAvLyBObyBleGlzdGluZyBjb250ZW50 IHZpZXcgZm91bmQsIG1ha2UgYSBuZXcgb25lLgorICAgICAgICBjb250ZW50VmlldyA9IG5ldyBX ZWJJbnNwZWN0b3IuQ29udGVudFZpZXcocmVwcmVzZW50ZWRPYmplY3QsIGV4dHJhQXJndW1lbnRz KTsKKworICAgICAgICBjb25zb2xlLmFzc2VydChjb250ZW50VmlldywgIlVua25vd24gcmVwcmVz ZW50ZWRPYmplY3QiLCByZXByZXNlbnRlZE9iamVjdCk7CisgICAgICAgIGlmICghY29udGVudFZp ZXcpCiAgICAgICAgICAgICByZXR1cm4gbnVsbDsKLSAgICAgICAgfQogCiAgICAgICAgIC8vIFJl bWVtYmVyIHRoaXMgY29udGVudCB2aWV3IGZvciBmdXR1cmUgY2FsbHMuCiAgICAgICAgIGlmICgh cmVwcmVzZW50ZWRPYmplY3QuX19jb250ZW50Vmlld3MpCkBAIC0xMjMsOSArMTIyLDkgQEAgV2Vi SW5zcGVjdG9yLkNvbnRlbnRWaWV3Q29udGFpbmVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0 dXJuIGNvbnRlbnRWaWV3OwogICAgIH0sCiAKLSAgICBzaG93Q29udGVudFZpZXdGb3JSZXByZXNl bnRlZE9iamVjdDogZnVuY3Rpb24ocmVwcmVzZW50ZWRPYmplY3QpCisgICAgc2hvd0NvbnRlbnRW aWV3Rm9yUmVwcmVzZW50ZWRPYmplY3Q6IGZ1bmN0aW9uKHJlcHJlc2VudGVkT2JqZWN0LCBleHRy YUFyZ3VtZW50cykKICAgICB7Ci0gICAgICAgIHZhciBjb250ZW50VmlldyA9IHRoaXMuY29udGVu dFZpZXdGb3JSZXByZXNlbnRlZE9iamVjdChyZXByZXNlbnRlZE9iamVjdCk7CisgICAgICAgIHZh ciBjb250ZW50VmlldyA9IHRoaXMuY29udGVudFZpZXdGb3JSZXByZXNlbnRlZE9iamVjdChyZXBy ZXNlbnRlZE9iamVjdCwgZmFsc2UsIGV4dHJhQXJndW1lbnRzKTsKICAgICAgICAgaWYgKCFjb250 ZW50VmlldykKICAgICAgICAgICAgIHJldHVybiBudWxsOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGluZVZpZXcuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGlu ZVZpZXcuanMKaW5kZXggYTAxMmFjN2E1OWVhNzg5ODEwMmJhNzQwYmYxYzYyMDM2N2YyYmY1Ny4u YWVkMjZiNDI5YjU2ZTdjMmYyZTEyMGVkOTc1NWNiMTY3MDAyNjk2MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVWaWV3 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91 dFRpbWVsaW5lVmlldy5qcwpAQCAtMjMsOSArMjMsOSBAQAogICogVEhFIFBPU1NJQklMSVRZIE9G IFNVQ0ggREFNQUdFLgogICovCiAKLVdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVZpZXcgPSBm dW5jdGlvbih0aW1lbGluZSkKK1dlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVZpZXcgPSBmdW5j dGlvbih0aW1lbGluZSwgZXh0cmFBcmd1bWVudHMpCiB7Ci0gICAgV2ViSW5zcGVjdG9yLlRpbWVs aW5lVmlldy5jYWxsKHRoaXMsIHRpbWVsaW5lKTsKKyAgICBXZWJJbnNwZWN0b3IuVGltZWxpbmVW aWV3LmNhbGwodGhpcywgdGltZWxpbmUsIGV4dHJhQXJndW1lbnRzKTsKIAogICAgIGNvbnNvbGUu YXNzZXJ0KHRpbWVsaW5lLnR5cGUgPT09IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBl LkxheW91dCk7CiAKQEAgLTE5NCw3ICsxOTQsNyBAQCBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxp bmVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgIF9kYXRhR3JpZEZpbHRlcnNEaWRDaGFuZ2U6IGZ1 bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLnRpbWVsaW5lU2lkZWJh clBhbmVsLnVwZGF0ZUZpbHRlcigpOworICAgICAgICB0aGlzLnRpbWVsaW5lU2lkZWJhclBhbmVs LnVwZGF0ZUZpbHRlcigpOwogICAgIH0sCiAKICAgICBfZGF0YUdyaWROb2RlU2VsZWN0ZWQ6IGZ1 bmN0aW9uKGV2ZW50KQpAQCAtMjE1LDcgKzIxNSw3IEBAIFdlYkluc3BlY3Rvci5MYXlvdXRUaW1l bGluZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICBpZiAodGhpcy5fZGF0YUdyaWQuc2hvdWxk SWdub3JlU2VsZWN0aW9uRXZlbnQoKSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBp ZiAoIVdlYkluc3BlY3Rvci50aW1lbGluZVNpZGViYXJQYW5lbC5jYW5TaG93RGlmZmVyZW50Q29u dGVudFZpZXcoKSkKKyAgICAgICAgaWYgKCF0aGlzLnRpbWVsaW5lU2lkZWJhclBhbmVsLmNhblNo b3dEaWZmZXJlbnRDb250ZW50VmlldygpKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAg IGlmICh0cmVlRWxlbWVudCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5Gb2xkZXJUcmVlRWxlbWVu dCkKQEAgLTIyOSw3ICsyMjksNyBAQCBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVWaWV3LnBy b3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fdXBkYXRlSGlnaGxpZ2h0KCk7CiAKICAgICAgICAg aWYgKCF0cmVlRWxlbWVudC5yZWNvcmQuc291cmNlQ29kZUxvY2F0aW9uKSB7Ci0gICAgICAgICAg ICBXZWJJbnNwZWN0b3IudGltZWxpbmVTaWRlYmFyUGFuZWwuc2hvd1RpbWVsaW5lVmlld0ZvclRp bWVsaW5lKHRoaXMucmVwcmVzZW50ZWRPYmplY3QpOworICAgICAgICAgICAgdGhpcy50aW1lbGlu ZVNpZGViYXJQYW5lbC5zaG93VGltZWxpbmVWaWV3Rm9yVGltZWxpbmUodGhpcy5yZXByZXNlbnRl ZE9iamVjdCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIApAQCAtMjU1LDcgKzI1 NSw3IEBAIFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVZpZXcucHJvdG90eXBlID0gewogICAg IF9jbG9zZVN0YXR1c0J1dHRvbkNsaWNrZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAg ICAgdGhpcy5uYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lLnNlbGVjdGVkVHJlZUVsZW1lbnQu ZGVzZWxlY3QoKTsKLSAgICAgICAgV2ViSW5zcGVjdG9yLnRpbWVsaW5lU2lkZWJhclBhbmVsLnNo b3dUaW1lbGluZVZpZXdGb3JUaW1lbGluZSh0aGlzLnJlcHJlc2VudGVkT2JqZWN0KTsKKyAgICAg ICAgdGhpcy50aW1lbGluZVNpZGViYXJQYW5lbC5zaG93VGltZWxpbmVWaWV3Rm9yVGltZWxpbmUo dGhpcy5yZXByZXNlbnRlZE9iamVjdCk7CiAgICAgfSwKIAogICAgIF91cGRhdGVIaWdobGlnaHQ6 IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmpzCmluZGV4IDg0M2UzYzc0 NGEzMDNkNjQxZDIxYzFmNjcyY2YwMWZjOWU4NDk0MTYuLmIxZmIxNmFhMTBjZTYyMTQ1ZDAxMTdm OGJlZDllODMyYTdmNDliMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RpbWVsaW5lVmlldy5qcwpAQCAt MjMsOSArMjMsOSBAQAogICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAK LVdlYkluc3BlY3Rvci5OZXR3b3JrVGltZWxpbmVWaWV3ID0gZnVuY3Rpb24odGltZWxpbmUpCitX ZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lVmlldyA9IGZ1bmN0aW9uKHRpbWVsaW5lLCBleHRy YUFyZ3VtZW50cykKIHsKLSAgICBXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LmNhbGwodGhpcywg dGltZWxpbmUpOworICAgIFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcuY2FsbCh0aGlzLCB0aW1l bGluZSwgZXh0cmFBcmd1bWVudHMpOwogCiAgICAgY29uc29sZS5hc3NlcnQodGltZWxpbmUudHlw ZSA9PT0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuTmV0d29yayk7CiAKQEAgLTE5 Miw3ICsxOTIsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lVmlldy5wcm90b3R5cGUg PSB7CiAKICAgICBfZGF0YUdyaWRGaWx0ZXJzRGlkQ2hhbmdlOiBmdW5jdGlvbihldmVudCkKICAg ICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci50aW1lbGluZVNpZGViYXJQYW5lbC51cGRhdGVGaWx0 ZXIoKTsKKyAgICAgICAgdGhpcy50aW1lbGluZVNpZGViYXJQYW5lbC51cGRhdGVGaWx0ZXIoKTsK ICAgICB9LAogCiAgICAgX2RhdGFHcmlkTm9kZVNlbGVjdGVkOiBmdW5jdGlvbihldmVudCkKQEAg LTIxMSw3ICsyMTEsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lVmlldy5wcm90b3R5 cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLl9kYXRhR3JpZC5zaG91bGRJZ25vcmVTZWxlY3Rpb25F dmVudCgpKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGlmICghV2ViSW5zcGVjdG9y LnRpbWVsaW5lU2lkZWJhclBhbmVsLmNhblNob3dEaWZmZXJlbnRDb250ZW50VmlldygpKQorICAg ICAgICBpZiAoIXRoaXMudGltZWxpbmVTaWRlYmFyUGFuZWwuY2FuU2hvd0RpZmZlcmVudENvbnRl bnRWaWV3KCkpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgaWYgKHRyZWVFbGVtZW50 IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLkZvbGRlclRyZWVFbGVtZW50KQpAQCAtMjQ0LDYgKzI0 NCw2IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrVGltZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKICAg ICBfY2xvc2VTdGF0dXNCdXR0b25DbGlja2VkOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAg ICAgIHRoaXMubmF2aWdhdGlvblNpZGViYXJUcmVlT3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50 LmRlc2VsZWN0KCk7Ci0gICAgICAgIFdlYkluc3BlY3Rvci50aW1lbGluZVNpZGViYXJQYW5lbC5z aG93VGltZWxpbmVWaWV3Rm9yVGltZWxpbmUodGhpcy5yZXByZXNlbnRlZE9iamVjdCk7CisgICAg ICAgIHRoaXMudGltZWxpbmVTaWRlYmFyUGFuZWwuc2hvd1RpbWVsaW5lVmlld0ZvclRpbWVsaW5l KHRoaXMucmVwcmVzZW50ZWRPYmplY3QpOwogICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PdmVydmlld1RpbWVsaW5lVmlldy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL092ZXJ2aWV3VGlt ZWxpbmVWaWV3LmpzCmluZGV4IGJkODBlZDIzOWI2NzEzOWE4NWM2ZjQ2YTRhZTI0Y2FlZDdmNzc3 NzMuLjFlMWI2ODdhNzQwODJjMzAxMzgzYjUyMmYwMGZhOWI0YWRkMDRjYWMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL092ZXJ2aWV3VGltZWxp bmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L092ZXJ2aWV3VGltZWxpbmVWaWV3LmpzCkBAIC0yMyw5ICsyMyw5IEBACiAgKiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotV2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGltZWxp bmVWaWV3ID0gZnVuY3Rpb24ocmVjb3JkaW5nKQorV2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGltZWxp bmVWaWV3ID0gZnVuY3Rpb24ocmVjb3JkaW5nLCBleHRyYUFyZ3VtZW50cykKIHsKLSAgICBXZWJJ bnNwZWN0b3IuVGltZWxpbmVWaWV3LmNhbGwodGhpcywgcmVjb3JkaW5nKTsKKyAgICBXZWJJbnNw ZWN0b3IuVGltZWxpbmVWaWV3LmNhbGwodGhpcywgcmVjb3JkaW5nLCBleHRyYUFyZ3VtZW50cyk7 CiAKICAgICB0aGlzLm5hdmlnYXRpb25TaWRlYmFyVHJlZU91dGxpbmUub25zZWxlY3QgPSB0aGlz Ll90cmVlRWxlbWVudFNlbGVjdGVkLmJpbmQodGhpcyk7CiAgICAgdGhpcy5uYXZpZ2F0aW9uU2lk ZWJhclRyZWVPdXRsaW5lLm9uZGVzZWxlY3QgPSB0aGlzLl90cmVlRWxlbWVudERlc2VsZWN0ZWQu YmluZCh0aGlzKTsKQEAgLTM4LDcgKzM4LDcgQEAgV2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGltZWxp bmVWaWV3ID0gZnVuY3Rpb24ocmVjb3JkaW5nKQogICAgIHRoaXMuX2RhdGFHcmlkLmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50LlNlbGVjdGVkTm9kZUNoYW5nZWQs IHRoaXMuX2RhdGFHcmlkTm9kZVNlbGVjdGVkLCB0aGlzKTsKICAgICB0aGlzLl9kYXRhR3JpZC5l bGVtZW50LmNsYXNzTGlzdC5hZGQoIm5vLWhlYWRlciIpOwogCi0gICAgdGhpcy5fdHJlZU91dGxp bmVEYXRhR3JpZFN5bmNocm9uaXplciA9IG5ldyBXZWJJbnNwZWN0b3IuVHJlZU91dGxpbmVEYXRh R3JpZFN5bmNocm9uaXplcih0aGlzLl9jb250ZW50VHJlZU91dGxpbmUsIHRoaXMuX2RhdGFHcmlk KTsKKyAgICB0aGlzLl90cmVlT3V0bGluZURhdGFHcmlkU3luY2hyb25pemVyID0gbmV3IFdlYklu c3BlY3Rvci5UcmVlT3V0bGluZURhdGFHcmlkU3luY2hyb25pemVyKHRoaXMubmF2aWdhdGlvblNp ZGViYXJUcmVlT3V0bGluZSwgdGhpcy5fZGF0YUdyaWQpOwogCiAgICAgdGhpcy5fdGltZWxpbmVS dWxlciA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlcjsKICAgICB0aGlzLl90aW1lbGlu ZVJ1bGVyLmFsbG93c0NsaXBwZWRMYWJlbHMgPSB0cnVlOwpAQCAtMzMzLDcgKzMzMyw3IEBAIFdl Ykluc3BlY3Rvci5PdmVydmlld1RpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7CiAKICAgICBfdHJl ZUVsZW1lbnRTZWxlY3RlZDogZnVuY3Rpb24odHJlZUVsZW1lbnQsIHNlbGVjdGVkQnlVc2VyKQog ICAgIHsKLSAgICAgICAgaWYgKCFXZWJJbnNwZWN0b3IudGltZWxpbmVTaWRlYmFyUGFuZWwuY2Fu U2hvd0RpZmZlcmVudENvbnRlbnRWaWV3KCkpCisgICAgICAgIGlmICghdGhpcy50aW1lbGluZVNp ZGViYXJQYW5lbC5jYW5TaG93RGlmZmVyZW50Q29udGVudFZpZXcoKSkKICAgICAgICAgICAgIHJl dHVybjsKIAogICAgICAgICBpZiAodHJlZUVsZW1lbnQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3Iu Rm9sZGVyVHJlZUVsZW1lbnQpCkBAIC0zNTEsNyArMzUxLDcgQEAgV2ViSW5zcGVjdG9yLk92ZXJ2 aWV3VGltZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogCiAgICAgICAgIGlmICgh dHJlZUVsZW1lbnQuc291cmNlQ29kZVRpbWVsaW5lLnNvdXJjZUNvZGVMb2NhdGlvbikgewotICAg ICAgICAgICAgV2ViSW5zcGVjdG9yLnRpbWVsaW5lU2lkZWJhclBhbmVsLnNob3dUaW1lbGluZU92 ZXJ2aWV3KCk7CisgICAgICAgICAgICB0aGlzLnRpbWVsaW5lU2lkZWJhclBhbmVsLnNob3dUaW1l bGluZU92ZXJ2aWV3KCk7CiAgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVy cyhXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcuRXZlbnQuU2VsZWN0aW9uUGF0aENvbXBvbmVudHNE aWRDaGFuZ2UpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CkBAIC0zNzgsNiArMzc4 LDYgQEAgV2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGltZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKICAg ICBfY2xvc2VTdGF0dXNCdXR0b25DbGlja2VkOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAg ICAgIHRoaXMubmF2aWdhdGlvblNpZGViYXJUcmVlT3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50 LmRlc2VsZWN0KCk7Ci0gICAgICAgIFdlYkluc3BlY3Rvci50aW1lbGluZVNpZGViYXJQYW5lbC5z aG93VGltZWxpbmVPdmVydmlldygpOworICAgICAgICB0aGlzLnRpbWVsaW5lU2lkZWJhclBhbmVs LnNob3dUaW1lbGluZU92ZXJ2aWV3KCk7CiAgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlbmRlcmluZ0ZyYW1lVGltZWxpbmVW aWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVuZGVy aW5nRnJhbWVUaW1lbGluZVZpZXcuanMKaW5kZXggNmJhMjIwODNkMmQ4NzMxYjg1MzkzYmY2MTRk MzE4Y2UwYmE1Mjg2YS4uYjVmN2U5ZDM0ZTVkMTRlMzM5ODk5ZWZkMGFlNDYyOGJjNzk2OGFiNSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVu ZGVyaW5nRnJhbWVUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvUmVuZGVyaW5nRnJhbWVUaW1lbGluZVZpZXcuanMKQEAgLTIzLDkg KzIzLDkgQEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCi1XZWJJ bnNwZWN0b3IuUmVuZGVyaW5nRnJhbWVUaW1lbGluZVZpZXcgPSBmdW5jdGlvbih0aW1lbGluZSkK K1dlYkluc3BlY3Rvci5SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldyA9IGZ1bmN0aW9uKHRpbWVs aW5lLCBleHRyYUFyZ3VtZW50cykKIHsKLSAgICBXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LmNh bGwodGhpcywgdGltZWxpbmUpOworICAgIFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcuY2FsbCh0 aGlzLCB0aW1lbGluZSwgZXh0cmFBcmd1bWVudHMpOwogCiAgICAgY29uc29sZS5hc3NlcnQoV2Vi SW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuUmVuZGVyaW5nRnJhbWUpOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRUaW1l bGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9T Y3JpcHRUaW1lbGluZVZpZXcuanMKaW5kZXggYzNhNGQ3N2E5MTlmYjI5NDBhZjBkMGE2NjYwMGJj ZjIzOGMxZTY2OS4uYTQ3ZWFmMTM2OWNlOGVlZDY2NDM1NGMxZjhjYjI2MDRlMDc2ZTgzOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0 VGltZWxpbmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NjcmlwdFRpbWVsaW5lVmlldy5qcwpAQCAtMjMsOSArMjMsOSBAQAogICogVEhFIFBP U1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLVdlYkluc3BlY3Rvci5TY3JpcHRUaW1l bGluZVZpZXcgPSBmdW5jdGlvbih0aW1lbGluZSkKK1dlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGlu ZVZpZXcgPSBmdW5jdGlvbih0aW1lbGluZSwgZXh0cmFBcmd1bWVudHMpCiB7Ci0gICAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lVmlldy5jYWxsKHRoaXMsIHRpbWVsaW5lKTsKKyAgICBXZWJJbnNwZWN0 b3IuVGltZWxpbmVWaWV3LmNhbGwodGhpcywgdGltZWxpbmUsIGV4dHJhQXJndW1lbnRzKTsKIAog ICAgIGNvbnNvbGUuYXNzZXJ0KHRpbWVsaW5lLnR5cGUgPT09IFdlYkluc3BlY3Rvci5UaW1lbGlu ZVJlY29yZC5UeXBlLlNjcmlwdCk7CiAKQEAgLTIzOCw3ICsyMzgsNyBAQCBXZWJJbnNwZWN0b3Iu U2NyaXB0VGltZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgIF9kYXRhR3JpZEZpbHRlcnNE aWRDaGFuZ2U6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLnRp bWVsaW5lU2lkZWJhclBhbmVsLnVwZGF0ZUZpbHRlcigpOworICAgICAgICB0aGlzLnRpbWVsaW5l U2lkZWJhclBhbmVsLnVwZGF0ZUZpbHRlcigpOwogICAgIH0sCiAKICAgICBfZGF0YUdyaWROb2Rl U2VsZWN0ZWQ6IGZ1bmN0aW9uKGV2ZW50KQpAQCAtMjU3LDcgKzI1Nyw3IEBAIFdlYkluc3BlY3Rv ci5TY3JpcHRUaW1lbGluZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICBpZiAodGhpcy5fZGF0 YUdyaWQuc2hvdWxkSWdub3JlU2VsZWN0aW9uRXZlbnQoKSkKICAgICAgICAgICAgIHJldHVybjsK IAotICAgICAgICBpZiAoIVdlYkluc3BlY3Rvci50aW1lbGluZVNpZGViYXJQYW5lbC5jYW5TaG93 RGlmZmVyZW50Q29udGVudFZpZXcoKSkKKyAgICAgICAgaWYgKCF0aGlzLnRpbWVsaW5lU2lkZWJh clBhbmVsLmNhblNob3dEaWZmZXJlbnRDb250ZW50VmlldygpKQogICAgICAgICAgICAgcmV0dXJu OwogCiAgICAgICAgIGlmICh0cmVlRWxlbWVudCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5Gb2xk ZXJUcmVlRWxlbWVudCkKQEAgLTI3Miw3ICsyNzIsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0VGlt ZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIlVua25v d24gdHJlZSBlbGVtZW50IHNlbGVjdGVkLiIpOwogCiAgICAgICAgIGlmICghc291cmNlQ29kZUxv Y2F0aW9uKSB7Ci0gICAgICAgICAgICBXZWJJbnNwZWN0b3IudGltZWxpbmVTaWRlYmFyUGFuZWwu c2hvd1RpbWVsaW5lVmlld0ZvclRpbWVsaW5lKHRoaXMucmVwcmVzZW50ZWRPYmplY3QpOworICAg ICAgICAgICAgdGhpcy50aW1lbGluZVNpZGViYXJQYW5lbC5zaG93VGltZWxpbmVWaWV3Rm9yVGlt ZWxpbmUodGhpcy5yZXByZXNlbnRlZE9iamVjdCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgIH0KIApAQCAtMjk4LDYgKzI5OCw2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVZp ZXcucHJvdG90eXBlID0gewogICAgIF9jbG9zZVN0YXR1c0J1dHRvbkNsaWNrZWQ6IGZ1bmN0aW9u KGV2ZW50KQogICAgIHsKICAgICAgICAgdGhpcy5uYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5l LnNlbGVjdGVkVHJlZUVsZW1lbnQuZGVzZWxlY3QoKTsKLSAgICAgICAgV2ViSW5zcGVjdG9yLnRp bWVsaW5lU2lkZWJhclBhbmVsLnNob3dUaW1lbGluZVZpZXdGb3JUaW1lbGluZSh0aGlzLnJlcHJl c2VudGVkT2JqZWN0KTsKKyAgICAgICAgdGhpcy50aW1lbGluZVNpZGViYXJQYW5lbC5zaG93VGlt ZWxpbmVWaWV3Rm9yVGltZWxpbmUodGhpcy5yZXByZXNlbnRlZE9iamVjdCk7CiAgICAgfQogfTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Rp bWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzCmluZGV4IDJk MzQzZDUxYTg1OTM3MWY0NzUwMjYyM2I2M2Q2YTI1NDg1ZWY1OGIuLjdlMzdhZmRhMDJiZWYzNWZk ZmQ4YWE1ODkzZDgwNmEyODg0YzM3MTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNv cmRpbmdDb250ZW50Vmlldy5qcwpAQCAtMjQsMTEgKzI0LDE1IEBACiAgKiBUSEUgUE9TU0lCSUxJ VFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5n Q29udGVudFZpZXcgPSBmdW5jdGlvbihyZWNvcmRpbmcpCitXZWJJbnNwZWN0b3IuVGltZWxpbmVS ZWNvcmRpbmdDb250ZW50VmlldyA9IGZ1bmN0aW9uKHJlY29yZGluZywgZXh0cmFBcmd1bWVudHMp CiB7CisgICAgY29uc29sZS5hc3NlcnQoZXh0cmFBcmd1bWVudHMpOworICAgIGNvbnNvbGUuYXNz ZXJ0KGV4dHJhQXJndW1lbnRzLnRpbWVsaW5lU2lkZWJhclBhbmVsIGluc3RhbmNlb2YgV2ViSW5z cGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsKTsKKwogICAgIFdlYkluc3BlY3Rvci5Db250ZW50 Vmlldy5jYWxsKHRoaXMsIHJlY29yZGluZyk7CiAKICAgICB0aGlzLl9yZWNvcmRpbmcgPSByZWNv cmRpbmc7CisgICAgdGhpcy5fdGltZWxpbmVTaWRlYmFyUGFuZWwgPSBleHRyYUFyZ3VtZW50cy50 aW1lbGluZVNpZGViYXJQYW5lbDsKIAogICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKFdl Ykluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LlN0eWxlQ2xhc3NOYW1lKTsK IApAQCAtNDksNyArNTMsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50 VmlldyA9IGZ1bmN0aW9uKHJlY29yZGluZykKICAgICB0aGlzLl9jbGVhclRpbWVsaW5lTmF2aWdh dGlvbkl0ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtKCJjbGVhci10 aW1lbGluZSIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ2xlYXIgVGltZWxpbmUiKSwgdHJhc2hJ bWFnZS5zcmMsIHRyYXNoSW1hZ2Uud2lkdGgsIHRyYXNoSW1hZ2UuaGVpZ2h0KTsKICAgICB0aGlz Ll9jbGVhclRpbWVsaW5lTmF2aWdhdGlvbkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fY2xlYXJUaW1lbGlu ZSwgdGhpcyk7CiAKLSAgICB0aGlzLl9vdmVydmlld1RpbWVsaW5lVmlldyA9IG5ldyBXZWJJbnNw ZWN0b3IuT3ZlcnZpZXdUaW1lbGluZVZpZXcocmVjb3JkaW5nKTsKKyAgICB0aGlzLl9vdmVydmll d1RpbWVsaW5lVmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdUaW1lbGluZVZpZXcocmVj b3JkaW5nLCB7dGltZWxpbmVTaWRlYmFyUGFuZWw6IHRoaXMuX3RpbWVsaW5lU2lkZWJhclBhbmVs fSk7CiAgICAgdGhpcy5fb3ZlcnZpZXdUaW1lbGluZVZpZXcuc2Vjb25kc1BlclBpeGVsID0gdGhp cy5fdGltZWxpbmVPdmVydmlldy5zZWNvbmRzUGVyUGl4ZWw7CiAKICAgICB0aGlzLl90aW1lbGlu ZVZpZXdNYXAgPSBuZXcgTWFwOwpAQCAtMzEyLDggKzMxNiw4IEBAIFdlYkluc3BlY3Rvci5UaW1l bGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHZh ciB0aW1lbGluZVZpZXcgPSB0aGlzLmN1cnJlbnRUaW1lbGluZVZpZXc7CiAgICAgICAgIGlmICh0 aW1lbGluZVZpZXcpIHsKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci50aW1lbGluZVNpZGViYXJQ YW5lbC5jb250ZW50VHJlZU91dGxpbmUgPSB0aW1lbGluZVZpZXcubmF2aWdhdGlvblNpZGViYXJU cmVlT3V0bGluZTsKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci50aW1lbGluZVNpZGViYXJQYW5l bC5jb250ZW50VHJlZU91dGxpbmVMYWJlbCA9IHRpbWVsaW5lVmlldy5uYXZpZ2F0aW9uU2lkZWJh clRyZWVPdXRsaW5lTGFiZWw7CisgICAgICAgICAgICB0aGlzLl90aW1lbGluZVNpZGViYXJQYW5l bC5jb250ZW50VHJlZU91dGxpbmUgPSB0aW1lbGluZVZpZXcubmF2aWdhdGlvblNpZGViYXJUcmVl T3V0bGluZTsKKyAgICAgICAgICAgIHRoaXMuX3RpbWVsaW5lU2lkZWJhclBhbmVsLmNvbnRlbnRU cmVlT3V0bGluZUxhYmVsID0gdGltZWxpbmVWaWV3Lm5hdmlnYXRpb25TaWRlYmFyVHJlZU91dGxp bmVMYWJlbDsKIAogICAgICAgICAgICAgdGltZWxpbmVWaWV3LnN0YXJ0VGltZSA9IHRoaXMuX3Rp bWVsaW5lT3ZlcnZpZXcuc2VsZWN0aW9uU3RhcnRUaW1lOwogICAgICAgICAgICAgdGltZWxpbmVW aWV3LmVuZFRpbWUgPSB0aGlzLl90aW1lbGluZU92ZXJ2aWV3LnNlbGVjdGlvblN0YXJ0VGltZSAr IHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXcuc2VsZWN0aW9uRHVyYXRpb247CkBAIC0zMjYsNyArMzMw LDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcucHJvdG90eXBl ID0gewogCiAgICAgX3BhdGhDb21wb25lbnRTZWxlY3RlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAg ewotICAgICAgICBXZWJJbnNwZWN0b3IudGltZWxpbmVTaWRlYmFyUGFuZWwuc2hvd1RpbWVsaW5l Vmlld0ZvclRpbWVsaW5lKGV2ZW50LmRhdGEucGF0aENvbXBvbmVudC5yZXByZXNlbnRlZE9iamVj dCk7CisgICAgICAgIHRoaXMuX3RpbWVsaW5lU2lkZWJhclBhbmVsLnNob3dUaW1lbGluZVZpZXdG b3JUaW1lbGluZShldmVudC5kYXRhLnBhdGhDb21wb25lbnQucmVwcmVzZW50ZWRPYmplY3QpOwog ICAgIH0sCiAKICAgICBfY29udGVudFZpZXdTZWxlY3Rpb25QYXRoQ29tcG9uZW50RGlkQ2hhbmdl OiBmdW5jdGlvbihldmVudCkKQEAgLTM5Miw3ICszOTYsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxp bmVSZWNvcmRpbmdDb250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLmN1 cnJlbnRUaW1lbGluZVZpZXcpCiAgICAgICAgICAgICB0aGlzLmN1cnJlbnRUaW1lbGluZVZpZXcu Y3VycmVudFRpbWUgPSBjdXJyZW50VGltZTsKIAotICAgICAgICBXZWJJbnNwZWN0b3IudGltZWxp bmVTaWRlYmFyUGFuZWwudXBkYXRlRmlsdGVyKCk7CisgICAgICAgIHRoaXMuX3RpbWVsaW5lU2lk ZWJhclBhbmVsLnVwZGF0ZUZpbHRlcigpOwogCiAgICAgICAgIC8vIEZvcmNlIGEgbGF5b3V0IG5v dyBzaW5jZSB3ZSBhcmUgYWxyZWFkeSBpbiBhbiBhbmltYXRpb24gZnJhbWUgYW5kIGRvbid0IG5l ZWQgdG8gZGVsYXkgaXQgdW50aWwgdGhlIG5leHQuCiAgICAgICAgIHRoaXMuX3RpbWVsaW5lT3Zl cnZpZXcudXBkYXRlTGF5b3V0SWZOZWVkZWQoKTsKQEAgLTQ5OSw3ICs1MDMsNyBAQCBXZWJJbnNw ZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAKICAgICAg ICAgY29uc29sZS5hc3NlcnQoIXRoaXMuX3RpbWVsaW5lVmlld01hcC5oYXModGltZWxpbmUpLCB0 aW1lbGluZSk7CiAKLSAgICAgICAgdGhpcy5fdGltZWxpbmVWaWV3TWFwLnNldCh0aW1lbGluZSwg bmV3IFdlYkluc3BlY3Rvci5Db250ZW50Vmlldyh0aW1lbGluZSkpOworICAgICAgICB0aGlzLl90 aW1lbGluZVZpZXdNYXAuc2V0KHRpbWVsaW5lLCBuZXcgV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3 KHRpbWVsaW5lLCB7dGltZWxpbmVTaWRlYmFyUGFuZWw6IHRoaXMuX3RpbWVsaW5lU2lkZWJhclBh bmVsfSkpOwogCiAgICAgICAgIHZhciBwYXRoQ29tcG9uZW50ID0gbmV3IFdlYkluc3BlY3Rvci5I aWVyYXJjaGljYWxQYXRoQ29tcG9uZW50KHRpbWVsaW5lLmRpc3BsYXlOYW1lLCB0aW1lbGluZS5p Y29uQ2xhc3NOYW1lLCB0aW1lbGluZSk7CiAgICAgICAgIHBhdGhDb21wb25lbnQuYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuSGllcmFyY2hpY2FsUGF0aENvbXBvbmVudC5FdmVudC5TaWJs aW5nV2FzU2VsZWN0ZWQsIHRoaXMuX3BhdGhDb21wb25lbnRTZWxlY3RlZCwgdGhpcyk7CkBAIC01 ODksNyArNTkzLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcu cHJvdG90eXBlID0gewogICAgICAgICAgICAgdmFyIHNlbGVjdGVkVHJlZUVsZW1lbnQgPSB0aGlz LmN1cnJlbnRUaW1lbGluZVZpZXcgJiYgdGhpcy5jdXJyZW50VGltZWxpbmVWaWV3Lm5hdmlnYXRp b25TaWRlYmFyVHJlZU91dGxpbmUgPyB0aGlzLmN1cnJlbnRUaW1lbGluZVZpZXcubmF2aWdhdGlv blNpZGViYXJUcmVlT3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50IDogbnVsbDsKICAgICAgICAg ICAgIHZhciBzZWxlY3Rpb25XYXNIaWRkZW4gPSBzZWxlY3RlZFRyZWVFbGVtZW50ICYmIHNlbGVj dGVkVHJlZUVsZW1lbnQuaGlkZGVuOwogCi0gICAgICAgICAgICBXZWJJbnNwZWN0b3IudGltZWxp bmVTaWRlYmFyUGFuZWwudXBkYXRlRmlsdGVyKCk7CisgICAgICAgICAgICB0aGlzLl90aW1lbGlu ZVNpZGViYXJQYW5lbC51cGRhdGVGaWx0ZXIoKTsKIAogICAgICAgICAgICAgaWYgKHNlbGVjdGVk VHJlZUVsZW1lbnQgJiYgc2VsZWN0ZWRUcmVlRWxlbWVudC5oaWRkZW4gIT09IHNlbGVjdGlvbldh c0hpZGRlbikKICAgICAgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhX ZWJJbnNwZWN0b3IuQ29udGVudFZpZXcuRXZlbnQuU2VsZWN0aW9uUGF0aENvbXBvbmVudHNEaWRD aGFuZ2UpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVGltZWxpbmVTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qcwppbmRleCBmMjQ3MmQ0MDk2 N2QyYmViMTEyMGUzNjc5ZGMzYjY2ODBiYjE3ZmI4Li42YTRhZThhZWVlN2ZhMWJlODBmZDZkMWM0 Yjc3NGI4MTgyYzgyOWZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qcwpAQCAt NDIwLDcgKzQyMCw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbCA9IGNsYXNz IFRpbWVsaW5lU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW5zcGVjCiAgICAgICAgIGZvciAodmFy IHRpbWVsaW5lIG9mIHJlY29yZGluZy50aW1lbGluZXMudmFsdWVzKCkpCiAgICAgICAgICAgICB0 aGlzLl90aW1lbGluZUFkZGVkKHRpbWVsaW5lKTsKIAotICAgICAgICB0aGlzLl9kaXNwbGF5ZWRD b250ZW50VmlldyA9IFdlYkluc3BlY3Rvci5jb250ZW50QnJvd3Nlci5jb250ZW50Vmlld0ZvclJl cHJlc2VudGVkT2JqZWN0KHRoaXMuX2Rpc3BsYXllZFJlY29yZGluZyk7CisgICAgICAgIHRoaXMu X2Rpc3BsYXllZENvbnRlbnRWaWV3ID0gV2ViSW5zcGVjdG9yLmNvbnRlbnRCcm93c2VyLmNvbnRl bnRWaWV3Rm9yUmVwcmVzZW50ZWRPYmplY3QodGhpcy5fZGlzcGxheWVkUmVjb3JkaW5nLCBmYWxz ZSwge3RpbWVsaW5lU2lkZWJhclBhbmVsOiB0aGlzfSk7CiAgICAgICAgIGlmICh0aGlzLnNlbGVj dGVkKQogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmNvbnRlbnRCcm93c2VyLnNob3dDb250ZW50 Vmlldyh0aGlzLl9kaXNwbGF5ZWRDb250ZW50Vmlldyk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVWaWV3LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVWaWV3Lmpz CmluZGV4IGU3ZGJjYWU4ZDBmMDUxMDZjNjJmYjQ5MzczNjFiYjE4MGNiMWIzNTkuLjExNDlhZGRl ZWY5M2EyYWQ5YWZhNGYwYWUwNGQzNmU4ODkzNjI0NWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVmlldy5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVZpZXcuanMKQEAg LTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDEzIEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMywgMjAxNSBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTUgVW5pdmVyc2l0eSBvZiBX YXNoaW5ndG9uLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBi aW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dApAQCAtMjQsMTUgKzI0LDIwIEBACiAgKiBUSEUg UE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotV2ViSW5zcGVjdG9yLlRpbWVsaW5l VmlldyA9IGZ1bmN0aW9uKHJlcHJlc2VudGVkT2JqZWN0KQorV2ViSW5zcGVjdG9yLlRpbWVsaW5l VmlldyA9IGZ1bmN0aW9uKHJlcHJlc2VudGVkT2JqZWN0LCBleHRyYUFyZ3VtZW50cykKIHsKICAg ICAvLyBUaGlzIGNsYXNzIHNob3VsZCBub3QgYmUgaW5zdGFudGlhdGVkIGRpcmVjdGx5LiBDcmVh dGUgYSBjb25jcmV0ZSBzdWJjbGFzcyBpbnN0ZWFkLgogICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMu Y29uc3RydWN0b3IgIT09IFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcgJiYgdGhpcyBpbnN0YW5j ZW9mIFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcpOwogCisgICAgY29uc29sZS5hc3NlcnQoZXh0 cmFBcmd1bWVudHMpOworICAgIGNvbnNvbGUuYXNzZXJ0KGV4dHJhQXJndW1lbnRzLnRpbWVsaW5l U2lkZWJhclBhbmVsIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVs KTsKKwogICAgIFdlYkluc3BlY3Rvci5Db250ZW50Vmlldy5jYWxsKHRoaXMsIHJlcHJlc2VudGVk T2JqZWN0KTsKIAotICAgIHRoaXMuX2NvbnRlbnRUcmVlT3V0bGluZSA9IFdlYkluc3BlY3Rvci50 aW1lbGluZVNpZGViYXJQYW5lbC5jcmVhdGVDb250ZW50VHJlZU91dGxpbmUoKTsKLSAgICB0aGlz LmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LlN0eWxlQ2xh c3NOYW1lKTsKKyAgICB0aGlzLl90aW1lbGluZVNpZGViYXJQYW5lbCA9IGV4dHJhQXJndW1lbnRz LnRpbWVsaW5lU2lkZWJhclBhbmVsOworICAgIHRoaXMuX2NvbnRlbnRUcmVlT3V0bGluZSA9IHRo aXMuX3RpbWVsaW5lU2lkZWJhclBhbmVsLmNyZWF0ZUNvbnRlbnRUcmVlT3V0bGluZSgpOworCisg ICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoInRpbWVsaW5lLXZpZXciKTsKIAogICAgIHRo aXMuX3plcm9UaW1lID0gMDsKICAgICB0aGlzLl9zdGFydFRpbWUgPSAwOwpAQCAtNDAsOCArNDUs NiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3ID0gZnVuY3Rpb24ocmVwcmVzZW50ZWRPYmpl Y3QpCiAgICAgdGhpcy5fY3VycmVudFRpbWUgPSAwOwogfTsKIAotV2ViSW5zcGVjdG9yLlRpbWVs aW5lVmlldy5TdHlsZUNsYXNzTmFtZSA9ICJ0aW1lbGluZS12aWV3IjsKLQogV2ViSW5zcGVjdG9y LlRpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7CiAgICAgY29uc3RydWN0b3I6IFdlYkluc3BlY3Rv ci5UaW1lbGluZVZpZXcsCiAgICAgX19wcm90b19fOiBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcu cHJvdG90eXBlLApAQCAtNTksNiArNjIsMTEgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5w cm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiBudWxsOwogICAgIH0sCiAKKyAgICBnZXQgdGlt ZWxpbmVTaWRlYmFyUGFuZWwoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3RpbWVsaW5l U2lkZWJhclBhbmVsOworICAgIH0sCisKICAgICBnZXQgc2VsZWN0aW9uUGF0aENvbXBvbmVudHMo KQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLl9jb250ZW50VHJlZU91dGxpbmUuc2VsZWN0ZWRU cmVlRWxlbWVudCB8fCB0aGlzLl9jb250ZW50VHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVu dC5oaWRkZW4pCg==