222872 2021-03-06 15:02:57 -0800 [perf dashboard] Modernize TimeSeries and TimeSeriesView 2021-03-07 13:04:58 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa dewei_zhu saam webkit-bug-importer ysuzuki zhifei_fang oldest_to_newest 1736849 0 rniwa 2021-03-06 15:02:57 -0800 Use more modern JS syntax and features in TimeSeries and TimeSeriesView. 1736850 1 422509 rniwa 2021-03-06 15:13:38 -0800 Created attachment 422509 Patch 1736873 2 dewei_zhu 2021-03-06 18:13:30 -0800 r=me 1736879 3 422509 rniwa 2021-03-06 18:28:32 -0800 Comment on attachment 422509 Patch Clearing flags on attachment: 422509 Committed r274047 (234983@main): <https://commits.webkit.org/234983@main> 1736880 4 rniwa 2021-03-06 18:28:34 -0800 All reviewed patches have been landed. Closing bug. 1736881 5 webkit-bug-importer 2021-03-06 18:29:14 -0800 <rdar://problem/75138837> 422509 2021-03-06 15:13:38 -0800 2021-03-07 13:04:58 -0800 Patch bug-222872-20210306151337.patch text/plain 9965 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDMxCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCA5ZmJmM2VjMWM5ODAyZTY3MGRmNTFkMGY0MzQ5YjhkMTUxMTM2MzZjLi45ZDlkYTAzMDc4 NzI5MzgzNTY4NmViYjViZjJkYTRlYTBiMjAyZTU5IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSw0NCBAQAorMjAyMS0wMy0wNiAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KKworICAgICAgICBbcGVyZiBkYXNoYm9hcmRdIE1vZGVybml6ZSBUaW1lU2Vy aWVzIGFuZCBUaW1lU2VyaWVzVmlldworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjIyODcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgRGVjbGFyZSBpbnN0YW5jZSBmaWVsZHMgaW4gY2xhc3MgZGVjbGFyYXRp b25zLCB1c2UgY29uc3QvbGV0IGluc3RlYWQgb2YgdmFyLCBhbmQgdXNlIGdlbmVyYXRvcnMKKyAg ICAgICAgZm9yIGZvcndhcmQgYW5kIGJhY2t3YXJkIGl0ZXJhdGlvbnMgaW5zdGVhZCBvZiBtYW51 YWxseSBpbXBsZW1lbnRpbmcgdGhlIGl0ZXJhdG9yIHByb3RvY29sLgorCisgICAgICAgIFRoaXMg cGF0Y2ggYWxzbyBzcGxpdHMgRmlsdGVyZWRUaW1lU2VyaWVzVmlldyBvdXQgb2YgVGltZVNlcmll c1ZpZXcuCisKKyAgICAgICAgKiBwdWJsaWMvdjMvbW9kZWxzL3RpbWUtc2VyaWVzLmpzOgorICAg ICAgICAoVGltZVNlcmllcyk6IE1vdmVkIHRoZSBkZWNsYXJhdGlvbiBvZiBfZGF0YSBpbnN0YW5j ZSBmaWVsZCB0byB0aGUgY2xhc3MgZGVjbGFyYXRpb24uCisgICAgICAgIChUaW1lU2VyaWVzLnBy b3RvdHlwZS5jb25zdHJ1Y3Rvcik6IERlbGV0ZWQuCisgICAgICAgIChUaW1lU2VyaWVzLnByb3Rv dHlwZS5leHRlbmRUb0Z1dHVyZSk6CisgICAgICAgIChUaW1lU2VyaWVzLnByb3RvdHlwZS52YWx1 ZXNCZXR3ZWVuUmFuZ2UpOgorICAgICAgICAoVGltZVNlcmllcy5wcm90b3R5cGUuZmluZEJ5SWQp OgorICAgICAgICAoVGltZVNlcmllcy5wcm90b3R5cGUuZmluZFBvaW50QWZ0ZXJUaW1lKToKKyAg ICAgICAgKFRpbWVTZXJpZXNWaWV3KTogRGVjbGFyZWQgdGhlIGluc3RhbmNlIGZpZWxkcyBpbiB0 aGUgY2xhc3MgZGVjbGFyYXRpb24uCisgICAgICAgIChUaW1lU2VyaWVzVmlldy5wcm90b3R5cGUu Y29uc3RydWN0b3IpOiBSZW1vdmVkIGZpbHRlcmVkRGF0YSBmcm9tIHRoZSBhcmd1bWVudCBzaW5j ZSBpdCdzIHNwbGl0CisgICAgICAgIG91dCB0byBGaWx0ZXJlZFRpbWVTZXJpZXNWaWV3IG5vdy4K KyAgICAgICAgKFRpbWVTZXJpZXNWaWV3LnByb3RvdHlwZS5nZXQgX2RhdGEpOiBBZGRlZC4gQW4g YWJzdHJhY3Rpb24gbmVlZGVkIGZvciBGaWx0ZXJlZFRpbWVTZXJpZXNWaWV3LgorICAgICAgICAo VGltZVNlcmllc1ZpZXcucHJvdG90eXBlLl9maW5kSW5kZXhGb3JQb2ludCk6IERpdHRvLiBNb3Zl ZCBvdXQgb2YgdGhlIGNvbnN0cnVjdG9yLgorICAgICAgICAoVGltZVNlcmllc1ZpZXcucHJvdG90 eXBlLmZpbHRlcik6IFJldHVybiBhIEZpbHRlcmVkVGltZVNlcmllc1ZpZXcuCisgICAgICAgIChU aW1lU2VyaWVzVmlldy5wcm90b3R5cGUudmlld1RpbWVSYW5nZSk6IFVzZSBfc3ViUmFuZ2UgdG8g cmV0dXJuIGVpdGhlciBUaW1lU2VyaWVzVmlldyBvcgorICAgICAgICBGaWx0ZXJlZFRpbWVTZXJp ZXNWaWV3IHdoaWNoIGV2ZXIgaXMgbmVlZGVkLgorICAgICAgICAoVGltZVNlcmllc1ZpZXcucHJv dG90eXBlLl9zdWJSYW5nZSk6IEFuIGFic3RyYWN0aW9uIG5lZWRlZCBmb3IgRmlsdGVyZWRUaW1l U2VyaWVzVmlldy4KKyAgICAgICAgKFRpbWVTZXJpZXNWaWV3LnByb3RvdHlwZS5TeW1ib2wuaXRl cmF0b3IpOiBNYWRlIHRoaXMgYSBnZW5lcmF0b3IgaW5zdGVhZCBvZiBpbXBsZW1lbnRpbmcKKyAg ICAgICAgdGhlIGl0ZXJhdG9yIHByb3RvY29sIGRpcmVjdGx5LgorICAgICAgICAoVGltZVNlcmll c1ZpZXcucHJvdG90eXBlLl9yZXZlcnNlKTogRGl0dG8uCisgICAgICAgIChGaWx0ZXJlZFRpbWVT ZXJpZXNWaWV3KTogQWRkZWQuCisgICAgICAgIChGaWx0ZXJlZFRpbWVTZXJpZXNWaWV3LnByb3Rv dHlwZS5jb25zdHJ1Y3Rvcik6IEFkZGVkLiBBc3NlcnQgdGhhdCBhZnRlckVuZGluZ0luZGV4IGlz IGxlc3MgdGhhbgorICAgICAgICB0aGUgbGVuZ3RoIG9mIHRoZSBmaWx0ZXJlZCBkYXRhLiBUaGlz IGFzc2VydGlvbiB3YXMgbWlzc2luZyBpbiBUaW1lU2VyaWVzIHByaW9yIHRvIHRoaXMgcGF0Y2gK KyAgICAgICAgd2hlbiBmaWx0ZXJlZERhdGEgaXMgc3BlY2lmaWVkLgorICAgICAgICAoRmlsdGVy ZWRUaW1lU2VyaWVzVmlldy5wcm90b3R5cGUuZ2V0IF9kYXRhKTogQWRkZWQuCisgICAgICAgIChG aWx0ZXJlZFRpbWVTZXJpZXNWaWV3LnByb3RvdHlwZS5fc3ViUmFuZ2UpOiBBZGRlZC4gSW5zdGFu dGlhdGUgRmlsdGVyZWRUaW1lU2VyaWVzVmlldyB3aXRoCisgICAgICAgIHRoZSBzYW1lIGZpbHRl cmVkIGRhdGEuCisgICAgICAgIChGaWx0ZXJlZFRpbWVTZXJpZXNWaWV3LnByb3RvdHlwZS5fZmlu ZEluZGV4Rm9yUG9pbnQpOiBNb3ZlZCBmcm9tIFRpbWVTZXJpZXNWaWV3J3MgY29uc3RydWN0b3Iu CisgICAgICAgIChGaWx0ZXJlZFRpbWVTZXJpZXNWaWV3LnByb3RvdHlwZS5fYnVpbGRQb2ludElu ZGV4TWFwKTogTW92ZWQgZnJvbSBUaW1lU2VyaWVzVmlldy4KKwogMjAyMS0wMy0wNiAgUnlvc3Vr ZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBbcGVyZiBkYXNoYm9hcmRdIE1v ZGVybml6ZSBEYXRhTW9kZWxPYmplY3QgYW5kIExhYmVsZWRPYmplY3QKZGlmZiAtLWdpdCBhL1dl YnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvbW9kZWxzL3RpbWUtc2VyaWVzLmpzIGIv V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9tb2RlbHMvdGltZS1zZXJpZXMuanMK aW5kZXggOTM4ODlhNmMzYWZmNzJiNTQyZTYzOWI1NmI0YzZkNjE0NmM2OWQ2Zi4uZDNlMjQ2OTkw MTNiNmQxNzg4ZjdhNzE1MTEzOGRkMmQxMDcyNTY4ZCAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVy Zi53ZWJraXQub3JnL3B1YmxpYy92My9tb2RlbHMvdGltZS1zZXJpZXMuanMKKysrIGIvV2Vic2l0 ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9tb2RlbHMvdGltZS1zZXJpZXMuanMKQEAgLTEs MTAgKzEsNyBAQAogJ3VzZSBzdHJpY3QnOwogCiBjbGFzcyBUaW1lU2VyaWVzIHsKLSAgICBjb25z dHJ1Y3RvcigpCi0gICAgewotICAgICAgICB0aGlzLl9kYXRhID0gW107Ci0gICAgfQorICAgIF9k YXRhID0gW107CiAKICAgICB2YWx1ZXMoKSB7IHJldHVybiB0aGlzLl9kYXRhLm1hcCgocG9pbnQp ID0+IHBvaW50LnZhbHVlKTsgfQogICAgIGxlbmd0aCgpIHsgcmV0dXJuIHRoaXMuX2RhdGEubGVu Z3RoOyB9CkBAIC0yMSw3ICsxOCw3IEBAIGNsYXNzIFRpbWVTZXJpZXMgewogICAgIHsKICAgICAg ICAgaWYgKCF0aGlzLl9kYXRhLmxlbmd0aCkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAg dmFyIGxhc3RQb2ludCA9IHRoaXMuX2RhdGFbdGhpcy5fZGF0YS5sZW5ndGggLSAxXTsKKyAgICAg ICAgY29uc3QgbGFzdFBvaW50ID0gdGhpcy5fZGF0YVt0aGlzLl9kYXRhLmxlbmd0aCAtIDFdOwog ICAgICAgICB0aGlzLl9kYXRhLnB1c2goewogICAgICAgICAgICAgc2VyaWVzOiB0aGlzLAogICAg ICAgICAgICAgc2VyaWVzSW5kZXg6IHRoaXMuX2RhdGEubGVuZ3RoLApAQCAtMzUsOSArMzIsOSBA QCBjbGFzcyBUaW1lU2VyaWVzIHsKICAgICB7CiAgICAgICAgIHN0YXJ0aW5nSW5kZXggPSBNYXRo Lm1heChzdGFydGluZ0luZGV4LCAwKTsKICAgICAgICAgZW5kaW5nSW5kZXggPSBNYXRoLm1pbihl bmRpbmdJbmRleCwgdGhpcy5fZGF0YS5sZW5ndGgpOwotICAgICAgICB2YXIgbGVuZ3RoID0gZW5k aW5nSW5kZXggLSBzdGFydGluZ0luZGV4OwotICAgICAgICB2YXIgdmFsdWVzID0gbmV3IEFycmF5 KGxlbmd0aCk7Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbGVuZ3RoOyBpKyspCisgICAg ICAgIGNvbnN0IGxlbmd0aCA9IGVuZGluZ0luZGV4IC0gc3RhcnRpbmdJbmRleDsKKyAgICAgICAg Y29uc3QgdmFsdWVzID0gbmV3IEFycmF5KGxlbmd0aCk7CisgICAgICAgIGZvciAobGV0IGkgPSAw OyBpIDwgbGVuZ3RoOyArK2kpCiAgICAgICAgICAgICB2YWx1ZXNbaV0gPSB0aGlzLl9kYXRhW3N0 YXJ0aW5nSW5kZXggKyBpXS52YWx1ZTsKICAgICAgICAgcmV0dXJuIHZhbHVlczsKICAgICB9CkBA IC02OCw5ICs2NSw5IEBAIGNsYXNzIFRpbWVTZXJpZXMgewogICAgICAgICByZXR1cm4gdGhpcy5f ZGF0YVtpbmRleF07CiAgICAgfQogCi0gICAgZmluZEJ5SWQoaWQpIHsgcmV0dXJuIHRoaXMuX2Rh dGEuZmluZChmdW5jdGlvbiAocG9pbnQpIHsgcmV0dXJuIHBvaW50LmlkID09IGlkIH0pOyB9Cisg ICAgZmluZEJ5SWQoaWQpIHsgcmV0dXJuIHRoaXMuX2RhdGEuZmluZCgocG9pbnQpID0+IHBvaW50 LmlkID09IGlkKTsgfQogCi0gICAgZmluZFBvaW50QWZ0ZXJUaW1lKHRpbWUpIHsgcmV0dXJuIHRo aXMuX2RhdGEuZmluZChmdW5jdGlvbiAocG9pbnQpIHsgcmV0dXJuIHBvaW50LnRpbWUgPj0gdGlt ZTsgfSk7IH0KKyAgICBmaW5kUG9pbnRBZnRlclRpbWUodGltZSkgeyByZXR1cm4gdGhpcy5fZGF0 YS5maW5kKChwb2ludCkgPT4gcG9pbnQudGltZSA+PSB0aW1lKTsgfQogICAgIHZpZXdCZXR3ZWVu VGltZShzdGFydFRpbWUsIGVuZFRpbWUpCiAgICAgewogICAgICAgICBjb25zdCBzdGFydFBvaW50 ID0gdGhpcy5maW5kUG9pbnRBZnRlclRpbWUoc3RhcnRUaW1lKTsKQEAgLTk0LDQzICs5MSwzNSBA QCBjbGFzcyBUaW1lU2VyaWVzIHsKIH07CiAKIGNsYXNzIFRpbWVTZXJpZXNWaWV3IHsKLSAgICBj b25zdHJ1Y3Rvcih0aW1lU2VyaWVzLCBzdGFydGluZ0luZGV4LCBhZnRlckVuZGluZ0luZGV4LCBm aWx0ZXJlZERhdGEgPSBudWxsKQorICAgIF90aW1lU2VyaWVzOworICAgIF92YWx1ZXMgPSBudWxs OworICAgIF9sZW5ndGg7CisgICAgX3N0YXJ0aW5nSW5kZXg7CisgICAgX2FmdGVyRW5kaW5nSW5k ZXg7CisKKyAgICBjb25zdHJ1Y3Rvcih0aW1lU2VyaWVzLCBzdGFydGluZ0luZGV4LCBhZnRlckVu ZGluZ0luZGV4KQogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQodGltZVNlcmllcyBpbnN0 YW5jZW9mIFRpbWVTZXJpZXMpOwogICAgICAgICBjb25zb2xlLmFzc2VydChzdGFydGluZ0luZGV4 IDw9IGFmdGVyRW5kaW5nSW5kZXgpOwogICAgICAgICBjb25zb2xlLmFzc2VydChhZnRlckVuZGlu Z0luZGV4IDw9IHRpbWVTZXJpZXMuX2RhdGEubGVuZ3RoKTsKICAgICAgICAgdGhpcy5fdGltZVNl cmllcyA9IHRpbWVTZXJpZXM7Ci0gICAgICAgIHRoaXMuX2RhdGEgPSBmaWx0ZXJlZERhdGEgfHwg dGltZVNlcmllcy5fZGF0YTsKLSAgICAgICAgdGhpcy5fdmFsdWVzID0gbnVsbDsKICAgICAgICAg dGhpcy5fbGVuZ3RoID0gYWZ0ZXJFbmRpbmdJbmRleCAtIHN0YXJ0aW5nSW5kZXg7CiAgICAgICAg IHRoaXMuX3N0YXJ0aW5nSW5kZXggPSBzdGFydGluZ0luZGV4OwogICAgICAgICB0aGlzLl9hZnRl ckVuZGluZ0luZGV4ID0gYWZ0ZXJFbmRpbmdJbmRleDsKLSAgICAgICAgdGhpcy5fcG9pbnRJbmRl eE1hcCA9IG51bGw7Ci0KLSAgICAgICAgaWYgKHRoaXMuX2RhdGEgIT0gdGltZVNlcmllcy5fZGF0 YSkgewotICAgICAgICAgICAgdGhpcy5fZmluZEluZGV4Rm9yUG9pbnQgPSAocG9pbnQpID0+IHsK LSAgICAgICAgICAgICAgICBpZiAodGhpcy5fcG9pbnRJbmRleE1hcCA9PSBudWxsKQotICAgICAg ICAgICAgICAgICAgICB0aGlzLl9idWlsZFBvaW50SW5kZXhNYXAoKTsKLSAgICAgICAgICAgICAg ICByZXR1cm4gdGhpcy5fcG9pbnRJbmRleE1hcC5nZXQocG9pbnQpOwotICAgICAgICAgICAgfQot ICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIHRoaXMuX2ZpbmRJbmRleEZvclBvaW50ID0gKHBv aW50KSA9PiB7IHJldHVybiBwb2ludC5zZXJpZXNJbmRleDsgfQogICAgIH0KIAotICAgIF9idWls ZFBvaW50SW5kZXhNYXAoKQotICAgIHsKLSAgICAgICAgdGhpcy5fcG9pbnRJbmRleE1hcCA9IG5l dyBNYXA7Ci0gICAgICAgIGNvbnN0IGRhdGEgPSB0aGlzLl9kYXRhOwotICAgICAgICBjb25zdCBs ZW5ndGggPSBkYXRhLmxlbmd0aDsKLSAgICAgICAgZm9yIChsZXQgaSA9IDA7IGkgPCBsZW5ndGg7 IGkrKykKLSAgICAgICAgICAgIHRoaXMuX3BvaW50SW5kZXhNYXAuc2V0KGRhdGFbaV0sIGkpOwot ICAgIH0KKyAgICBnZXQgX2RhdGEoKSB7IHJldHVybiB0aGlzLl90aW1lU2VyaWVzLl9kYXRhOyB9 CiAKICAgICBsZW5ndGgoKSB7IHJldHVybiB0aGlzLl9sZW5ndGg7IH0KIAogICAgIGZpcnN0UG9p bnQoKSB7IHJldHVybiB0aGlzLl9sZW5ndGggPyB0aGlzLl9kYXRhW3RoaXMuX3N0YXJ0aW5nSW5k ZXhdIDogbnVsbDsgfQogICAgIGxhc3RQb2ludCgpIHsgcmV0dXJuIHRoaXMuX2xlbmd0aCA/IHRo aXMuX2RhdGFbdGhpcy5fYWZ0ZXJFbmRpbmdJbmRleCAtIDFdIDogbnVsbDsgfQogCisgICAgX2Zp bmRJbmRleEZvclBvaW50KHBvaW50KQorICAgIHsKKyAgICAgICAgcmV0dXJuIHBvaW50LnNlcmll c0luZGV4OworICAgIH0KKwogICAgIG5leHRQb2ludChwb2ludCkKICAgICB7CiAgICAgICAgIGxl dCBpbmRleCA9IHRoaXMuX2ZpbmRJbmRleEZvclBvaW50KHBvaW50KTsKQEAgLTE4NSw3ICsxNzQs NyBAQCBjbGFzcyBUaW1lU2VyaWVzVmlldyB7CiAgICAgICAgICAgICAgICAgZmlsdGVyZWREYXRh LnB1c2gocG9pbnQpOwogICAgICAgICAgICAgaSsrOwogICAgICAgICB9Ci0gICAgICAgIHJldHVy biBuZXcgVGltZVNlcmllc1ZpZXcodGhpcy5fdGltZVNlcmllcywgMCwgZmlsdGVyZWREYXRhLmxl bmd0aCwgZmlsdGVyZWREYXRhKTsKKyAgICAgICAgcmV0dXJuIG5ldyBGaWx0ZXJlZFRpbWVTZXJp ZXNWaWV3KHRoaXMuX3RpbWVTZXJpZXMsIDAsIGZpbHRlcmVkRGF0YS5sZW5ndGgsIGZpbHRlcmVk RGF0YSk7CiAgICAgfQogCiAgICAgdmlld1RpbWVSYW5nZShzdGFydFRpbWUsIGVuZFRpbWUpCkBA IC0yMDAsOCArMTg5LDEzIEBAIGNsYXNzIFRpbWVTZXJpZXNWaWV3IHsKICAgICAgICAgICAgICAg ICBlbmRpbmdJbmRleCA9IGk7CiAgICAgICAgIH0KICAgICAgICAgaWYgKHN0YXJ0aW5nSW5kZXgg PT0gbnVsbCB8fCBlbmRpbmdJbmRleCA9PSBudWxsKQotICAgICAgICAgICAgcmV0dXJuIG5ldyBU aW1lU2VyaWVzVmlldyh0aGlzLl90aW1lU2VyaWVzLCAwLCAwLCBkYXRhKTsKLSAgICAgICAgcmV0 dXJuIG5ldyBUaW1lU2VyaWVzVmlldyh0aGlzLl90aW1lU2VyaWVzLCBzdGFydGluZ0luZGV4LCBl bmRpbmdJbmRleCArIDEsIGRhdGEpOworICAgICAgICAgICAgcmV0dXJuIHRoaXMuX3N1YlJhbmdl KDAsIDApOworICAgICAgICByZXR1cm4gdGhpcy5fc3ViUmFuZ2Uoc3RhcnRpbmdJbmRleCwgZW5k aW5nSW5kZXggKyAxKTsKKyAgICB9CisKKyAgICBfc3ViUmFuZ2Uoc3RhcnRpbmdJbmRleCwgYWZ0 ZXJFbmRpbmdJbmRleCkKKyAgICB7CisgICAgICAgIHJldHVybiBuZXcgVGltZVNlcmllc1ZpZXco dGhpcy5fdGltZVNlcmllcywgc3RhcnRpbmdJbmRleCwgYWZ0ZXJFbmRpbmdJbmRleCk7CiAgICAg fQogCiAgICAgZmlyc3RQb2ludEluVGltZVJhbmdlKHN0YXJ0VGltZSwgZW5kVGltZSkKQEAgLTIy OCwzMiArMjIyLDU2IEBAIGNsYXNzIFRpbWVTZXJpZXNWaWV3IHsKICAgICAgICAgcmV0dXJuIG51 bGw7CiAgICAgfQogCi0gICAgW1N5bWJvbC5pdGVyYXRvcl0oKQorICAgICpbU3ltYm9sLml0ZXJh dG9yXSgpCiAgICAgewogICAgICAgICBjb25zdCBkYXRhID0gdGhpcy5fZGF0YTsKLSAgICAgICAg Y29uc3QgZW5kID0gdGhpcy5fYWZ0ZXJFbmRpbmdJbmRleDsKKyAgICAgICAgY29uc3QgYWZ0ZXJF bmQgPSB0aGlzLl9hZnRlckVuZGluZ0luZGV4OwogICAgICAgICBsZXQgaSA9IHRoaXMuX3N0YXJ0 aW5nSW5kZXg7Ci0gICAgICAgIHJldHVybiB7Ci0gICAgICAgICAgICBuZXh0KCkgewotICAgICAg ICAgICAgICAgIHJldHVybiB7dmFsdWU6IGRhdGFbaV0sIGRvbmU6IGkrKyA9PSBlbmR9OwotICAg ICAgICAgICAgfQotICAgICAgICB9OworICAgICAgICBmb3IgKGxldCBpID0gdGhpcy5fc3RhcnRp bmdJbmRleDsgaSA8IGFmdGVyRW5kOyArK2kpCisgICAgICAgICAgICB5aWVsZCBkYXRhW2ldOwog ICAgIH0KIAotICAgIF9yZXZlcnNlKCkKKyAgICAqX3JldmVyc2UoKQogICAgIHsKLSAgICAgICAg cmV0dXJuIHsKLSAgICAgICAgICAgIFtTeW1ib2wuaXRlcmF0b3JdOiAoKSA9PiB7Ci0gICAgICAg ICAgICAgICAgY29uc3QgZGF0YSA9IHRoaXMuX2RhdGE7Ci0gICAgICAgICAgICAgICAgY29uc3Qg ZW5kID0gdGhpcy5fc3RhcnRpbmdJbmRleDsKLSAgICAgICAgICAgICAgICBsZXQgaSA9IHRoaXMu X2FmdGVyRW5kaW5nSW5kZXg7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHsKLSAgICAgICAgICAg ICAgICAgICAgbmV4dCgpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiB7ZG9uZTog aS0tID09IGVuZCwgdmFsdWU6IGRhdGFbaV19OwotICAgICAgICAgICAgICAgICAgICB9Ci0gICAg ICAgICAgICAgICAgfTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQorICAgICAgICBjb25zdCBk YXRhID0gdGhpcy5fZGF0YTsKKyAgICAgICAgY29uc3QgYmVnaW5uaW5nID0gdGhpcy5fc3RhcnRp bmdJbmRleDsKKyAgICAgICAgZm9yIChsZXQgaSA9IHRoaXMuX2FmdGVyRW5kaW5nSW5kZXggLSAx OyBpID49IGJlZ2lubmluZzsgLS1pKQorICAgICAgICAgICAgeWllbGQgZGF0YVtpXTsKKyAgICB9 Cit9CisKK2NsYXNzIEZpbHRlcmVkVGltZVNlcmllc1ZpZXcgZXh0ZW5kcyBUaW1lU2VyaWVzVmll dyB7CisgICAgX2ZpbHRlcmVkRGF0YTsKKyAgICBfcG9pbnRJbmRleE1hcDsKKworICAgIGNvbnN0 cnVjdG9yKHRpbWVTZXJpZXMsIHN0YXJ0aW5nSW5kZXgsIGFmdGVyRW5kaW5nSW5kZXgsIGZpbHRl cmVkRGF0YSkKKyAgICB7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGFmdGVyRW5kaW5nSW5kZXgg PD0gZmlsdGVyZWREYXRhLmxlbmd0aCk7CisgICAgICAgIHN1cGVyKHRpbWVTZXJpZXMsIHN0YXJ0 aW5nSW5kZXgsIGFmdGVyRW5kaW5nSW5kZXgpOworICAgICAgICB0aGlzLl9maWx0ZXJlZERhdGEg PSBmaWx0ZXJlZERhdGE7CisgICAgfQorCisgICAgZ2V0IF9kYXRhKCkgeyByZXR1cm4gdGhpcy5f ZmlsdGVyZWREYXRhOyB9CisKKyAgICBfc3ViUmFuZ2Uoc3RhcnRpbmdJbmRleCwgYWZ0ZXJFbmRp bmdJbmRleCkKKyAgICB7CisgICAgICAgIHJldHVybiBuZXcgRmlsdGVyZWRUaW1lU2VyaWVzVmll dyh0aGlzLl90aW1lU2VyaWVzLCBzdGFydGluZ0luZGV4LCBhZnRlckVuZGluZ0luZGV4LCB0aGlz Ll9maWx0ZXJlZERhdGEpOworICAgIH0KKworICAgIF9maW5kSW5kZXhGb3JQb2ludChwb2ludCkK KyAgICB7CisgICAgICAgIGlmICghdGhpcy5fcG9pbnRJbmRleE1hcCkKKyAgICAgICAgICAgIHRo aXMuX2J1aWxkUG9pbnRJbmRleE1hcCgpOworICAgICAgICByZXR1cm4gdGhpcy5fcG9pbnRJbmRl eE1hcC5nZXQocG9pbnQpOworICAgIH0KKworICAgIF9idWlsZFBvaW50SW5kZXhNYXAoKQorICAg IHsKKyAgICAgICAgdGhpcy5fcG9pbnRJbmRleE1hcCA9IG5ldyBNYXA7CisgICAgICAgIGNvbnN0 IGRhdGEgPSB0aGlzLl9kYXRhOworICAgICAgICBjb25zdCBsZW5ndGggPSBkYXRhLmxlbmd0aDsK KyAgICAgICAgZm9yIChsZXQgaSA9IDA7IGkgPCBsZW5ndGg7IGkrKykKKyAgICAgICAgICAgIHRo aXMuX3BvaW50SW5kZXhNYXAuc2V0KGRhdGFbaV0sIGkpOwogICAgIH0KIH0KIAo=