126667 2014-01-08 14:50:28 -0800 Web Inspector: Update the current WebInspector.TimelineView when time range changes 2014-01-20 19:03:18 -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 965647 0 timothy 2014-01-08 14:50:28 -0800 When the TimelineOverview time selection changes, update the current TimelineView. 965649 1 220671 timothy 2014-01-08 15:06:52 -0800 Created attachment 220671 Patch 965650 2 webkit-bug-importer 2014-01-08 15:07:23 -0800 <rdar://problem/15776691> 965651 3 webkit-bug-importer 2014-01-08 15:08:33 -0800 <rdar://problem/15776693> 965653 4 220671 joepeck 2014-01-08 15:20:39 -0800 Comment on attachment 220671 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=220671&action=review r=me > Source/WebInspectorUI/UserInterface/TimelineContentView.js:196 > + var endTime = Math.max(WebInspector.timelineManager.recording.endTime || startTime, startTime); Hmm, this doesn't sound right. Maybe the "|| startTime" should just go away, no? > Source/WebInspectorUI/UserInterface/TimelineOverview.js:167 > + // Update all ruler element to the new required width. Typo: "all ruler" => "ruler" > Source/WebInspectorUI/UserInterface/TimelineView.js:169 > + this._scheduledLayoutUpdateIdentifier = requestAnimationFrame(this.updateLayout.bind(this)); How often will we updateLayout? Maybe we should cache an updateLayout.bind(this) to prevent function creation churn? 966039 5 220671 timothy 2014-01-09 13:16:47 -0800 Comment on attachment 220671 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=220671&action=review >> Source/WebInspectorUI/UserInterface/TimelineContentView.js:196 >> + var endTime = Math.max(WebInspector.timelineManager.recording.endTime || startTime, startTime); > > Hmm, this doesn't sound right. Maybe the "|| startTime" should just go away, no? I meant to revet this line. At one point I had other doe in there for the Math.max. Now WebInspector.timelineManager.recording.endTime is always what I want. >> Source/WebInspectorUI/UserInterface/TimelineView.js:169 >> + this._scheduledLayoutUpdateIdentifier = requestAnimationFrame(this.updateLayout.bind(this)); > > How often will we updateLayout? Maybe we should cache an updateLayout.bind(this) to prevent function creation churn? Good idea. I'll do that in a follow up with all the places this happens. 970126 6 timothy 2014-01-20 19:03:18 -0800 https://trac.webkit.org/changeset/162411 220671 2014-01-08 15:06:52 -0800 2014-01-09 13:16:47 -0800 Patch bug-126667-20140108150657.patch text/plain 15455 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3ODg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj NzIxMDJjNTVkNzNlNmY5NzlkY2U0MWZhZmQ3ZmJjZmQ0ZmM4NWIxLi5lNjg3YzY1OTZlNDIwOWMz MjkyMTU0YjNmYzNiY2ZmODcxY2UxYzRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw0NiBAQAogMjAxNC0wMS0wOCAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgVXBkYXRlIHRoZSBjdXJyZW50IFdlYkluc3BlY3Rvci5UaW1lbGluZVZp ZXcgd2hlbiB0aW1lIHJhbmdlIGNoYW5nZXMuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjY2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9UaW1lbGluZUNvbnRlbnRWaWV3 LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ29udGVudFZpZXcucHJvdG90eXBl Ll9zaG93VGltZWxpbmVWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRl bnRWaWV3LnByb3RvdHlwZS5fdXBkYXRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGlu ZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fc3RhcnRVcGRhdGluZ0N1cnJlbnRUaW1lKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fc3RvcFVwZGF0 aW5nQ3VycmVudFRpbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ29udGVudFZp ZXcucHJvdG90eXBlLl9yZWNvcmRpbmdTdGFydGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U aW1lbGluZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fcmVjb3JkaW5nU3RvcHBlZCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGltZWxpbmVDb250ZW50Vmlldy5wcm90b3R5cGUuX3JlY29yZGluZ1Jl c2V0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3LnByb3RvdHlw ZS5fdGltZVJhbmdlU2VsZWN0aW9uQ2hhbmdlZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9U aW1lbGluZU92ZXJ2aWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZp ZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcucHJvdG90eXBlLnVw ZGF0ZUxheW91dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5wcm90 b3R5cGUudXBkYXRlTGF5b3V0SWZOZWVkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVs aW5lT3ZlcnZpZXcucHJvdG90eXBlLl91cGRhdGVFbGVtZW50V2lkdGgpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcucHJvdG90eXBlLl9oYW5kbGVXaGVlbEV2ZW50KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlwZS5fdGltZVJh bmdlU2VsZWN0aW9uQ2hhbmdlZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9UaW1lbGluZVJ1 bGVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIucHJvdG90eXBlLnVw ZGF0ZUxheW91dElmTmVlZGVkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1RpbWVsaW5lVmll dy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUuZ2V0IHplcm9UaW1lKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcucHJvdG90eXBlLnNldCB6ZXJvVGltZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LnByb3RvdHlwZS5nZXQgc3RhcnRUaW1lKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcucHJvdG90eXBlLnNldCBzdGFydFRp bWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUuZ2V0IGVu ZFRpbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUuc2V0 IGVuZFRpbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUu Z2V0IGN1cnJlbnRUaW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcucHJv dG90eXBlLnNldCBjdXJyZW50VGltZS5jaGVja0lmTGF5b3V0SXNOZWVkZWQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUuc2V0IGN1cnJlbnRUaW1lKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcucHJvdG90eXBlLnVwZGF0ZUxheW91dCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LnByb3RvdHlwZS51cGRhdGVMYXlv dXRJZk5lZWRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LnByb3RvdHlw ZS5uZWVkc0xheW91dCk6CisKKzIwMTQtMDEtMDggIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlA YXBwbGUuY29tPgorCiAgICAgICAgIEltcHJvdmUgc2Nyb2xsIHBlcmZvcm1hbmNlIG9mIFdlYklu c3BlY3Rvci5UcmVlT3V0bGluZURhdGFHcmlkU3luY2hyb25pemVyLgogCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjY2NjAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lQ29udGVudFZpZXcuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZUNvbnRlbnRWaWV3 LmpzCmluZGV4IDg5NTAwNzA5M2QwNDhkZDUwYjUwMDkxNjY2ZTUyN2MzYjI5MDAzYWYuLjA4NDRk OWEzZmJhODAxNTdhZTc4NWIwNzRhNWJkZDY2YzdmNzRiOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lQ29udGVudFZpZXcuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVDb250ZW50Vmlldy5q cwpAQCAtMzAsNiArMzAsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVDb250ZW50VmlldyA9IGZ1 bmN0aW9uKHJlY29yZGluZykKICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNw ZWN0b3IuVGltZWxpbmVDb250ZW50Vmlldy5TdHlsZUNsYXNzTmFtZSk7CiAKICAgICB0aGlzLl90 aW1lbGluZU92ZXJ2aWV3ID0gbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3OworICAg IHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXcuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGlt ZWxpbmVPdmVydmlldy5FdmVudC5UaW1lUmFuZ2VTZWxlY3Rpb25DaGFuZ2VkLCB0aGlzLl90aW1l UmFuZ2VTZWxlY3Rpb25DaGFuZ2VkLCB0aGlzKTsKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hp bGQodGhpcy5fdGltZWxpbmVPdmVydmlldy5lbGVtZW50KTsKIAogICAgIHRoaXMuX2N1cnJlbnRU aW1lTWFya2VyID0gbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZU1hcmtlcigwLCBXZWJJbnNwZWN0 b3IuVGltZWxpbmVNYXJrZXIuVHlwZS5DdXJyZW50VGltZSk7CkBAIC0xNzUsNyArMTc2LDE0IEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgICAg ICBpZiAodGhpcy5fY3VycmVudFRpbWVsaW5lVmlldykgewogICAgICAgICAgICAgdGhpcy5fdmll d0NvbnRhaW5lci5hcHBlbmRDaGlsZCh0aGlzLl9jdXJyZW50VGltZWxpbmVWaWV3LmVsZW1lbnQp OworCisgICAgICAgICAgICB0aGlzLl9jdXJyZW50VGltZWxpbmVWaWV3Lnplcm9UaW1lID0gdGhp cy5fdGltZWxpbmVPdmVydmlldy5zdGFydFRpbWU7CisgICAgICAgICAgICB0aGlzLl9jdXJyZW50 VGltZWxpbmVWaWV3LnN0YXJ0VGltZSA9IHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXcuc2VsZWN0aW9u U3RhcnRUaW1lOworICAgICAgICAgICAgdGhpcy5fY3VycmVudFRpbWVsaW5lVmlldy5lbmRUaW1l ID0gdGhpcy5fdGltZWxpbmVPdmVydmlldy5zZWxlY3Rpb25TdGFydFRpbWUgKyB0aGlzLl90aW1l bGluZU92ZXJ2aWV3LnNlbGVjdGlvbkR1cmF0aW9uOworICAgICAgICAgICAgdGhpcy5fY3VycmVu dFRpbWVsaW5lVmlldy5jdXJyZW50VGltZSA9IHRoaXMuX2N1cnJlbnRUaW1lTWFya2VyLnRpbWU7 CisKICAgICAgICAgICAgIHRoaXMuX2N1cnJlbnRUaW1lbGluZVZpZXcuc2hvd24oKTsKKyAgICAg ICAgICAgIHRoaXMuX2N1cnJlbnRUaW1lbGluZVZpZXcudXBkYXRlTGF5b3V0SWZOZWVkZWQoKTsK ICAgICAgICAgfQogCiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYklu c3BlY3Rvci5Db250ZW50Vmlldy5FdmVudC5TZWxlY3Rpb25QYXRoQ29tcG9uZW50c0RpZENoYW5n ZSk7CkBAIC0xODUsMTMgKzE5MywxMSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVDb250ZW50Vmll dy5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICB2YXIgc3RhcnRUaW1lID0gV2ViSW5zcGVj dG9yLnRpbWVsaW5lTWFuYWdlci5yZWNvcmRpbmcuc3RhcnRUaW1lOwogICAgICAgICB2YXIgY3Vy cmVudFRpbWUgPSB0aGlzLl9jdXJyZW50VGltZU1hcmtlci50aW1lIHx8IHN0YXJ0VGltZTsKLSAg ICAgICAgdmFyIGVuZFRpbWUgPSBXZWJJbnNwZWN0b3IudGltZWxpbmVNYW5hZ2VyLnJlY29yZGlu Zy5lbmRUaW1lOworICAgICAgICB2YXIgZW5kVGltZSA9IE1hdGgubWF4KFdlYkluc3BlY3Rvci50 aW1lbGluZU1hbmFnZXIucmVjb3JkaW5nLmVuZFRpbWUgfHwgc3RhcnRUaW1lLCBzdGFydFRpbWUp OwogICAgICAgICB2YXIgdGltZXNwYW5TaW5jZUxhc3RVcGRhdGUgPSAodGltZXN0YW1wIC0gdGhp cy5fbGFzdFVwZGF0ZVRpbWVzdGFtcCkgLyAxMDAwIHx8IDA7CiAKICAgICAgICAgY3VycmVudFRp bWUgKz0gdGltZXNwYW5TaW5jZUxhc3RVcGRhdGU7CiAKLSAgICAgICAgdGhpcy5fY3VycmVudFRp bWVNYXJrZXIudGltZSA9IGN1cnJlbnRUaW1lOwotCiAgICAgICAgIGlmICh0aGlzLl9zdGFydFRp bWVOZWVkc1Jlc2V0ICYmICFpc05hTihzdGFydFRpbWUpKSB7CiAgICAgICAgICAgICB2YXIgc2Vs ZWN0aW9uT2Zmc2V0ID0gdGhpcy5fdGltZWxpbmVPdmVydmlldy5zZWxlY3Rpb25TdGFydFRpbWUg LSB0aGlzLl90aW1lbGluZU92ZXJ2aWV3LnN0YXJ0VGltZTsKICAgICAgICAgICAgIHRoaXMuX3Rp bWVsaW5lT3ZlcnZpZXcuc3RhcnRUaW1lID0gc3RhcnRUaW1lOwpAQCAtMjAxLDggKzIwNywxMiBA QCBXZWJJbnNwZWN0b3IuVGltZWxpbmVDb250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAKICAgICAg ICAgdGhpcy5fdGltZWxpbmVPdmVydmlldy5lbmRUaW1lID0gTWF0aC5tYXgoZW5kVGltZSwgY3Vy cmVudFRpbWUpOwogCisgICAgICAgIHRoaXMuX2N1cnJlbnRUaW1lTWFya2VyLnRpbWUgPSBjdXJy ZW50VGltZTsKKyAgICAgICAgdGhpcy5fY3VycmVudFRpbWVsaW5lVmlldy5jdXJyZW50VGltZSA9 IGN1cnJlbnRUaW1lOworCiAgICAgICAgIC8vIEZvcmNlIGEgbGF5b3V0IG5vdyBzaW5jZSB3ZSBh cmUgYWxyZWFkeSBpbiBhbiBhbmltYXRpb24gZnJhbWUgYW5kIGRvbid0IG5lZWQgdG8gZGVsYXkg aXQgdW50aWwgdGhlIG5leHQuCi0gICAgICAgIHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXcudXBkYXRl TGF5b3V0KCk7CisgICAgICAgIHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXcudXBkYXRlTGF5b3V0SWZO ZWVkZWQoKTsKKyAgICAgICAgdGhpcy5fY3VycmVudFRpbWVsaW5lVmlldy51cGRhdGVMYXlvdXRJ Zk5lZWRlZCgpOwogCiAgICAgICAgIHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXcucmV2ZWFsTWFya2Vy KHRoaXMuX2N1cnJlbnRUaW1lTWFya2VyKTsKIApAQCAtMjE3LDcgKzIyNyw3IEBAIFdlYkluc3Bl Y3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmVxdWVzdEFu aW1hdGlvbkZyYW1lKHRoaXMuX3VwZGF0ZUNhbGxiYWNrKTsKICAgICB9LAogCi0gICAgX3JlY29y ZGluZ1N0YXJ0ZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIF9zdGFydFVwZGF0aW5nQ3VycmVudFRp bWU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCF0aGlzLl91cGRh dGluZyk7CiAgICAgICAgIGlmICh0aGlzLl91cGRhdGluZykKQEAgLTIzMSwxMiArMjQxLDIyIEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAg cmVxdWVzdEFuaW1hdGlvbkZyYW1lKHRoaXMuX3VwZGF0ZUNhbGxiYWNrKTsKICAgICB9LAogCi0g ICAgX3JlY29yZGluZ1N0b3BwZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIF9zdG9wVXBkYXRpbmdD dXJyZW50VGltZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQodGhp cy5fdXBkYXRpbmcpOwogICAgICAgICB0aGlzLl91cGRhdGluZyA9IGZhbHNlOwogICAgIH0sCiAK KyAgICBfcmVjb3JkaW5nU3RhcnRlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB0 aGlzLl9zdGFydFVwZGF0aW5nQ3VycmVudFRpbWUoKTsKKyAgICB9LAorCisgICAgX3JlY29yZGlu Z1N0b3BwZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5fc3RvcFVwZGF0 aW5nQ3VycmVudFRpbWUoKTsKKyAgICB9LAorCiAgICAgX3JlY29yZGluZ1Jlc2V0OiBmdW5jdGlv bihldmVudCkKICAgICB7CiAgICAgICAgIHRoaXMuX3N0YXJ0VGltZU5lZWRzUmVzZXQgPSB0cnVl OwpAQCAtMjQ2LDUgKzI2NiwxMiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVDb250ZW50Vmlldy5w cm90b3R5cGUgPSB7CiAKICAgICAgICAgZm9yICh2YXIgaWRlbnRpZmllciBpbiB0aGlzLl9kaXNj cmV0ZVRpbWVsaW5lVmlld01hcCkKICAgICAgICAgICAgIHRoaXMuX2Rpc2NyZXRlVGltZWxpbmVW aWV3TWFwW2lkZW50aWZpZXJdLnJlc2V0KCk7CisgICAgfSwKKworICAgIF90aW1lUmFuZ2VTZWxl Y3Rpb25DaGFuZ2VkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHRoaXMuX2N1cnJl bnRUaW1lbGluZVZpZXcuemVyb1RpbWUgPSB0aGlzLl90aW1lbGluZU92ZXJ2aWV3LnN0YXJ0VGlt ZTsKKyAgICAgICAgdGhpcy5fY3VycmVudFRpbWVsaW5lVmlldy5zdGFydFRpbWUgPSB0aGlzLl90 aW1lbGluZU92ZXJ2aWV3LnNlbGVjdGlvblN0YXJ0VGltZTsKKyAgICAgICAgdGhpcy5fY3VycmVu dFRpbWVsaW5lVmlldy5lbmRUaW1lID0gdGhpcy5fdGltZWxpbmVPdmVydmlldy5zZWxlY3Rpb25T dGFydFRpbWUgKyB0aGlzLl90aW1lbGluZU92ZXJ2aWV3LnNlbGVjdGlvbkR1cmF0aW9uOwogICAg IH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9U aW1lbGluZU92ZXJ2aWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv VGltZWxpbmVPdmVydmlldy5qcwppbmRleCA1ZWQyNTViMDBlODFkNWRkMGU3Y2JiNzk4NGM1MmI1 ZWQ4YTEwN2Q4Li5kYTlkOTYzNWI4YzNiNjBkNWRlNTZkYzdlNGFiZTRkMjI1ODY3NDk2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZU92ZXJ2 aWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5l T3ZlcnZpZXcuanMKQEAgLTM5LDEzICszOSwxNCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVy dmlldyA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLl90aW1lbGluZVJ1bGVyID0gbmV3IFdlYkluc3Bl Y3Rvci5UaW1lbGluZVJ1bGVyOwogICAgIHRoaXMuX3RpbWVsaW5lUnVsZXIuYWxsb3dzQ2xpcHBl ZExhYmVscyA9IHRydWU7CiAgICAgdGhpcy5fdGltZWxpbmVSdWxlci5hbGxvd3NUaW1lUmFuZ2VT ZWxlY3Rpb24gPSB0cnVlOworICAgIHRoaXMuX3RpbWVsaW5lUnVsZXIuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5FdmVudC5UaW1lUmFuZ2VTZWxlY3Rpb25DaGFu Z2VkLCB0aGlzLl90aW1lUmFuZ2VTZWxlY3Rpb25DaGFuZ2VkLCB0aGlzKTsKICAgICB0aGlzLl9z Y3JvbGxDb250YWluZXIuYXBwZW5kQ2hpbGQodGhpcy5fdGltZWxpbmVSdWxlci5lbGVtZW50KTsK IAogICAgIHRoaXMuX2VuZFRpbWUgPSAwOwogCiAgICAgdGhpcy5zdGFydFRpbWUgPSAwOwogICAg IHRoaXMuc2Vjb25kc1BlclBpeGVsID0gMC4wMDI1OwotICAgIHRoaXMuc2VsZWN0aW9uRHVyYXRp b24gPSA1OworICAgIHRoaXMuc2VsZWN0aW9uRHVyYXRpb24gPSAzOwogfTsKIAogV2ViSW5zcGVj dG9yLlRpbWVsaW5lT3ZlcnZpZXcuU3R5bGVDbGFzc05hbWUgPSAidGltZWxpbmUtb3ZlcnZpZXci OwpAQCAtNTMsNiArNTQsMTAgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcuU2Nyb2xs Q29udGFpbmVyU3R5bGVDbGFzc05hbWUgPSAic2Nyb2xsLWNvbnRhaW5lciIKIFdlYkluc3BlY3Rv ci5UaW1lbGluZU92ZXJ2aWV3Lk1pbmltdW1TZWNvbmRzUGVyUGl4ZWwgPSAwLjAwMTsKIFdlYklu c3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3LlNlY29uZHNQZXJTY3JvbGxEZWx0YSA9IDAuMDAwMDA1 OwogCitXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5FdmVudCA9IHsKKyAgICBUaW1lUmFu Z2VTZWxlY3Rpb25DaGFuZ2VkOiAidGltZWxpbmUtb3ZlcnZpZXctdGltZS1yYW5nZS1zZWxlY3Rp b24tY2hhbmdlZCIKK307CisKIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlw ZSA9IHsKICAgICBjb25zdHJ1Y3RvcjogV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcsCiAg ICAgX19wcm90b19fOiBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZSwKQEAgLTE1OSwxMSAr MTY0LDIwIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlwZSA9IHsKICAg ICAgICAgdmFyIGR1cmF0aW9uID0gdGhpcy5lbmRUaW1lIC0gdGhpcy5zdGFydFRpbWU7CiAgICAg ICAgIHZhciBuZXdXaWR0aCA9IE1hdGguY2VpbChkdXJhdGlvbiAvIHRoaXMuc2Vjb25kc1BlclBp eGVsKTsKIAotICAgICAgICAvLyBVcGRhdGUgYWxsIHJlbGV2YW50IGVsZW1lbnRzIHRvIHRoZSBu ZXcgcmVxdWlyZWQgd2lkdGguCi0gICAgICAgIHRoaXMuX3VwZGF0ZUVsZW1lbnRXaWR0aCh0aGlz Ll90aW1lbGluZVJ1bGVyLmVsZW1lbnQsIG5ld1dpZHRoKTsKKyAgICAgICAgLy8gVXBkYXRlIGFs bCBydWxlciBlbGVtZW50IHRvIHRoZSBuZXcgcmVxdWlyZWQgd2lkdGguCisgICAgICAgIGlmICh0 aGlzLl91cGRhdGVFbGVtZW50V2lkdGgodGhpcy5fdGltZWxpbmVSdWxlci5lbGVtZW50LCBuZXdX aWR0aCkpIHsKKyAgICAgICAgICAgIC8vIFVwZGF0ZSB0aGUgdGltZSBydWxlciBsYXlvdXQgbm93 IHRoYXQgaXRzIHdpZHRoIGhhcyBjaGFuZ2VkLgorICAgICAgICAgICAgdGhpcy5fdGltZWxpbmVS dWxlci51cGRhdGVMYXlvdXQoKTsKKyAgICAgICAgfQorICAgIH0sCiAKLSAgICAgICAgLy8gVXBk YXRlIHRoZSB0aW1lIHJ1bGVyIGxheW91dCBub3cgdGhhdCBpdHMgd2lkdGggaGFzIGNoYW5nZWQu Ci0gICAgICAgIHRoaXMuX3RpbWVsaW5lUnVsZXIudXBkYXRlTGF5b3V0KCk7CisgICAgdXBkYXRl TGF5b3V0SWZOZWVkZWQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3RpbWVsaW5l UnVsZXIudXBkYXRlTGF5b3V0SWZOZWVkZWQoKTsKKworICAgICAgICBpZiAoIXRoaXMuX3NjaGVk dWxlZExheW91dFVwZGF0ZUlkZW50aWZpZXIpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAg IHRoaXMudXBkYXRlTGF5b3V0KCk7CiAgICAgfSwKIAogICAgIC8vIFByaXZhdGUKQEAgLTE3MSw4 ICsxODUsMTIgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcucHJvdG90eXBlID0gewog ICAgIF91cGRhdGVFbGVtZW50V2lkdGg6IGZ1bmN0aW9uKGVsZW1lbnQsIG5ld1dpZHRoKQogICAg IHsKICAgICAgICAgdmFyIGN1cnJlbnRXaWR0aCA9IHBhcnNlRmxvYXQoZWxlbWVudC5zdHlsZS53 aWR0aCkudG9GaXhlZCgwKTsKLSAgICAgICAgaWYgKGN1cnJlbnRXaWR0aCAhPT0gbmV3V2lkdGgp CisgICAgICAgIGlmIChjdXJyZW50V2lkdGggIT09IG5ld1dpZHRoKSB7CiAgICAgICAgICAgICBl bGVtZW50LnN0eWxlLndpZHRoID0gbmV3V2lkdGggKyAicHgiOworICAgICAgICAgICAgcmV0dXJu IHRydWU7CisgICAgICAgIH0KKworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfSwKIAogICAg IF9uZWVkc0xheW91dDogZnVuY3Rpb24oKQpAQCAtMTk4LDEyICsyMTYsMTcgQEAgV2ViSW5zcGVj dG9yLlRpbWVsaW5lT3ZlcnZpZXcucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnNlY29uZHNQ ZXJQaXhlbCArPSBldmVudC5kZWx0YVkgKiBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5T ZWNvbmRzUGVyU2Nyb2xsRGVsdGEgKiBkZXZpY2VEaXJlY3Rpb247CiAKICAgICAgICAgLy8gRm9y Y2UgbGF5b3V0IHNvIHdlIGNhbiB1cGRhdGUgdGhlIHNjcm9sbCBwb3NpdGlvbiBzeW5jaHJvbm91 c2x5LgotICAgICAgICB0aGlzLnVwZGF0ZUxheW91dCgpOworICAgICAgICB0aGlzLnVwZGF0ZUxh eW91dElmTmVlZGVkKCk7CiAKICAgICAgICAgLy8gQ2VudGVyIHRoZSB6b29tIGFyb3VuZCB0aGUg bW91c2UgYmFzZWQgb24gdGhlIHJlbWVtYmVyZWQgbW91c2UgcG9zaXRpb24gdGltZS4KICAgICAg ICAgdGhpcy5fc2Nyb2xsQ29udGFpbmVyLnNjcm9sbExlZnQgPSBNYXRoLm1heCgwLCBNYXRoLnJv dW5kKChtb3VzZVBvc2l0aW9uVGltZSAvIHRoaXMuc2Vjb25kc1BlclBpeGVsKSAtIG1vdXNlT2Zm c2V0KSk7CiAKICAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKICAgICAgICAgZXZlbnQu c3RvcFByb3BhZ2F0aW9uKCk7CisgICAgfSwKKworICAgIF90aW1lUmFuZ2VTZWxlY3Rpb25DaGFu Z2VkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRv TGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3LkV2ZW50LlRpbWVSYW5nZVNl bGVjdGlvbkNoYW5nZWQpOwogICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZVJ1bGVyLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVSdWxlci5qcwppbmRleCA2Njg4MWRhYmM4OTljYWFj YzA3NzhiMWViZmU2OGM0YWM5ZTM4NWFkLi40MjZmMjhmZTcyN2NmOWFlMjczMjk2NDgzZjk2MTU4 ODYxZTI4NTlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9UaW1lbGluZVJ1bGVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1RpbWVsaW5lUnVsZXIuanMKQEAgLTM5Nyw2ICszOTcsMjYgQEAgV2ViSW5zcGVjdG9yLlRp bWVsaW5lUnVsZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl91cGRhdGVTZWxlY3Rpb24o dmlzaWJsZVdpZHRoLCBkdXJhdGlvbik7CiAgICAgfSwKIAorICAgIHVwZGF0ZUxheW91dElmTmVl ZGVkOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICAvLyBJZiB0aGVyZSBpcyBhIG1haW4gbGF5 b3V0IHNjaGVkdWxlZCB3ZSBjYW4ganVzdCB1cGRhdGUgbGF5b3V0IGFuZCByZXR1cm4sIHNpbmNl IHRoYXQKKyAgICAgICAgLy8gd2lsbCB1cGRhdGUgbWFya2VycyBhbmQgdGhlIHNlbGVjdGlvbiBh dCB0aGUgc2FtZSB0aW1lLgorICAgICAgICBpZiAodGhpcy5fc2NoZWR1bGVkTGF5b3V0VXBkYXRl SWRlbnRpZmllcikgeworICAgICAgICAgICAgdGhpcy51cGRhdGVMYXlvdXQoKTsKKyAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIHZhciB2aXNpYmxlV2lkdGggPSB0aGlz Ll9lbGVtZW50LmNsaWVudFdpZHRoOworICAgICAgICBpZiAodmlzaWJsZVdpZHRoIDw9IDApCisg ICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgaWYgKHRoaXMuX3NjaGVkdWxlZE1hcmtlckxh eW91dFVwZGF0ZUlkZW50aWZpZXIpCisgICAgICAgICAgICB0aGlzLl91cGRhdGVNYXJrZXJzKHZp c2libGVXaWR0aCwgdGhpcy5kdXJhdGlvbik7CisKKyAgICAgICAgaWYgKHRoaXMuX3NjaGVkdWxl ZFNlbGVjdGlvbkxheW91dFVwZGF0ZUlkZW50aWZpZXIpCisgICAgICAgICAgICB0aGlzLl91cGRh dGVTZWxlY3Rpb24odmlzaWJsZVdpZHRoLCB0aGlzLmR1cmF0aW9uKTsKKyAgICB9LAorCiAgICAg Ly8gUHJpdmF0ZQogCiAgICAgX25lZWRzTGF5b3V0OiBmdW5jdGlvbigpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZVZpZXcuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZVZpZXcuanMKaW5kZXggOGYx OTRmNmQ4ZDA2YzgxMzk1YWY5Mjg0MzlkM2YzNzAxOWIwN2ZjYi4uNDM2YWQxNWNlMDAxOTg0NGUy MjljMWU1ZWRhZTE2NGMzZTc4YzM0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVGltZWxpbmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lVmlldy5qcwpAQCAtMzEsNiArMzEsMTEgQEAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lVmlldyA9IGZ1bmN0aW9uKCkKIAogICAgIHRoaXMuZWxlbWVudCA9IGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3Qu YWRkKFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcuU3R5bGVDbGFzc05hbWUpOworCisgICAgdGhp cy5femVyb1RpbWUgPSAwOworICAgIHRoaXMuX3N0YXJ0VGltZSA9IDA7CisgICAgdGhpcy5fZW5k VGltZSA9IDU7CisgICAgdGhpcy5fY3VycmVudFRpbWUgPSAwOwogfTsKIAogV2ViSW5zcGVjdG9y LlRpbWVsaW5lVmlldy5TdHlsZUNsYXNzTmFtZSA9ICJ0aW1lbGluZS12aWV3IjsKQEAgLTUyLDYg KzU3LDc2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcucHJvdG90eXBlID0gewogICAgICAg ICByZXR1cm4gbnVsbDsKICAgICB9LAogCisgICAgZ2V0IHplcm9UaW1lKCkKKyAgICB7CisgICAg ICAgIHJldHVybiB0aGlzLl96ZXJvVGltZTsKKyAgICB9LAorCisgICAgc2V0IHplcm9UaW1lKHgp CisgICAgeworICAgICAgICBpZiAodGhpcy5femVyb1RpbWUgPT09IHgpCisgICAgICAgICAgICBy ZXR1cm47CisKKyAgICAgICAgdGhpcy5femVyb1RpbWUgPSB4IHx8IDA7CisKKyAgICAgICAgdGhp cy5uZWVkc0xheW91dCgpOworICAgIH0sCisKKyAgICBnZXQgc3RhcnRUaW1lKCkKKyAgICB7Cisg ICAgICAgIHJldHVybiB0aGlzLl9zdGFydFRpbWU7CisgICAgfSwKKworICAgIHNldCBzdGFydFRp bWUoeCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl9zdGFydFRpbWUgPT09IHgpCisgICAgICAg ICAgICByZXR1cm47CisKKyAgICAgICAgdGhpcy5fc3RhcnRUaW1lID0geCB8fCAwOworCisgICAg ICAgIHRoaXMubmVlZHNMYXlvdXQoKTsKKyAgICB9LAorCisgICAgZ2V0IGVuZFRpbWUoKQorICAg IHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2VuZFRpbWU7CisgICAgfSwKKworICAgIHNldCBlbmRU aW1lKHgpCisgICAgeworICAgICAgICBpZiAodGhpcy5fZW5kVGltZSA9PT0geCkKKyAgICAgICAg ICAgIHJldHVybjsKKworICAgICAgICB0aGlzLl9lbmRUaW1lID0geCB8fCAwOworCisgICAgICAg IHRoaXMubmVlZHNMYXlvdXQoKTsKKyAgICB9LAorCisgICAgZ2V0IGN1cnJlbnRUaW1lKCkKKyAg ICB7CisgICAgICAgIHJldHVybiB0aGlzLl9jdXJyZW50VGltZTsKKyAgICB9LAorCisgICAgc2V0 IGN1cnJlbnRUaW1lKHgpCisgICAgeworICAgICAgICBpZiAodGhpcy5fY3VycmVudFRpbWUgPT09 IHgpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgdmFyIG9sZEN1cnJlbnRUaW1lID0g dGhpcy5fY3VycmVudFRpbWU7CisKKyAgICAgICAgdGhpcy5fY3VycmVudFRpbWUgPSB4IHx8IDA7 CisKKyAgICAgICAgZnVuY3Rpb24gY2hlY2tJZkxheW91dElzTmVlZGVkKGN1cnJlbnRUaW1lKQor ICAgICAgICB7CisgICAgICAgICAgICAvLyBJbmNsdWRlIHNvbWUgd2lnZ2xlIHJvb20gc2luY2Ug dGhlIGN1cnJlbnQgdGltZSBtYXJrZXJzIGNhbiBiZSBjbGlwcGVkIG9mZiB0aGUgZW5kcyBhIGJp dCBhbmQgc3RpbGwgcGFydGlhbGx5IHZpc2libGUuCisgICAgICAgICAgICBjb25zdCB3aWdnbGVU aW1lID0gMC4wNTsgLy8gNTBtcworICAgICAgICAgICAgcmV0dXJuIHRoaXMuX3N0YXJ0VGltZSAt IHdpZ2dsZVRpbWUgPD0gY3VycmVudFRpbWUgJiYgY3VycmVudFRpbWUgPD0gdGhpcy5fZW5kVGlt ZSArIHdpZ2dsZVRpbWU7CisgICAgICAgIH0KKworICAgICAgICBpZiAoY2hlY2tJZkxheW91dElz TmVlZGVkLmNhbGwodGhpcywgb2xkQ3VycmVudFRpbWUpIHx8IGNoZWNrSWZMYXlvdXRJc05lZWRl ZC5jYWxsKHRoaXMsIHRoaXMuX2N1cnJlbnRUaW1lKSkKKyAgICAgICAgICAgIHRoaXMubmVlZHNM YXlvdXQoKTsKKyAgICB9LAorCiAgICAgcmVzZXQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAg IHRoaXMuX2NvbnRlbnRUcmVlT3V0bGluZS5yZW1vdmVDaGlsZHJlbigpOwpAQCAtNjksNiArMTQ0 LDI4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcucHJvdG90eXBlID0gewogCiAgICAgdXBk YXRlTGF5b3V0OiBmdW5jdGlvbigpCiAgICAgeworICAgICAgICBpZiAodGhpcy5fc2NoZWR1bGVk TGF5b3V0VXBkYXRlSWRlbnRpZmllcikgeworICAgICAgICAgICAgY2FuY2VsQW5pbWF0aW9uRnJh bWUodGhpcy5fc2NoZWR1bGVkTGF5b3V0VXBkYXRlSWRlbnRpZmllcik7CisgICAgICAgICAgICBk ZWxldGUgdGhpcy5fc2NoZWR1bGVkTGF5b3V0VXBkYXRlSWRlbnRpZmllcjsKKyAgICAgICAgfQor CiAgICAgICAgIC8vIEltcGxlbWVudGVkIGJ5IHN1Yi1jbGFzc2VzIGlmIG5lZWRlZC4KKyAgICB9 LAorCisgICAgdXBkYXRlTGF5b3V0SWZOZWVkZWQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAg IGlmICghdGhpcy5fc2NoZWR1bGVkTGF5b3V0VXBkYXRlSWRlbnRpZmllcikKKyAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgdGhpcy51cGRhdGVMYXlvdXQoKTsKKyAgICB9LAorCisgICAgLy8g UHJvdGVjdGVkCisKKyAgICBuZWVkc0xheW91dDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAg aWYgKHRoaXMuX3NjaGVkdWxlZExheW91dFVwZGF0ZUlkZW50aWZpZXIpCisgICAgICAgICAgICBy ZXR1cm47CisKKyAgICAgICAgdGhpcy5fc2NoZWR1bGVkTGF5b3V0VXBkYXRlSWRlbnRpZmllciA9 IHJlcXVlc3RBbmltYXRpb25GcmFtZSh0aGlzLnVwZGF0ZUxheW91dC5iaW5kKHRoaXMpKTsKICAg ICB9CiB9Owo=