239872 2022-04-28 14:30:01 -0700 Web Inspector: Regression(r267038) Import a timeline does not render the timeline, only lists the events 2022-04-29 15:33:01 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 pangle pangle ews-watchlist hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1865253 0 pangle 2022-04-28 14:30:01 -0700 <rdar://91816187> 1865307 1 458560 pangle 2022-04-28 18:16:46 -0700 Created attachment 458560 Patch v1.0 1865495 2 458560 hi 2022-04-29 12:14:55 -0700 Comment on attachment 458560 Patch v1.0 View in context: https://bugs.webkit.org/attachment.cgi?id=458560&action=review r=me, nice fix =D > Source/WebInspectorUI/ChangeLog:18 > + The second issue is that when importing a timeline, we should ignore the current capturing state when setting > + the current, start, and end times, otherwise not all the values will be commited since most likely no recording > + is in progress at the same time a recording is being imported. Along these lines, i feel like we should always ignore the current capturing state. We don't want an imported recording to suddenly start showing new data because we started another recording. > Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js:127 > + this._updateTimes(startTime, endTime, endTime, {fromImport: true}); NIT: do we actually need a parameter, or can we just use `this._recording.imported` instead at each usage? 1865530 3 458606 pangle 2022-04-29 13:45:50 -0700 Created attachment 458606 Patch v1.1 1865546 4 ews-feeder 2022-04-29 14:51:30 -0700 Committed r293631 (250137@main): <https://commits.webkit.org/250137@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 458606. 458560 2022-04-28 18:16:46 -0700 2022-04-29 13:45:49 -0700 Patch v1.0 bug-239872-20220428181645.patch text/plain 5105 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzNTcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA5 MzM1NjI4YjJmOGE3OGFiYTNhNjEyN2RkNzRhNDIwYjBkY2UzNjVmLi41M2MwNjIzZjE5ZmU3Y2Y4 OGNkYmM5ZDBjYTFhYmZlMjViMDQ3M2U4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAyMi0wNC0yOCAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVncmVzc2lvbihyMjY3MDM4KSBJbXBvcnQgYSB0 aW1lbGluZSBkb2VzIG5vdCByZW5kZXIgdGhlIHRpbWVsaW5lLCBvbmx5IGxpc3RzIHRoZSBldmVu dHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzOTg3 MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFR3byBp c3N1ZXMgZXhpc3RlZCBhZnRlciByMjY3MDM4IHRoYXQgcHJldmVudGVkIHRoZSB0aW1lbGluZSBv dmVydmlldyBmcm9tIHJlbmRlcmluZyBjb3JyZWN0bHkgZm9yIGltcG9ydGVkCisgICAgICAgIHJl Y29yZGluZ3MuIFRoZSBmaXJzdCBpcyB0aGF0IHRoZSB0aW1lbGluZSB2aWV3IGl0c2VsZiB3YXMg bm90IHZpc2libGUgYXMgdGhlIHJlc3VsdCBvZiBhc3N1bWluZyB0aGF0IHdlIHdvdWxkCisgICAg ICAgIGFscmVhZHkgYmUgaW4gbWlkZGxlIG9mIGxheW91dCB3aGVuIGluc2lkZSBgV0kuVGltZWxp bmVSZWNvcmRpbmdDb250ZW50Vmlldy5wcm90b3R5cGUuX3VwZGF0ZVRpbWVzYCwgd2hpY2ggaXNu J3QKKyAgICAgICAgdHJ1ZSBmb3IgdGhlIHVwZGF0aW5nIG9mIHRpbWVzIHdoZW4gaW1wb3J0aW5n IGEgcmVjb3JkaW5nLiBJbiB0aGF0IGNhc2UsIHN5bmNyb25vdXNseSBhdHRlbXB0aW5nIHRvIGxh eSBvdXQgdGhlCisgICAgICAgIHZpZXcgbWVhbnMgdGhhdCB0aGUgbGF5b3V0LCBpbmNsdWRpbmcg aW5pdGlhbCBsYXlvdXQsIHdpbGwgYmUgcGVyZm9ybWVkIGJlZm9yZSB0aGUgdmlldyBpcyBhdHRh Y2hlZCwgd2hpY2ggbWVhbnMKKyAgICAgICAgd2UgYXJlIHVuYWJsZSB0byBnZXQgdGhlIGNsaWVu dFdpZHRoIG9mIHRoZSB2aWV3J3MgZWxlbWVudCBkdXJpbmcgbGF5b3V0LCB3aGljaCBpbiB0dXJu IHByZXZlbnRzIHVzIGZyb20KKyAgICAgICAgcGFpbnRpbmcgdGhlIHRpbWVsaW5lIHJ1bGVyLgor CisgICAgICAgIFRoZSBzZWNvbmQgaXNzdWUgaXMgdGhhdCB3aGVuIGltcG9ydGluZyBhIHRpbWVs aW5lLCB3ZSBzaG91bGQgaWdub3JlIHRoZSBjdXJyZW50IGNhcHR1cmluZyBzdGF0ZSB3aGVuIHNl dHRpbmcKKyAgICAgICAgdGhlIGN1cnJlbnQsIHN0YXJ0LCBhbmQgZW5kIHRpbWVzLCBvdGhlcndp c2Ugbm90IGFsbCB0aGUgdmFsdWVzIHdpbGwgYmUgY29tbWl0ZWQgc2luY2UgbW9zdCBsaWtlbHkg bm8gcmVjb3JkaW5nCisgICAgICAgIGlzIGluIHByb2dyZXNzIGF0IHRoZSBzYW1lIHRpbWUgYSBy ZWNvcmRpbmcgaXMgYmVpbmcgaW1wb3J0ZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5UaW1lbGlu ZVJlY29yZGluZ0NvbnRlbnRWaWV3KToKKyAgICAgICAgKFdJLlRpbWVsaW5lUmVjb3JkaW5nQ29u dGVudFZpZXcucHJvdG90eXBlLl91cGRhdGVUaW1lcyk6CisKIDIwMjItMDQtMjcgIERldmluIFJv dXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFVuY2F1 Z2h0IEV4Y2VwdGlvbjogdW5kZWZpbmVkIGlzIG5vdCBhbiBvYmplY3QgKGV2YWx1YXRpbmcgJ3Ro aXMucmVzb3VyY2UuaGFkTG9hZGluZ0Vycm9yJykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJl Y29yZGluZ0NvbnRlbnRWaWV3LmpzCmluZGV4IGQ2ZmUzZGJkNjM4NTY1NjQwMTg0ODBlOTBjMmQ0 MmMyODI2MGY2MDguLjBmOTliNTdiZTNlYjUzYzZhNmI1N2YzZmUzYWQzZGIwYTJiNjcxOWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVs aW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qcwpAQCAtMTI0 LDcgKzEyNCw3IEBAIFdJLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcgPSBjbGFzcyBUaW1l bGluZVJlY29yZGluZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuCiAKICAgICAgICAgaWYgKHRoaXMu X3JlY29yZGluZy5pbXBvcnRlZCkgewogICAgICAgICAgICAgbGV0IHtzdGFydFRpbWUsIGVuZFRp bWV9ID0gdGhpcy5fcmVjb3JkaW5nOwotICAgICAgICAgICAgdGhpcy5fdXBkYXRlVGltZXMoc3Rh cnRUaW1lLCBlbmRUaW1lLCBlbmRUaW1lKTsKKyAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVRpbWVz KHN0YXJ0VGltZSwgZW5kVGltZSwgZW5kVGltZSwge2Zyb21JbXBvcnQ6IHRydWV9KTsKICAgICAg ICAgfQogICAgIH0KIApAQCAtNDY1LDcgKzQ2NSw3IEBAIFdJLlRpbWVsaW5lUmVjb3JkaW5nQ29u dGVudFZpZXcgPSBjbGFzcyBUaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV0ku CiAgICAgICAgIHJlcXVlc3RBbmltYXRpb25GcmFtZSh0aGlzLl91cGRhdGVDYWxsYmFjayk7CiAg ICAgfQogCi0gICAgX3VwZGF0ZVRpbWVzKHN0YXJ0VGltZSwgY3VycmVudFRpbWUsIGVuZFRpbWUp CisgICAgX3VwZGF0ZVRpbWVzKHN0YXJ0VGltZSwgY3VycmVudFRpbWUsIGVuZFRpbWUsIHtmcm9t SW1wb3J0fSA9IHt9KQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX3N0YXJ0VGltZU5lZWRzUmVz ZXQgJiYgIWlzTmFOKHN0YXJ0VGltZSkpIHsKICAgICAgICAgICAgIHRoaXMuX3RpbWVsaW5lT3Zl cnZpZXcuc3RhcnRUaW1lID0gc3RhcnRUaW1lOwpAQCAtNDc2LDExICs0NzYsMTEgQEAgV0kuVGlt ZWxpbmVSZWNvcmRpbmdDb250ZW50VmlldyA9IGNsYXNzIFRpbWVsaW5lUmVjb3JkaW5nQ29udGVu dFZpZXcgZXh0ZW5kcyBXSS4KICAgICAgICAgICAgIHRoaXMuX3N0YXJ0VGltZU5lZWRzUmVzZXQg PSBmYWxzZTsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChXSS50aW1lbGluZU1hbmFnZXIuY2Fw dHVyaW5nU3RhdGUgIT09IFdJLlRpbWVsaW5lTWFuYWdlci5DYXB0dXJpbmdTdGF0ZS5TdG9wcGlu ZykgeworICAgICAgICBpZiAoV0kudGltZWxpbmVNYW5hZ2VyLmNhcHR1cmluZ1N0YXRlICE9PSBX SS5UaW1lbGluZU1hbmFnZXIuQ2FwdHVyaW5nU3RhdGUuU3RvcHBpbmcgfHwgZnJvbUltcG9ydCkg ewogICAgICAgICAgICAgLy8gT25seSB1cGRhdGUgZW5kIHRpbWUgd2hpbGUgbm90IHN0b3BwaW5n LCBvdGhlcndpc2UgdGhlIGludGVyZmFjZSBjb250aW51ZXMgc2Nyb2xsaW5nLgogICAgICAgICAg ICAgdGhpcy5fdGltZWxpbmVPdmVydmlldy5lbmRUaW1lID0gTWF0aC5tYXgoZW5kVGltZSwgY3Vy cmVudFRpbWUpOwogCi0gICAgICAgICAgICBpZiAoV0kudGltZWxpbmVNYW5hZ2VyLmNhcHR1cmlu Z1N0YXRlICE9PSBXSS5UaW1lbGluZU1hbmFnZXIuQ2FwdHVyaW5nU3RhdGUuSW5hY3RpdmUpIHsK KyAgICAgICAgICAgIGlmIChXSS50aW1lbGluZU1hbmFnZXIuY2FwdHVyaW5nU3RhdGUgIT09IFdJ LlRpbWVsaW5lTWFuYWdlci5DYXB0dXJpbmdTdGF0ZS5JbmFjdGl2ZSB8fCBmcm9tSW1wb3J0KSB7 CiAgICAgICAgICAgICAgICAgLy8gT25seSB1cGRhdGUgY3VycmVudCB0aW1lIHdoaWxlIGFjdGl2 ZS9zdGFydGluZyBvciBlbHNlIHRoZSBpbnRlcmZhY2UgY29udGludWVzIHNjcm9sbGluZy4KICAg ICAgICAgICAgICAgICB0aGlzLl9jdXJyZW50VGltZSA9IGN1cnJlbnRUaW1lOwogICAgICAgICAg ICAgICAgIHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXcuY3VycmVudFRpbWUgPSBjdXJyZW50VGltZTsK QEAgLTQ5MCwxMCArNDkwLDE0IEBAIFdJLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcgPSBj bGFzcyBUaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuCiAgICAgICAgIGlm ICh0aGlzLmN1cnJlbnRUaW1lbGluZVZpZXcpCiAgICAgICAgICAgICB0aGlzLl91cGRhdGVUaW1l bGluZVZpZXdUaW1lcyh0aGlzLmN1cnJlbnRUaW1lbGluZVZpZXcpOwogCi0gICAgICAgIC8vIEZv cmNlIGEgbGF5b3V0IG5vdyBzaW5jZSB3ZSBhcmUgYWxyZWFkeSBpbiBhbiBhbmltYXRpb24gZnJh bWUgYW5kIGRvbid0IG5lZWQgdG8gZGVsYXkgaXQgdW50aWwgdGhlIG5leHQuCi0gICAgICAgIHRo aXMuX3RpbWVsaW5lT3ZlcnZpZXcudXBkYXRlTGF5b3V0SWZOZWVkZWQoKTsKLSAgICAgICAgaWYg KHRoaXMuY3VycmVudFRpbWVsaW5lVmlldykKLSAgICAgICAgICAgIHRoaXMuY3VycmVudFRpbWVs aW5lVmlldy51cGRhdGVMYXlvdXRJZk5lZWRlZCgpOworICAgICAgICBpZiAoZnJvbUltcG9ydCkg eworICAgICAgICAgICAgdGhpcy5fdGltZWxpbmVPdmVydmlldy5uZWVkc0xheW91dCgpOworICAg ICAgICAgICAgdGhpcy5jdXJyZW50VGltZWxpbmVWaWV3Py5uZWVkc0xheW91dCgpOworICAgICAg ICB9IGVsc2UgeworICAgICAgICAgICAgLy8gRm9yY2UgYSBsYXlvdXQgbm93IHNpbmNlIHdlIGFy ZSBhbHJlYWR5IGluIGFuIGFuaW1hdGlvbiBmcmFtZSBhbmQgZG9uJ3QgbmVlZCB0byBkZWxheSBp dCB1bnRpbCB0aGUgbmV4dC4KKyAgICAgICAgICAgIHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXcudXBk YXRlTGF5b3V0SWZOZWVkZWQoKTsKKyAgICAgICAgICAgIHRoaXMuY3VycmVudFRpbWVsaW5lVmll dz8udXBkYXRlTGF5b3V0SWZOZWVkZWQoKTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIF9zdGFy dFVwZGF0aW5nQ3VycmVudFRpbWUoc3RhcnRUaW1lKQo= 458606 2022-04-29 13:45:50 -0700 2022-04-29 15:33:01 -0700 Patch v1.1 bug-239872-20220429134550.patch text/plain 4262 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzNjI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA5 MzM1NjI4YjJmOGE3OGFiYTNhNjEyN2RkNzRhNDIwYjBkY2UzNjVmLi43MzVlZThkZWQ0MGE3Mzlh Zjk2ZDlmNWQwNjczMmExNjk1OGIzY2JlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAyMi0wNC0yOSAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVncmVzc2lvbihyMjY3MDM4KSBJbXBvcnQgYSB0 aW1lbGluZSBkb2VzIG5vdCByZW5kZXIgdGhlIHRpbWVsaW5lLCBvbmx5IGxpc3RzIHRoZSBldmVu dHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzOTg3 MgorCisgICAgICAgIFJldmlld2VkIGJ5IERldmluIFJvdXNzby4KKworICAgICAgICBUd28gaXNz dWVzIGV4aXN0ZWQgYWZ0ZXIgcjI2NzAzOCB0aGF0IHByZXZlbnRlZCB0aGUgdGltZWxpbmUgb3Zl cnZpZXcgZnJvbSByZW5kZXJpbmcgY29ycmVjdGx5IGZvciBpbXBvcnRlZAorICAgICAgICByZWNv cmRpbmdzLiBUaGUgZmlyc3QgaXMgdGhhdCB0aGUgdGltZWxpbmUgdmlldyBpdHNlbGYgd2FzIG5v dCB2aXNpYmxlIGFzIHRoZSByZXN1bHQgb2YgYXNzdW1pbmcgdGhhdCB3ZSB3b3VsZAorICAgICAg ICBhbHJlYWR5IGJlIGluIG1pZGRsZSBvZiBsYXlvdXQgd2hlbiBpbnNpZGUgYFdJLlRpbWVsaW5l UmVjb3JkaW5nQ29udGVudFZpZXcucHJvdG90eXBlLl91cGRhdGVUaW1lc2AsIHdoaWNoIGlzbid0 CisgICAgICAgIHRydWUgZm9yIHRoZSB1cGRhdGluZyBvZiB0aW1lcyB3aGVuIGltcG9ydGluZyBh IHJlY29yZGluZy4gSW4gdGhhdCBjYXNlLCBzeW5jcm9ub3VzbHkgYXR0ZW1wdGluZyB0byBsYXkg b3V0IHRoZQorICAgICAgICB2aWV3IG1lYW5zIHRoYXQgdGhlIGxheW91dCwgaW5jbHVkaW5nIGlu aXRpYWwgbGF5b3V0LCB3aWxsIGJlIHBlcmZvcm1lZCBiZWZvcmUgdGhlIHZpZXcgaXMgYXR0YWNo ZWQsIHdoaWNoIG1lYW5zCisgICAgICAgIHdlIGFyZSB1bmFibGUgdG8gZ2V0IHRoZSBjbGllbnRX aWR0aCBvZiB0aGUgdmlldydzIGVsZW1lbnQgZHVyaW5nIGxheW91dCwgd2hpY2ggaW4gdHVybiBw cmV2ZW50cyB1cyBmcm9tCisgICAgICAgIHBhaW50aW5nIHRoZSB0aW1lbGluZSBydWxlci4KKwor ICAgICAgICBUaGUgc2Vjb25kIGlzc3VlIGlzIHRoYXQgd2hlbiBpbXBvcnRpbmcgYSB0aW1lbGlu ZSwgd2Ugc2hvdWxkIGlnbm9yZSB0aGUgY3VycmVudCBjYXB0dXJpbmcgc3RhdGUgd2hlbiBzZXR0 aW5nCisgICAgICAgIHRoZSBjdXJyZW50LCBzdGFydCwgYW5kIGVuZCB0aW1lcywgb3RoZXJ3aXNl IG5vdCBhbGwgdGhlIHZhbHVlcyB3aWxsIGJlIGtlcHQuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5U aW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3KToKKyAgICAgICAgKFdJLlRpbWVsaW5lUmVjb3Jk aW5nQ29udGVudFZpZXcucHJvdG90eXBlLl91cGRhdGVUaW1lcyk6CisKIDIwMjItMDQtMjcgIERl dmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IFVuY2F1Z2h0IEV4Y2VwdGlvbjogdW5kZWZpbmVkIGlzIG5vdCBhbiBvYmplY3QgKGV2YWx1YXRp bmcgJ3RoaXMucmVzb3VyY2UuaGFkTG9hZGluZ0Vycm9yJykKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVu dFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1l bGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzCmluZGV4IGQ2ZmUzZGJkNjM4NTY1NjQwMTg0ODBl OTBjMmQ0MmMyODI2MGY2MDguLjllYzQ3NzU4OTEzNWNiOWM1YzA5ZWE5MGRlZWYwZDBmNzI3NWNm NzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qcwpA QCAtNDc2LDExICs0NzYsMTEgQEAgV0kuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50VmlldyA9IGNs YXNzIFRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcgZXh0ZW5kcyBXSS4KICAgICAgICAgICAg IHRoaXMuX3N0YXJ0VGltZU5lZWRzUmVzZXQgPSBmYWxzZTsKICAgICAgICAgfQogCi0gICAgICAg IGlmIChXSS50aW1lbGluZU1hbmFnZXIuY2FwdHVyaW5nU3RhdGUgIT09IFdJLlRpbWVsaW5lTWFu YWdlci5DYXB0dXJpbmdTdGF0ZS5TdG9wcGluZykgeworICAgICAgICBpZiAoV0kudGltZWxpbmVN YW5hZ2VyLmNhcHR1cmluZ1N0YXRlICE9PSBXSS5UaW1lbGluZU1hbmFnZXIuQ2FwdHVyaW5nU3Rh dGUuU3RvcHBpbmcgfHwgdGhpcy5fcmVjb3JkaW5nLmltcG9ydGVkKSB7CiAgICAgICAgICAgICAv LyBPbmx5IHVwZGF0ZSBlbmQgdGltZSB3aGlsZSBub3Qgc3RvcHBpbmcsIG90aGVyd2lzZSB0aGUg aW50ZXJmYWNlIGNvbnRpbnVlcyBzY3JvbGxpbmcuCiAgICAgICAgICAgICB0aGlzLl90aW1lbGlu ZU92ZXJ2aWV3LmVuZFRpbWUgPSBNYXRoLm1heChlbmRUaW1lLCBjdXJyZW50VGltZSk7CiAKLSAg ICAgICAgICAgIGlmIChXSS50aW1lbGluZU1hbmFnZXIuY2FwdHVyaW5nU3RhdGUgIT09IFdJLlRp bWVsaW5lTWFuYWdlci5DYXB0dXJpbmdTdGF0ZS5JbmFjdGl2ZSkgeworICAgICAgICAgICAgaWYg KFdJLnRpbWVsaW5lTWFuYWdlci5jYXB0dXJpbmdTdGF0ZSAhPT0gV0kuVGltZWxpbmVNYW5hZ2Vy LkNhcHR1cmluZ1N0YXRlLkluYWN0aXZlIHx8IHRoaXMuX3JlY29yZGluZy5pbXBvcnRlZCkgewog ICAgICAgICAgICAgICAgIC8vIE9ubHkgdXBkYXRlIGN1cnJlbnQgdGltZSB3aGlsZSBhY3RpdmUv c3RhcnRpbmcgb3IgZWxzZSB0aGUgaW50ZXJmYWNlIGNvbnRpbnVlcyBzY3JvbGxpbmcuCiAgICAg ICAgICAgICAgICAgdGhpcy5fY3VycmVudFRpbWUgPSBjdXJyZW50VGltZTsKICAgICAgICAgICAg ICAgICB0aGlzLl90aW1lbGluZU92ZXJ2aWV3LmN1cnJlbnRUaW1lID0gY3VycmVudFRpbWU7CkBA IC00OTAsMTAgKzQ5MCwxNCBAQCBXSS5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3ID0gY2xh c3MgVGltZWxpbmVSZWNvcmRpbmdDb250ZW50VmlldyBleHRlbmRzIFdJLgogICAgICAgICBpZiAo dGhpcy5jdXJyZW50VGltZWxpbmVWaWV3KQogICAgICAgICAgICAgdGhpcy5fdXBkYXRlVGltZWxp bmVWaWV3VGltZXModGhpcy5jdXJyZW50VGltZWxpbmVWaWV3KTsKIAotICAgICAgICAvLyBGb3Jj ZSBhIGxheW91dCBub3cgc2luY2Ugd2UgYXJlIGFscmVhZHkgaW4gYW4gYW5pbWF0aW9uIGZyYW1l IGFuZCBkb24ndCBuZWVkIHRvIGRlbGF5IGl0IHVudGlsIHRoZSBuZXh0LgotICAgICAgICB0aGlz Ll90aW1lbGluZU92ZXJ2aWV3LnVwZGF0ZUxheW91dElmTmVlZGVkKCk7Ci0gICAgICAgIGlmICh0 aGlzLmN1cnJlbnRUaW1lbGluZVZpZXcpCi0gICAgICAgICAgICB0aGlzLmN1cnJlbnRUaW1lbGlu ZVZpZXcudXBkYXRlTGF5b3V0SWZOZWVkZWQoKTsKKyAgICAgICAgaWYgKHRoaXMuX3JlY29yZGlu Zy5pbXBvcnRlZCkgeworICAgICAgICAgICAgdGhpcy5fdGltZWxpbmVPdmVydmlldy5uZWVkc0xh eW91dCgpOworICAgICAgICAgICAgdGhpcy5jdXJyZW50VGltZWxpbmVWaWV3Py5uZWVkc0xheW91 dCgpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgLy8gRm9yY2UgYSBsYXlvdXQgbm93 IHNpbmNlIHdlIGFyZSBhbHJlYWR5IGluIGFuIGFuaW1hdGlvbiBmcmFtZSBhbmQgZG9uJ3QgbmVl ZCB0byBkZWxheSBpdCB1bnRpbCB0aGUgbmV4dC4KKyAgICAgICAgICAgIHRoaXMuX3RpbWVsaW5l T3ZlcnZpZXcudXBkYXRlTGF5b3V0SWZOZWVkZWQoKTsKKyAgICAgICAgICAgIHRoaXMuY3VycmVu dFRpbWVsaW5lVmlldz8udXBkYXRlTGF5b3V0SWZOZWVkZWQoKTsKKyAgICAgICAgfQogICAgIH0K IAogICAgIF9zdGFydFVwZGF0aW5nQ3VycmVudFRpbWUoc3RhcnRUaW1lKQo=