203611 2019-10-30 08:07:12 -0700 [Web Animations] Precompute an animation effect's active duration and end time 2019-10-30 11:30:10 -0700 1 1 1 Unclassified WebKit Animations WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 graouts graouts dino webkit-bug-importer oldest_to_newest 1585353 0 graouts 2019-10-30 08:07:12 -0700 [Web Animations] Precompute an animation effect's active duration and end time 1585355 1 382312 graouts 2019-10-30 08:11:00 -0700 Created attachment 382312 Patch 1585356 2 webkit-bug-importer 2019-10-30 08:12:32 -0700 <rdar://problem/56744205> 1585393 3 382312 dino 2019-10-30 10:16:45 -0700 Comment on attachment 382312 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=382312&action=review > Source/WebCore/ChangeLog:11 > + longer require the dynamic computation of all the other timing properties in AnimatioEffect::getBasicTiming(), Typo Animatio 1585439 4 graouts 2019-10-30 11:30:10 -0700 Committed r251785: <https://trac.webkit.org/changeset/251785> 382312 2019-10-30 08:11:00 -0700 2019-10-30 10:16:45 -0700 Patch bug-203611-20191030161058.patch text/plain 14269 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxNzA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTk2ZWQxMGM0YTJlNDNh N2FhNGM1ODU0YjIyYTUzOTU2YWEyNGMyNC4uMzMwOGY3YzdhMmI0YWM3ZDk0NTZiMWUyNmJlMGIx MzVkYzc2MzFhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDE5LTEwLTMwICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYiBBbmltYXRpb25z XSBQcmVjb21wdXRlIGFuIGFuaW1hdGlvbiBlZmZlY3QncyBhY3RpdmUgZHVyYXRpb24gYW5kIGVu ZCB0aW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MDM2MTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX ZSB3b3VsZCBjb21wdXRlIGFuIGFuaW1hdGlvbiBlZmZlY3QncyBhY3RpdmUgZHVyYXRpb24gYW5k IGVuZCB0aW1lIGluIEFuaW1hdGlvRWZmZWN0OjpnZXRCYXNpY1RpbWluZygpCisgICAgICAgIGJ1 dCB0aGVzZSB0d28gcHJvcGVydGllcyBjb3VsZCBiZSBjb21wdXRlZCBhaGVhZCBvZiB0aW1lIHdo ZW4gdGhlIG90aGVyIHN0YXRpYyB0aW1pbmcgcHJvcGVydGllcyBvZiBhbgorICAgICAgICBhbmlt YXRpb24gZWZmZWN0IGFyZSBjaGFuZ2VkLiBUaGlzIGFsbG93cyBzZXZlcmFsIGNhbGxzIHNpdGVz IHRvIFdlYkFuaW1hdGlvbjo6ZWZmZWN0RW5kVGltZSgpIHRvIG5vCisgICAgICAgIGxvbmdlciBy ZXF1aXJlIHRoZSBkeW5hbWljIGNvbXB1dGF0aW9uIG9mIGFsbCB0aGUgb3RoZXIgdGltaW5nIHBy b3BlcnRpZXMgaW4gQW5pbWF0aW9FZmZlY3Q6OmdldEJhc2ljVGltaW5nKCksCisgICAgICAgIChs b2NhbCB0aW1lLCBhY3RpdmUgdGltZSBhbmQgcGhhc2UpIHdoaWNoIG5lZWQgdG8gYmUgY29tcHV0 ZWQgZHluYW1pY2FsbHkgYXMgdGhleSByZWx5IG9uIHRoZSBjdXJyZW50CisgICAgICAgIHRpbWVs aW5lIHRpbWUuCisKKyAgICAgICAgKiBhbmltYXRpb24vQW5pbWF0aW9uRWZmZWN0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbkVmZmVjdDo6Z2V0QmFzaWNUaW1pbmcgY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uRWZmZWN0OjpnZXRDb21wdXRlZFRpbWluZyBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpBbmltYXRpb25FZmZlY3Q6OnVwZGF0ZVRpbWluZyk6Cisg ICAgICAgIChXZWJDb3JlOjpBbmltYXRpb25FZmZlY3Q6OnVwZGF0ZVN0YXRpY1RpbWluZ1Byb3Bl cnRpZXMpOgorICAgICAgICAqIGFuaW1hdGlvbi9BbmltYXRpb25FZmZlY3QuaDoKKyAgICAgICAg KFdlYkNvcmU6OkFuaW1hdGlvbkVmZmVjdDo6YWN0aXZlRHVyYXRpb24gY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6QW5pbWF0aW9uRWZmZWN0OjplbmRUaW1lIGNvbnN0KToKKyAgICAgICAgKiBh bmltYXRpb24vQ1NTQW5pbWF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0FuaW1hdGlv bjo6c3luY1Byb3BlcnRpZXNXaXRoQmFja2luZ0FuaW1hdGlvbik6CisgICAgICAgICogYW5pbWF0 aW9uL0NTU1RyYW5zaXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTVHJhbnNpdGlvbjo6 c2V0VGltaW5nUHJvcGVydGllcyk6CisgICAgICAgICogYW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lRWZmZWN0Ojpjb3B5UHJvcGVydGllc0Zy b21Tb3VyY2UpOgorICAgICAgICAqIGFuaW1hdGlvbi9XZWJBbmltYXRpb24uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6V2ViQW5pbWF0aW9uOjplZmZlY3RFbmRUaW1lIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OldlYkFuaW1hdGlvbjo6dGltZVRvTmV4dFRpY2sgY29uc3QpOgorCiAyMDE5LTEw LTI5ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYiBB bmltYXRpb25zXSBPcHRpbWl6ZSBibGVuZGluZyBmb3IgQ1NTIFRyYW5zaXRpb25zCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQW5pbWF0aW9uRWZmZWN0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2FuaW1hdGlvbi9BbmltYXRpb25FZmZlY3QuY3BwCmluZGV4IGY3YWY2ZWYzOGNi NWZiNGNkZDg4MDI2MTE1MGM5ZmI5MWFmNWNiNGMuLmIxODQ5NzNkNzAzNGZkYjE0ODNmYmNmOTUx ZGFjNmI3ZTk0MjAyYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9Bbmlt YXRpb25FZmZlY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9BbmltYXRpb25F ZmZlY3QuY3BwCkBAIC02NCwyNyArNjQsNiBAQCBCYXNpY0VmZmVjdFRpbWluZyBBbmltYXRpb25F ZmZlY3Q6OmdldEJhc2ljVGltaW5nKCkgY29uc3QKICAgICAvLyB0byBlYWNoIG90aGVyIGEgZmFp ciBiaXQsIHNvIHJhdGhlciB0aGFuIGltcGxlbWVudGluZyB0aGVtIGFzIGluZGl2aWR1YWwgbWV0 aG9kcywgaXQncyBtb3JlIGVmZmljaWVudAogICAgIC8vIHRvIHJldHVybiB0aGVtIGFsbCBhcyBh IHNpbmdsZSBCYXNpY0VmZmVjdFRpbWluZy4KIAotICAgIGF1dG8gYWN0aXZlRHVyYXRpb24gPSBb dGhpc10oKSAtPiBTZWNvbmRzIHsKLSAgICAgICAgLy8gMy44LjIuIENhbGN1bGF0aW5nIHRoZSBh Y3RpdmUgZHVyYXRpb24KLSAgICAgICAgLy8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL3dlYi1h bmltYXRpb25zLTEvI2NhbGN1bGF0aW5nLXRoZS1hY3RpdmUtZHVyYXRpb24KLQotICAgICAgICAv LyBUaGUgYWN0aXZlIGR1cmF0aW9uIGlzIGNhbGN1bGF0ZWQgYXMgZm9sbG93czoKLSAgICAgICAg Ly8gYWN0aXZlIGR1cmF0aW9uID0gaXRlcmF0aW9uIGR1cmF0aW9uIMOXIGl0ZXJhdGlvbiBjb3Vu dAotICAgICAgICAvLyBJZiBlaXRoZXIgdGhlIGl0ZXJhdGlvbiBkdXJhdGlvbiBvciBpdGVyYXRp b24gY291bnQgYXJlIHplcm8sIHRoZSBhY3RpdmUgZHVyYXRpb24gaXMgemVyby4KLSAgICAgICAg aWYgKCFtX2l0ZXJhdGlvbkR1cmF0aW9uIHx8ICFtX2l0ZXJhdGlvbnMpCi0gICAgICAgICAgICBy ZXR1cm4gMF9zOwotICAgICAgICByZXR1cm4gbV9pdGVyYXRpb25EdXJhdGlvbiAqIG1faXRlcmF0 aW9uczsKLSAgICB9KCk7Ci0KLSAgICBhdXRvIGVuZFRpbWUgPSBbdGhpcywgYWN0aXZlRHVyYXRp b25dKCkgLT4gU2Vjb25kcyB7Ci0gICAgICAgIC8vIDMuNS4zIFRoZSBhY3RpdmUgaW50ZXJ2YWwK LSAgICAgICAgLy8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL3dlYi1hbmltYXRpb25zLTEvI2Vu ZC10aW1lCi0KLSAgICAgICAgLy8gVGhlIGVuZCB0aW1lIG9mIGFuIGFuaW1hdGlvbiBlZmZlY3Qg aXMgdGhlIHJlc3VsdCBvZiBldmFsdWF0aW5nIG1heChzdGFydCBkZWxheSArIGFjdGl2ZSBkdXJh dGlvbiArIGVuZCBkZWxheSwgMCkuCi0gICAgICAgIGF1dG8gZW5kVGltZSA9IG1fZGVsYXkgKyBh Y3RpdmVEdXJhdGlvbiArIG1fZW5kRGVsYXk7Ci0gICAgICAgIHJldHVybiBlbmRUaW1lID4gMF9z ID8gZW5kVGltZSA6IDBfczsKLSAgICB9KCk7Ci0KICAgICBhdXRvIGxvY2FsVGltZSA9IFt0aGlz XSgpIC0+IE9wdGlvbmFsPFNlY29uZHM+IHsKICAgICAgICAgLy8gNC41LjQuIExvY2FsIHRpbWUK ICAgICAgICAgLy8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL3dlYi1hbmltYXRpb25zLTEvI2xv Y2FsLXRpbWUtc2VjdGlvbgpAQCAtOTcsMTMgKzc2LDEzIEBAIEJhc2ljRWZmZWN0VGltaW5nIEFu aW1hdGlvbkVmZmVjdDo6Z2V0QmFzaWNUaW1pbmcoKSBjb25zdAogICAgICAgICByZXR1cm4gV1RG OjpudWxsb3B0OwogICAgIH0oKTsKIAotICAgIGF1dG8gcGhhc2UgPSBbdGhpcywgZW5kVGltZSwg bG9jYWxUaW1lLCBhY3RpdmVEdXJhdGlvbl0oKSAtPiBBbmltYXRpb25FZmZlY3RQaGFzZSB7Cisg ICAgYXV0byBwaGFzZSA9IFt0aGlzLCBsb2NhbFRpbWVdKCkgLT4gQW5pbWF0aW9uRWZmZWN0UGhh c2UgewogICAgICAgICAvLyAzLjUuNS4gQW5pbWF0aW9uIGVmZmVjdCBwaGFzZXMgYW5kIHN0YXRl cwogICAgICAgICAvLyBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvd2ViLWFuaW1hdGlvbnMtMS8j YW5pbWF0aW9uLWVmZmVjdC1waGFzZXMtYW5kLXN0YXRlcwogCiAgICAgICAgIGJvb2wgYW5pbWF0 aW9uSXNCYWNrd2FyZHMgPSBtX2FuaW1hdGlvbiAmJiBtX2FuaW1hdGlvbi0+cGxheWJhY2tSYXRl KCkgPCAwOwotICAgICAgICBhdXRvIGJlZm9yZUFjdGl2ZUJvdW5kYXJ5VGltZSA9IHN0ZDo6bWF4 KHN0ZDo6bWluKG1fZGVsYXksIGVuZFRpbWUpLCAwX3MpOwotICAgICAgICBhdXRvIGFjdGl2ZUFm dGVyQm91bmRhcnlUaW1lID0gc3RkOjptYXgoc3RkOjptaW4obV9kZWxheSArIGFjdGl2ZUR1cmF0 aW9uLCBlbmRUaW1lKSwgMF9zKTsKKyAgICAgICAgYXV0byBiZWZvcmVBY3RpdmVCb3VuZGFyeVRp bWUgPSBzdGQ6Om1heChzdGQ6Om1pbihtX2RlbGF5LCBtX2VuZFRpbWUpLCAwX3MpOworICAgICAg ICBhdXRvIGFjdGl2ZUFmdGVyQm91bmRhcnlUaW1lID0gc3RkOjptYXgoc3RkOjptaW4obV9kZWxh eSArIG1fYWN0aXZlRHVyYXRpb24sIG1fZW5kVGltZSksIDBfcyk7CiAKICAgICAgICAgLy8gKFRo aXMgc2hvdWxkIGJlIHRoZSBsYXN0IHN0YXRlbWVudCwgYnV0IGl0J3MgbW9yZSBlZmZpY2llbnQg dG8gY2FjaGUgdGhlIGxvY2FsIHRpbWUgYW5kIHJldHVybiByaWdodCBhd2F5IGlmIGl0J3Mgbm90 IHJlc29sdmVkLikKICAgICAgICAgLy8gRnVydGhlcm1vcmUsIGl0IGlzIG9mdGVuIGNvbnZlbmll bnQgdG8gcmVmZXIgdG8gdGhlIGNhc2Ugd2hlbiBhbiBhbmltYXRpb24gZWZmZWN0IGlzIGluIG5v bmUgb2YgdGhlIGFib3ZlIHBoYXNlcwpAQCAtMTMxLDcgKzExMCw3IEBAIEJhc2ljRWZmZWN0VGlt aW5nIEFuaW1hdGlvbkVmZmVjdDo6Z2V0QmFzaWNUaW1pbmcoKSBjb25zdAogICAgICAgICByZXR1 cm4gQW5pbWF0aW9uRWZmZWN0UGhhc2U6OkFjdGl2ZTsKICAgICB9KCk7CiAKLSAgICBhdXRvIGFj dGl2ZVRpbWUgPSBbdGhpcywgbG9jYWxUaW1lLCBwaGFzZSwgYWN0aXZlRHVyYXRpb25dKCkgLT4g T3B0aW9uYWw8U2Vjb25kcz4geworICAgIGF1dG8gYWN0aXZlVGltZSA9IFt0aGlzLCBsb2NhbFRp bWUsIHBoYXNlXSgpIC0+IE9wdGlvbmFsPFNlY29uZHM+IHsKICAgICAgICAgLy8gMy44LjMuMS4g Q2FsY3VsYXRpbmcgdGhlIGFjdGl2ZSB0aW1lCiAgICAgICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNz c3dnLm9yZy93ZWItYW5pbWF0aW9ucy0xLyNjYWxjdWxhdGluZy10aGUtYWN0aXZlLXRpbWUKIApA QCAtMTYwLDcgKzEzOSw3IEBAIEJhc2ljRWZmZWN0VGltaW5nIEFuaW1hdGlvbkVmZmVjdDo6Z2V0 QmFzaWNUaW1pbmcoKSBjb25zdAogICAgICAgICAgICAgLy8gSWYgdGhlIGZpbGwgbW9kZSBpcyBm b3J3YXJkcyBvciBib3RoLCByZXR1cm4gdGhlIHJlc3VsdCBvZiBldmFsdWF0aW5nCiAgICAgICAg ICAgICAvLyBtYXgobWluKGxvY2FsIHRpbWUgLSBzdGFydCBkZWxheSwgYWN0aXZlIGR1cmF0aW9u KSwgMCkuCiAgICAgICAgICAgICBpZiAobV9maWxsID09IEZpbGxNb2RlOjpGb3J3YXJkcyB8fCBt X2ZpbGwgPT0gRmlsbE1vZGU6OkJvdGgpCi0gICAgICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bWF4 KHN0ZDo6bWluKCpsb2NhbFRpbWUgLSBtX2RlbGF5LCBhY3RpdmVEdXJhdGlvbiksIDBfcyk7Cisg ICAgICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KHN0ZDo6bWluKCpsb2NhbFRpbWUgLSBtX2Rl bGF5LCBtX2FjdGl2ZUR1cmF0aW9uKSwgMF9zKTsKICAgICAgICAgICAgIC8vIE90aGVyd2lzZSwg cmV0dXJuIGFuIHVucmVzb2x2ZWQgdGltZSB2YWx1ZS4KICAgICAgICAgICAgIHJldHVybiBXVEY6 Om51bGxvcHQ7CiAgICAgICAgIH0KQEAgLTE2OSw3ICsxNDgsNyBAQCBCYXNpY0VmZmVjdFRpbWlu ZyBBbmltYXRpb25FZmZlY3Q6OmdldEJhc2ljVGltaW5nKCkgY29uc3QKICAgICAgICAgcmV0dXJu IFdURjo6bnVsbG9wdDsKICAgICB9KCk7CiAKLSAgICByZXR1cm4geyBsb2NhbFRpbWUsIGFjdGl2 ZVRpbWUsIGVuZFRpbWUsIGFjdGl2ZUR1cmF0aW9uLCBwaGFzZSB9OworICAgIHJldHVybiB7IGxv Y2FsVGltZSwgYWN0aXZlVGltZSwgbV9lbmRUaW1lLCBtX2FjdGl2ZUR1cmF0aW9uLCBwaGFzZSB9 OwogfQogCiBDb21wdXRlZEVmZmVjdFRpbWluZyBBbmltYXRpb25FZmZlY3Q6OmdldENvbXB1dGVk VGltaW5nKCkgY29uc3QKQEAgLTE4MCw3ICsxNTksNiBAQCBDb21wdXRlZEVmZmVjdFRpbWluZyBB bmltYXRpb25FZmZlY3Q6OmdldENvbXB1dGVkVGltaW5nKCkgY29uc3QKIAogICAgIGF1dG8gYmFz aWNFZmZlY3RUaW1pbmcgPSBnZXRCYXNpY1RpbWluZygpOwogICAgIGF1dG8gYWN0aXZlVGltZSA9 IGJhc2ljRWZmZWN0VGltaW5nLmFjdGl2ZVRpbWU7Ci0gICAgYXV0byBhY3RpdmVEdXJhdGlvbiA9 IGJhc2ljRWZmZWN0VGltaW5nLmFjdGl2ZUR1cmF0aW9uOwogICAgIGF1dG8gcGhhc2UgPSBiYXNp Y0VmZmVjdFRpbWluZy5waGFzZTsKIAogICAgIGF1dG8gb3ZlcmFsbFByb2dyZXNzID0gW3RoaXMs IHBoYXNlLCBhY3RpdmVUaW1lXSgpIC0+IE9wdGlvbmFsPGRvdWJsZT4gewpAQCAtMjEwLDcgKzE4 OCw3IEBAIENvbXB1dGVkRWZmZWN0VGltaW5nIEFuaW1hdGlvbkVmZmVjdDo6Z2V0Q29tcHV0ZWRU aW1pbmcoKSBjb25zdAogICAgICAgICByZXR1cm4gc3RkOjphYnMob3ZlcmFsbFByb2dyZXNzKTsK ICAgICB9KCk7CiAKLSAgICBhdXRvIHNpbXBsZUl0ZXJhdGlvblByb2dyZXNzID0gW3RoaXMsIG92 ZXJhbGxQcm9ncmVzcywgcGhhc2UsIGFjdGl2ZVRpbWUsIGFjdGl2ZUR1cmF0aW9uXSgpIC0+IE9w dGlvbmFsPGRvdWJsZT4geworICAgIGF1dG8gc2ltcGxlSXRlcmF0aW9uUHJvZ3Jlc3MgPSBbdGhp cywgb3ZlcmFsbFByb2dyZXNzLCBwaGFzZSwgYWN0aXZlVGltZV0oKSAtPiBPcHRpb25hbDxkb3Vi bGU+IHsKICAgICAgICAgLy8gMy44LjMuMy4gQ2FsY3VsYXRpbmcgdGhlIHNpbXBsZSBpdGVyYXRp b24gcHJvZ3Jlc3MKICAgICAgICAgLy8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL3dlYi1hbmlt YXRpb25zLTEvI2NhbGN1bGF0aW5nLXRoZS1zaW1wbGUtaXRlcmF0aW9uLXByb2dyZXNzCiAKQEAg LTIzMyw3ICsyMTEsNyBAQCBDb21wdXRlZEVmZmVjdFRpbWluZyBBbmltYXRpb25FZmZlY3Q6Omdl dENvbXB1dGVkVGltaW5nKCkgY29uc3QKICAgICAgICAgLy8gdGhlIGFjdGl2ZSB0aW1lIGlzIGVx dWFsIHRvIHRoZSBhY3RpdmUgZHVyYXRpb24sIGFuZAogICAgICAgICAvLyB0aGUgaXRlcmF0aW9u IGNvdW50IGlzIG5vdCBlcXVhbCB0byB6ZXJvLgogICAgICAgICAvLyBsZXQgdGhlIHNpbXBsZSBp dGVyYXRpb24gcHJvZ3Jlc3MgYmUgMS4wLgotICAgICAgICBpZiAoIXNpbXBsZUl0ZXJhdGlvblBy b2dyZXNzICYmIChwaGFzZSA9PSBBbmltYXRpb25FZmZlY3RQaGFzZTo6QWN0aXZlIHx8IHBoYXNl ID09IEFuaW1hdGlvbkVmZmVjdFBoYXNlOjpBZnRlcikgJiYgc3RkOjphYnMoYWN0aXZlVGltZS0+ bWljcm9zZWNvbmRzKCkgLSBhY3RpdmVEdXJhdGlvbi5taWNyb3NlY29uZHMoKSkgPCB0aW1lRXBz aWxvbi5taWNyb3NlY29uZHMoKSAmJiBtX2l0ZXJhdGlvbnMpCisgICAgICAgIGlmICghc2ltcGxl SXRlcmF0aW9uUHJvZ3Jlc3MgJiYgKHBoYXNlID09IEFuaW1hdGlvbkVmZmVjdFBoYXNlOjpBY3Rp dmUgfHwgcGhhc2UgPT0gQW5pbWF0aW9uRWZmZWN0UGhhc2U6OkFmdGVyKSAmJiBzdGQ6OmFicyhh Y3RpdmVUaW1lLT5taWNyb3NlY29uZHMoKSAtIG1fYWN0aXZlRHVyYXRpb24ubWljcm9zZWNvbmRz KCkpIDwgdGltZUVwc2lsb24ubWljcm9zZWNvbmRzKCkgJiYgbV9pdGVyYXRpb25zKQogICAgICAg ICAgICAgcmV0dXJuIDE7CiAKICAgICAgICAgcmV0dXJuIHNpbXBsZUl0ZXJhdGlvblByb2dyZXNz OwpAQCAtMzQ3LDggKzMyNSw4IEBAIENvbXB1dGVkRWZmZWN0VGltaW5nIEFuaW1hdGlvbkVmZmVj dDo6Z2V0Q29tcHV0ZWRUaW1pbmcoKSBjb25zdAogICAgIGNvbXB1dGVkVGltaW5nLmR1cmF0aW9u ID0gc2Vjb25kc1RvV2ViQW5pbWF0aW9uc0FQSVRpbWUobV9pdGVyYXRpb25EdXJhdGlvbik7CiAg ICAgY29tcHV0ZWRUaW1pbmcuZGlyZWN0aW9uID0gbV9kaXJlY3Rpb247CiAgICAgY29tcHV0ZWRU aW1pbmcuZWFzaW5nID0gbV90aW1pbmdGdW5jdGlvbi0+Y3NzVGV4dCgpOwotICAgIGNvbXB1dGVk VGltaW5nLmVuZFRpbWUgPSBzZWNvbmRzVG9XZWJBbmltYXRpb25zQVBJVGltZShiYXNpY0VmZmVj dFRpbWluZy5lbmRUaW1lKTsKLSAgICBjb21wdXRlZFRpbWluZy5hY3RpdmVEdXJhdGlvbiA9IHNl Y29uZHNUb1dlYkFuaW1hdGlvbnNBUElUaW1lKGFjdGl2ZUR1cmF0aW9uKTsKKyAgICBjb21wdXRl ZFRpbWluZy5lbmRUaW1lID0gc2Vjb25kc1RvV2ViQW5pbWF0aW9uc0FQSVRpbWUobV9lbmRUaW1l KTsKKyAgICBjb21wdXRlZFRpbWluZy5hY3RpdmVEdXJhdGlvbiA9IHNlY29uZHNUb1dlYkFuaW1h dGlvbnNBUElUaW1lKG1fYWN0aXZlRHVyYXRpb24pOwogICAgIGlmIChiYXNpY0VmZmVjdFRpbWlu Zy5sb2NhbFRpbWUpCiAgICAgICAgIGNvbXB1dGVkVGltaW5nLmxvY2FsVGltZSA9IHNlY29uZHNU b1dlYkFuaW1hdGlvbnNBUElUaW1lKCpiYXNpY0VmZmVjdFRpbWluZy5sb2NhbFRpbWUpOwogICAg IGNvbXB1dGVkVGltaW5nLnNpbXBsZUl0ZXJhdGlvblByb2dyZXNzID0gc2ltcGxlSXRlcmF0aW9u UHJvZ3Jlc3M7CkBAIC00MzIsMTIgKzQxMCwzNiBAQCBFeGNlcHRpb25Pcjx2b2lkPiBBbmltYXRp b25FZmZlY3Q6OnVwZGF0ZVRpbWluZyhPcHRpb25hbDxPcHRpb25hbEVmZmVjdFRpbWluZz4gdAog ICAgIGlmICh0aW1pbmctPmRpcmVjdGlvbikKICAgICAgICAgbV9kaXJlY3Rpb24gPSB0aW1pbmct PmRpcmVjdGlvbi52YWx1ZSgpOwogCisgICAgdXBkYXRlU3RhdGljVGltaW5nUHJvcGVydGllcygp OworCiAgICAgaWYgKG1fYW5pbWF0aW9uKQogICAgICAgICBtX2FuaW1hdGlvbi0+ZWZmZWN0VGlt aW5nRGlkQ2hhbmdlKCk7CiAKICAgICByZXR1cm4geyB9OwogfQogCit2b2lkIEFuaW1hdGlvbkVm ZmVjdDo6dXBkYXRlU3RhdGljVGltaW5nUHJvcGVydGllcygpCit7CisgICAgLy8gMy44LjIuIENh bGN1bGF0aW5nIHRoZSBhY3RpdmUgZHVyYXRpb24KKyAgICAvLyBodHRwczovL2RyYWZ0cy5jc3N3 Zy5vcmcvd2ViLWFuaW1hdGlvbnMtMS8jY2FsY3VsYXRpbmctdGhlLWFjdGl2ZS1kdXJhdGlvbgor CisgICAgLy8gVGhlIGFjdGl2ZSBkdXJhdGlvbiBpcyBjYWxjdWxhdGVkIGFzIGZvbGxvd3M6Cisg ICAgLy8gYWN0aXZlIGR1cmF0aW9uID0gaXRlcmF0aW9uIGR1cmF0aW9uIMOXIGl0ZXJhdGlvbiBj b3VudAorICAgIC8vIElmIGVpdGhlciB0aGUgaXRlcmF0aW9uIGR1cmF0aW9uIG9yIGl0ZXJhdGlv biBjb3VudCBhcmUgemVybywgdGhlIGFjdGl2ZSBkdXJhdGlvbiBpcyB6ZXJvLgorICAgIGlmICgh bV9pdGVyYXRpb25EdXJhdGlvbiB8fCAhbV9pdGVyYXRpb25zKQorICAgICAgICBtX2FjdGl2ZUR1 cmF0aW9uID0gMF9zOworICAgIGVsc2UKKyAgICAgICAgbV9hY3RpdmVEdXJhdGlvbiA9IG1faXRl cmF0aW9uRHVyYXRpb24gKiBtX2l0ZXJhdGlvbnM7CisKKyAgICAvLyAzLjUuMyBUaGUgYWN0aXZl IGludGVydmFsCisgICAgLy8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL3dlYi1hbmltYXRpb25z LTEvI2VuZC10aW1lCisKKyAgICAvLyBUaGUgZW5kIHRpbWUgb2YgYW4gYW5pbWF0aW9uIGVmZmVj dCBpcyB0aGUgcmVzdWx0IG9mIGV2YWx1YXRpbmcgbWF4KHN0YXJ0IGRlbGF5ICsgYWN0aXZlIGR1 cmF0aW9uICsgZW5kIGRlbGF5LCAwKS4KKyAgICBtX2VuZFRpbWUgPSBtX2RlbGF5ICsgbV9hY3Rp dmVEdXJhdGlvbiArIG1fZW5kRGVsYXk7CisgICAgaWYgKG1fZW5kVGltZSA8IDBfcykKKyAgICAg ICAgbV9lbmRUaW1lID0gMF9zOworfQorCiBFeGNlcHRpb25Pcjx2b2lkPiBBbmltYXRpb25FZmZl Y3Q6OnNldEl0ZXJhdGlvblN0YXJ0KGRvdWJsZSBpdGVyYXRpb25TdGFydCkKIHsKICAgICAvLyBo dHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvd2ViLWFuaW1hdGlvbnMtMS8jZG9tLWFuaW1hdGlvbmVm ZmVjdHRpbWluZy1pdGVyYXRpb25zdGFydApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYW5p bWF0aW9uL0FuaW1hdGlvbkVmZmVjdC5oIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0FuaW1h dGlvbkVmZmVjdC5oCmluZGV4IDgyZGU3NDI4OWIwOWI5MDZlODEzMzAwNjhiNzQ0MjM0ZmZhZDRm YWQuLmYzZmYzZTk4ODkyY2UyNGU0NGE4YzdiMWU3OTkwYWFmYjNlZmNlMmIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9BbmltYXRpb25FZmZlY3QuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9hbmltYXRpb24vQW5pbWF0aW9uRWZmZWN0LmgKQEAgLTkwLDYgKzkwLDExIEBAIHB1 YmxpYzoKICAgICBUaW1pbmdGdW5jdGlvbiogdGltaW5nRnVuY3Rpb24oKSBjb25zdCB7IHJldHVy biBtX3RpbWluZ0Z1bmN0aW9uLmdldCgpOyB9CiAgICAgdm9pZCBzZXRUaW1pbmdGdW5jdGlvbihj b25zdCBSZWZQdHI8VGltaW5nRnVuY3Rpb24+Jik7CiAKKyAgICBTZWNvbmRzIGFjdGl2ZUR1cmF0 aW9uKCkgY29uc3QgeyByZXR1cm4gbV9hY3RpdmVEdXJhdGlvbjsgfQorICAgIFNlY29uZHMgZW5k VGltZSgpIGNvbnN0IHsgcmV0dXJuIG1fZW5kVGltZTsgfQorCisgICAgdm9pZCB1cGRhdGVTdGF0 aWNUaW1pbmdQcm9wZXJ0aWVzKCk7CisKIHByb3RlY3RlZDoKICAgICBleHBsaWNpdCBBbmltYXRp b25FZmZlY3QoKTsKIApAQCAtMTA4LDYgKzExMyw4IEBAIHByaXZhdGU6CiAgICAgU2Vjb25kcyBt X2RlbGF5IHsgMF9zIH07CiAgICAgU2Vjb25kcyBtX2VuZERlbGF5IHsgMF9zIH07CiAgICAgU2Vj b25kcyBtX2l0ZXJhdGlvbkR1cmF0aW9uIHsgMF9zIH07CisgICAgU2Vjb25kcyBtX2FjdGl2ZUR1 cmF0aW9uIHsgMF9zIH07CisgICAgU2Vjb25kcyBtX2VuZFRpbWUgeyAwX3MgfTsKIH07CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlv bi9DU1NBbmltYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0NTU0FuaW1hdGlv bi5jcHAKaW5kZXggOTdlOTRiNWM5Zjk0MzE4ZmZiOGQ5OWY5NGZmYjUyNjNiODQyYTM0My4uNGVj YmYwMzYyOTBlOWRkZmY3ZmJhODEyNTE5OWI3NzQ2ZmY3M2E1ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYW5pbWF0aW9uL0NTU0FuaW1hdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv YW5pbWF0aW9uL0NTU0FuaW1hdGlvbi5jcHAKQEAgLTk2LDYgKzk2LDcgQEAgdm9pZCBDU1NBbmlt YXRpb246OnN5bmNQcm9wZXJ0aWVzV2l0aEJhY2tpbmdBbmltYXRpb24oKQogCiAgICAgYW5pbWF0 aW9uRWZmZWN0LT5zZXREZWxheShTZWNvbmRzKGFuaW1hdGlvbi5kZWxheSgpKSk7CiAgICAgYW5p bWF0aW9uRWZmZWN0LT5zZXRJdGVyYXRpb25EdXJhdGlvbihTZWNvbmRzKGFuaW1hdGlvbi5kdXJh dGlvbigpKSk7CisgICAgYW5pbWF0aW9uRWZmZWN0LT51cGRhdGVTdGF0aWNUaW1pbmdQcm9wZXJ0 aWVzKCk7CiAKICAgICAvLyBTeW5jaHJvbml6ZSB0aGUgcGxheSBzdGF0ZQogICAgIGlmIChhbmlt YXRpb24ucGxheVN0YXRlKCkgPT0gQW5pbWF0aW9uUGxheVN0YXRlOjpQbGF5aW5nICYmIHBsYXlT dGF0ZSgpID09IFdlYkFuaW1hdGlvbjo6UGxheVN0YXRlOjpQYXVzZWQpIHsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9DU1NUcmFuc2l0aW9uLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2FuaW1hdGlvbi9DU1NUcmFuc2l0aW9uLmNwcAppbmRleCBhNDZjNjFiODBmODRiOGY5NWU5 NTYzNTI5M2E1OGZiN2JiYjE0OWE3Li45YzdmNjkwMjYyN2U1MGZhNTc0NDNlMDFmZjIzNzU0MGI4 NGIzMWRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQ1NTVHJhbnNpdGlv bi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0NTU1RyYW5zaXRpb24uY3BwCkBA IC03Myw2ICs3Myw3IEBAIHZvaWQgQ1NTVHJhbnNpdGlvbjo6c2V0VGltaW5nUHJvcGVydGllcyhT ZWNvbmRzIGRlbGF5LCBTZWNvbmRzIGR1cmF0aW9uKQogICAgIGFuaW1hdGlvbkVmZmVjdC0+c2V0 RGVsYXkoZGVsYXkpOwogICAgIGFuaW1hdGlvbkVmZmVjdC0+c2V0SXRlcmF0aW9uRHVyYXRpb24o ZHVyYXRpb24pOwogICAgIGFuaW1hdGlvbkVmZmVjdC0+c2V0VGltaW5nRnVuY3Rpb24oYmFja2lu Z0FuaW1hdGlvbigpLnRpbWluZ0Z1bmN0aW9uKCkpOworICAgIGFuaW1hdGlvbkVmZmVjdC0+dXBk YXRlU3RhdGljVGltaW5nUHJvcGVydGllcygpOwogCiAgICAgdW5zdXNwZW5kRWZmZWN0SW52YWxp ZGF0aW9uKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vS2V5ZnJh bWVFZmZlY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0LmNw cAppbmRleCA0ZjFkNjJjY2Y4NjkxMGE1MWFkODc4ZGNmZTY3ZmM2Y2IzY2UzN2ZlLi4yMzk4Y2Iz MDMzYjk1YTRiZDg0OTM3M2YxMDA0ZDU4ZDAxZWIzNmJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9hbmltYXRpb24vS2V5ZnJhbWVFZmZlY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Fu aW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5jcHAKQEAgLTU0Miw2ICs1NDIsNyBAQCB2b2lkIEtleWZy YW1lRWZmZWN0Ojpjb3B5UHJvcGVydGllc0Zyb21Tb3VyY2UoUmVmPEtleWZyYW1lRWZmZWN0PiYm IHNvdXJjZSkKICAgICBzZXRUaW1pbmdGdW5jdGlvbihzb3VyY2UtPnRpbWluZ0Z1bmN0aW9uKCkp OwogICAgIHNldEl0ZXJhdGlvblN0YXJ0KHNvdXJjZS0+aXRlcmF0aW9uU3RhcnQoKSk7CiAgICAg c2V0SXRlcmF0aW9uRHVyYXRpb24oc291cmNlLT5pdGVyYXRpb25EdXJhdGlvbigpKTsKKyAgICB1 cGRhdGVTdGF0aWNUaW1pbmdQcm9wZXJ0aWVzKCk7CiAKICAgICBLZXlmcmFtZUxpc3Qga2V5ZnJh bWVMaXN0KCJrZXlmcmFtZS1lZmZlY3QtIiArIGNyZWF0ZUNhbm9uaWNhbFVVSURTdHJpbmcoKSk7 CiAgICAgZm9yIChhdXRvJiBrZXlmcmFtZSA6IHNvdXJjZS0+bV9ibGVuZGluZ0tleWZyYW1lcy5r ZXlmcmFtZXMoKSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL1dlYkFu aW1hdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vV2ViQW5pbWF0aW9uLmNwcApp bmRleCAzOWY2YjM0NGM3YjQ0NWU2NDQ3Zjg5MmQ2NjMxZmZlMmU1MTExYTM3Li41NWMwNWE4ODlk OWE2NGNiZTdjOWQ1NjliZWNhNjQ0Yjg4ODBhYWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9hbmltYXRpb24vV2ViQW5pbWF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRp b24vV2ViQW5pbWF0aW9uLmNwcApAQCAtNTQ0LDcgKzU0NCw3IEBAIFNlY29uZHMgV2ViQW5pbWF0 aW9uOjplZmZlY3RFbmRUaW1lKCkgY29uc3QKIHsKICAgICAvLyBUaGUgdGFyZ2V0IGVmZmVjdCBl bmQgb2YgYW4gYW5pbWF0aW9uIGlzIGVxdWFsIHRvIHRoZSBlbmQgdGltZSBvZiB0aGUgYW5pbWF0 aW9uJ3MgdGFyZ2V0IGVmZmVjdC4KICAgICAvLyBJZiB0aGUgYW5pbWF0aW9uIGhhcyBubyB0YXJn ZXQgZWZmZWN0LCB0aGUgdGFyZ2V0IGVmZmVjdCBlbmQgaXMgemVyby4KLSAgICByZXR1cm4gbV9l ZmZlY3QgPyBtX2VmZmVjdC0+Z2V0QmFzaWNUaW1pbmcoKS5lbmRUaW1lIDogMF9zOworICAgIHJl dHVybiBtX2VmZmVjdCA/IG1fZWZmZWN0LT5lbmRUaW1lKCkgOiAwX3M7CiB9CiAKIHZvaWQgV2Vi QW5pbWF0aW9uOjpjYW5jZWwoKQpAQCAtMTI5MCw3ICsxMjkwLDcgQEAgU2Vjb25kcyBXZWJBbmlt YXRpb246OnRpbWVUb05leHRUaWNrKCkgY29uc3QKICAgICAgICAgICAgICAgICByZXR1cm4gYW5p bWF0aW9uRWZmZWN0LT5kZWxheSgpIC0gbG9jYWxUaW1lOwogICAgICAgICB9CiAgICAgfSBlbHNl IGlmIChhdXRvIGFuaW1hdGlvbkN1cnJlbnRUaW1lID0gY3VycmVudFRpbWUoKSkKLSAgICAgICAg cmV0dXJuIGVmZmVjdCgpLT5nZXRCYXNpY1RpbWluZygpLmVuZFRpbWUgLSAqYW5pbWF0aW9uQ3Vy cmVudFRpbWU7CisgICAgICAgIHJldHVybiBlZmZlY3QoKS0+ZW5kVGltZSgpIC0gKmFuaW1hdGlv bkN1cnJlbnRUaW1lOwogCiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgcmV0dXJuIFNl Y29uZHM6OmluZmluaXR5KCk7Cg==