132942 2014-05-14 21:37:57 -0700 Clean up "has non-zero begin time" terminology in animations 2014-05-15 10:41:44 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser dino simon.fraser thorton oldest_to_newest 1009444 0 simon.fraser 2014-05-14 21:37:57 -0700 Clean up "has non-zero begin time" terminology in animations 1009445 1 231490 simon.fraser 2014-05-14 21:41:44 -0700 Created attachment 231490 Patch 1009576 2 simon.fraser 2014-05-15 10:41:44 -0700 http://trac.webkit.org/changeset/168898 231490 2014-05-14 21:41:44 -0700 2014-05-14 23:17:35 -0700 Patch bug-132942-20140514214120.patch text/plain 18475 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4Nzc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWE4OGRkNTFjZjdkZmY2 OTExZTc5ZmQ0ZTA4MWExOGRiOTgyOWE4Yi4uMzE5M2E0MjM0NDQ3NDBiZGNlNTcxYjA3YmRhZDZi ODcyMmNmZGQ1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU0IEBACisyMDE0LTA1LTE0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwICJo YXMgbm9uLXplcm8gYmVnaW4gdGltZSIgdGVybWlub2xvZ3kgaW4gYW5pbWF0aW9ucworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyOTQyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hhbmdlIHRoZSAibm9u LXplcm8gYmVnaW5UaW1lIiB0ZXJtaW5vbG9neSBpbiB0aGUgcGxhdGZvcm0gQ0EgYW5pbWF0aW9u cworICAgICAgICBjb2RlIHRvICJleHBsaWNpdCBiZWdpblRpbWUiOiB0aGlzIGZsYWcgcmVhbGx5 IG1lYW5zIHRoYXQgd2UgZXhwbGljaXRseSBzZXQKKyAgICAgICAgdGhlIGJlZ2luVGltZSBvZiB0 aGUgYW5pbWF0aW9uLCByYXRoZXIgdGhhbiBsZXQgQ0Egc2V0IHRoZSBiZWdpblRpbWUgd2hlbgor ICAgICAgICBjb21taXR0aW5nIHRoZSBhbmltYXRpb24uIFRoaXMgZmxhZyBpcyB1c2VkIGZvciBh bmltYXRpb25zIHdpdGggbmVnYXRpdmUKKyAgICAgICAgZGVsYXksIGFuZCB3aGVuIHBhdXNpbmcu CisgICAgICAgIAorICAgICAgICBUaGUgV0tOb25aZXJvQmVnaW5UaW1lRmxhZyBrZXkgd2FzIHNw cmVhZCBhY3Jvc3MgUGxhdGZvcm1DQUxheWVyTWFjIGFuZCBQbGF0Zm9ybUNBQW5pbWF0aW9uTWFj LAorICAgICAgICBzbyBoaWRlIGl0IGJlaGluZCBnZXR0ZXIvc2V0dGVyIGZ1bmN0aW9ucy4KKyAg ICAgICAgCisgICAgICAgIFJlbW92ZSBsb3RzIG9mIG1fbGF5ZXIuZ2V0KCkgaW4gUGxhdGZvcm1D QUFuaW1hdGlvbk1hYy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9QbGF0 Zm9ybUNBQW5pbWF0aW9uTWFjLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFj L1BsYXRmb3JtQ0FBbmltYXRpb25NYWMubW06CisgICAgICAgIChXZWJDb3JlOjpoYXNFeHBsaWNp dEJlZ2luVGltZSk6CisgICAgICAgIChXZWJDb3JlOjpzZXRIYXNFeHBsaWNpdEJlZ2luVGltZSk6 CisgICAgICAgIChQbGF0Zm9ybUNBQW5pbWF0aW9uTWFjOjpjb3B5KToKKyAgICAgICAgKFBsYXRm b3JtQ0FBbmltYXRpb25NYWM6OmtleVBhdGgpOgorICAgICAgICAoUGxhdGZvcm1DQUFuaW1hdGlv bk1hYzo6YmVnaW5UaW1lKToKKyAgICAgICAgKFBsYXRmb3JtQ0FBbmltYXRpb25NYWM6OnNldEJl Z2luVGltZSk6CisgICAgICAgIChQbGF0Zm9ybUNBQW5pbWF0aW9uTWFjOjpkdXJhdGlvbik6Cisg ICAgICAgIChQbGF0Zm9ybUNBQW5pbWF0aW9uTWFjOjpzZXREdXJhdGlvbik6CisgICAgICAgIChQ bGF0Zm9ybUNBQW5pbWF0aW9uTWFjOjpzcGVlZCk6CisgICAgICAgIChQbGF0Zm9ybUNBQW5pbWF0 aW9uTWFjOjpzZXRTcGVlZCk6CisgICAgICAgIChQbGF0Zm9ybUNBQW5pbWF0aW9uTWFjOjp0aW1l T2Zmc2V0KToKKyAgICAgICAgKFBsYXRmb3JtQ0FBbmltYXRpb25NYWM6OnNldFRpbWVPZmZzZXQp OgorICAgICAgICAoUGxhdGZvcm1DQUFuaW1hdGlvbk1hYzo6cmVwZWF0Q291bnQpOgorICAgICAg ICAoUGxhdGZvcm1DQUFuaW1hdGlvbk1hYzo6c2V0UmVwZWF0Q291bnQpOgorICAgICAgICAoUGxh dGZvcm1DQUFuaW1hdGlvbk1hYzo6YXV0b3JldmVyc2VzKToKKyAgICAgICAgKFBsYXRmb3JtQ0FB bmltYXRpb25NYWM6OnNldEF1dG9yZXZlcnNlcyk6CisgICAgICAgIChQbGF0Zm9ybUNBQW5pbWF0 aW9uTWFjOjpmaWxsTW9kZSk6CisgICAgICAgIChQbGF0Zm9ybUNBQW5pbWF0aW9uTWFjOjpzZXRG aWxsTW9kZSk6CisgICAgICAgIChQbGF0Zm9ybUNBQW5pbWF0aW9uTWFjOjpzZXRUaW1pbmdGdW5j dGlvbik6CisgICAgICAgIChQbGF0Zm9ybUNBQW5pbWF0aW9uTWFjOjpjb3B5VGltaW5nRnVuY3Rp b25Gcm9tKToKKyAgICAgICAgKFBsYXRmb3JtQ0FBbmltYXRpb25NYWM6OmlzUmVtb3ZlZE9uQ29t cGxldGlvbik6CisgICAgICAgIChQbGF0Zm9ybUNBQW5pbWF0aW9uTWFjOjpzZXRSZW1vdmVkT25D b21wbGV0aW9uKToKKyAgICAgICAgKFBsYXRmb3JtQ0FBbmltYXRpb25NYWM6OmlzQWRkaXRpdmUp OgorICAgICAgICAoUGxhdGZvcm1DQUFuaW1hdGlvbk1hYzo6c2V0QWRkaXRpdmUpOgorICAgICAg ICAoUGxhdGZvcm1DQUFuaW1hdGlvbk1hYzo6dmFsdWVGdW5jdGlvbik6CisgICAgICAgIChQbGF0 Zm9ybUNBQW5pbWF0aW9uTWFjOjpzZXRWYWx1ZUZ1bmN0aW9uKToKKyAgICAgICAgKGhhc05vblpl cm9CZWdpblRpbWVGbGFnKTogRGVsZXRlZC4KKyAgICAgICAgKHNldE5vblplcm9CZWdpblRpbWVG bGFnKTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvUGxhdGZv cm1DQUxheWVyTWFjLm1tOgorICAgICAgICAoLVtXZWJBbmltYXRpb25EZWxlZ2F0ZSBhbmltYXRp b25EaWRTdGFydDpdKToKKwogMjAxNC0wNS0xMyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2Vy QGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggIkFTU0VSVElPTiBGQUlMRUQ6IG1fcmVwcmVzZW50 YXRpb24gPT0gUGxhdGZvcm1MYXllclJlcHJlc2VudGF0aW9uIiB3aXRoIFVJLXNpZGUgY29tcG9z aXRpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZwppbmRleCA5ZmJmYTI1MTM2NjIxMGVjNDU3OWQyYzExNTY3ZjJjYTRjYmMz YTU3Li5iZGQzNzNiMzhkNDA2YTg5OTQwYTk0YzAyMmVkY2EyNjQwOTViMGU5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMjYgQEAKKzIwMTQtMDUtMTQgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNl ckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgImhhcyBub24temVybyBiZWdpbiB0aW1l IiB0ZXJtaW5vbG9neSBpbiBhbmltYXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI5NDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBDaGFuZ2UgdGhlICJub24temVybyBiZWdpblRpbWUiIHRlcm1p bm9sb2d5IGluIHRoZSBwbGF0Zm9ybSBDQSBhbmltYXRpb25zCisgICAgICAgIGNvZGUgdG8gImV4 cGxpY2l0IGJlZ2luVGltZSI6IHRoaXMgZmxhZyByZWFsbHkgbWVhbnMgdGhhdCB3ZSBleHBsaWNp dGx5IHNldAorICAgICAgICB0aGUgYmVnaW5UaW1lIG9mIHRoZSBhbmltYXRpb24sIHJhdGhlciB0 aGFuIGxldCBDQSBzZXQgdGhlIGJlZ2luVGltZSB3aGVuCisgICAgICAgIGNvbW1pdHRpbmcgdGhl IGFuaW1hdGlvbi4gVGhpcyBmbGFnIGlzIHVzZWQgZm9yIGFuaW1hdGlvbnMgd2l0aCBuZWdhdGl2 ZQorICAgICAgICBkZWxheSwgYW5kIHdoZW4gcGF1c2luZy4KKworICAgICAgICAqIFNoYXJlZC9t YWMvUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24ubW06CisgICAgICAgIChXZWJLaXQ6OlJlbW90 ZUxheWVyVHJlZVRleHRTdHJlYW06Om9wZXJhdG9yPDwpOgorICAgICAgICAqIFdlYlByb2Nlc3Mv V2ViUGFnZS9tYWMvUGxhdGZvcm1DQUFuaW1hdGlvblJlbW90ZS5oOgorICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUGFnZS9tYWMvUGxhdGZvcm1DQUFuaW1hdGlvblJlbW90ZS5tbToKKyAgICAgICAg KC1bV0tBbmltYXRpb25EZWxlZ2F0ZSBhbmltYXRpb25EaWRTdGFydDpdKToKKyAgICAgICAgKFdl YktpdDo6UGxhdGZvcm1DQUFuaW1hdGlvblJlbW90ZTo6UHJvcGVydGllczo6ZW5jb2RlKToKKyAg ICAgICAgKFdlYktpdDo6UGxhdGZvcm1DQUFuaW1hdGlvblJlbW90ZTo6UHJvcGVydGllczo6ZGVj b2RlKToKKyAgICAgICAgKFdlYktpdDo6UGxhdGZvcm1DQUFuaW1hdGlvblJlbW90ZTo6c2V0QmVn aW5UaW1lKToKKyAgICAgICAgKFdlYktpdDo6YWRkQW5pbWF0aW9uVG9MYXllcik6CisKIDIwMTQt MDUtMTMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAg Rml4ICJBU1NFUlRJT04gRkFJTEVEOiBtX3JlcHJlc2VudGF0aW9uID09IFBsYXRmb3JtTGF5ZXJS ZXByZXNlbnRhdGlvbiIgd2l0aCBVSS1zaWRlIGNvbXBvc2l0aW5nCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUFuaW1hdGlvbk1h Yy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1BsYXRmb3JtQ0FB bmltYXRpb25NYWMuaAppbmRleCAxNmViNGU4MTNlNzNhZTliYjdjZWJlOGRkODQ3YjgyYTMzYjgz NmI4Li5lY2E4NGYwZTI2NmQ3MzQ4MzM5ZDgyNWVmZGFjYjllNDViNjVlZWUyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUFuaW1h dGlvbk1hYy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9Q bGF0Zm9ybUNBQW5pbWF0aW9uTWFjLmgKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlIDx3dGYv UmV0YWluUHRyLmg+CiAKIE9CSkNfQ0xBU1MgQ0FNZWRpYVRpbWluZ0Z1bmN0aW9uOworT0JKQ19D TEFTUyBDQUFuaW1hdGlvbjsKIE9CSkNfQ0xBU1MgQ0FQcm9wZXJ0eUFuaW1hdGlvbjsKIE9CSkNf Q0xBU1MgTlNTdHJpbmc7CiAKQEAgLTQyLDYgKzQzLDkgQEAgTlNTdHJpbmcqIHRvQ0FGaWxsTW9k ZVR5cGUoUGxhdGZvcm1DQUFuaW1hdGlvbjo6RmlsbE1vZGVUeXBlKTsKIE5TU3RyaW5nKiB0b0NB VmFsdWVGdW5jdGlvblR5cGUoUGxhdGZvcm1DQUFuaW1hdGlvbjo6VmFsdWVGdW5jdGlvblR5cGUp OwogQ0FNZWRpYVRpbWluZ0Z1bmN0aW9uKiB0b0NBTWVkaWFUaW1pbmdGdW5jdGlvbihjb25zdCBU aW1pbmdGdW5jdGlvbiosIGJvb2wgcmV2ZXJzZSk7CiAKK2Jvb2wgaGFzRXhwbGljaXRCZWdpblRp bWUoQ0FBbmltYXRpb24gKik7Cit2b2lkIHNldEhhc0V4cGxpY2l0QmVnaW5UaW1lKENBQW5pbWF0 aW9uICosIGJvb2wpOworCiBjbGFzcyBQbGF0Zm9ybUNBQW5pbWF0aW9uTWFjIGZpbmFsIDogcHVi bGljIFBsYXRmb3JtQ0FBbmltYXRpb24gewogcHVibGljOgogICAgIHN0YXRpYyBQYXNzUmVmUHRy PFBsYXRmb3JtQ0FBbmltYXRpb24+IGNyZWF0ZShBbmltYXRpb25UeXBlLCBjb25zdCBTdHJpbmcm IGtleVBhdGgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2EvbWFjL1BsYXRmb3JtQ0FBbmltYXRpb25NYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUFuaW1hdGlvbk1hYy5tbQppbmRleCAyZWEyODZh ZjAxNGY1NjY4MWJiMmRjYWYxZTZjN2UyMmFlZDQzY2YyLi5mNzExMTllMDc3MTZlZGIwMTk2Mzgw M2VlODY2NzkwYWRkZWE5ZmNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUFuaW1hdGlvbk1hYy5tbQorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUFuaW1hdGlvbk1hYy5tbQpA QCAtMzUsMTcgKzM1LDE2IEBACiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCi0vLyBUaGlz IHZhbHVlIG11c3QgYmUgdGhlIHNhbWUgYXMgaW4gUGxhdGZvcm1DQUxheWVyTWFjLm1tCi1zdGF0 aWMgTlNTdHJpbmcgKiBjb25zdCBXS05vblplcm9CZWdpblRpbWVGbGFnID0gQCJXS1BsYXRmb3Jt Q0FBbmltYXRpb25Ob25aZXJvQmVnaW5UaW1lRmxhZyI7CitzdGF0aWMgTlNTdHJpbmcgKiBjb25z dCBXS0V4cGxpY2l0QmVnaW5UaW1lRmxhZyA9IEAiV0tQbGF0Zm9ybUNBQW5pbWF0aW9uRXhwbGlj aXRCZWdpblRpbWVGbGFnIjsKIAotc3RhdGljIGJvb2wgaGFzTm9uWmVyb0JlZ2luVGltZUZsYWco Y29uc3QgUGxhdGZvcm1DQUFuaW1hdGlvbiogYW5pbWF0aW9uKQorYm9vbCBXZWJDb3JlOjpoYXNF eHBsaWNpdEJlZ2luVGltZShDQUFuaW1hdGlvbiAqYW5pbWF0aW9uKQogewotICAgIHJldHVybiBb W3RvUGxhdGZvcm1DQUFuaW1hdGlvbk1hYyhhbmltYXRpb24pLT5wbGF0Zm9ybUFuaW1hdGlvbigp IHZhbHVlRm9yS2V5OldLTm9uWmVyb0JlZ2luVGltZUZsYWddIGJvb2xWYWx1ZV07CisgICAgcmV0 dXJuIFtbYW5pbWF0aW9uIHZhbHVlRm9yS2V5OldLRXhwbGljaXRCZWdpblRpbWVGbGFnXSBib29s VmFsdWVdOwogfQogCi1zdGF0aWMgdm9pZCBzZXROb25aZXJvQmVnaW5UaW1lRmxhZyhQbGF0Zm9y bUNBQW5pbWF0aW9uKiBhbmltYXRpb24sIGJvb2wgdmFsdWUpCit2b2lkIFdlYkNvcmU6OnNldEhh c0V4cGxpY2l0QmVnaW5UaW1lKENBQW5pbWF0aW9uICphbmltYXRpb24sIGJvb2wgdmFsdWUpCiB7 Ci0gICAgW3RvUGxhdGZvcm1DQUFuaW1hdGlvbk1hYyhhbmltYXRpb24pLT5wbGF0Zm9ybUFuaW1h dGlvbigpIHNldFZhbHVlOltOU051bWJlciBudW1iZXJXaXRoQm9vbDp2YWx1ZV0gZm9yS2V5OldL Tm9uWmVyb0JlZ2luVGltZUZsYWddOworICAgIFthbmltYXRpb24gc2V0VmFsdWU6W05TTnVtYmVy IG51bWJlcldpdGhCb29sOnZhbHVlXSBmb3JLZXk6V0tFeHBsaWNpdEJlZ2luVGltZUZsYWddOwog fQogICAgIAogTlNTdHJpbmcqIFdlYkNvcmU6OnRvQ0FGaWxsTW9kZVR5cGUoUGxhdGZvcm1DQUFu aW1hdGlvbjo6RmlsbE1vZGVUeXBlIHR5cGUpCkBAIC0yMDMsNyArMjAyLDcgQEAgUGFzc1JlZlB0 cjxQbGF0Zm9ybUNBQW5pbWF0aW9uPiBQbGF0Zm9ybUNBQW5pbWF0aW9uTWFjOjpjb3B5KCkgY29u c3QKICAgICBhbmltYXRpb24tPmNvcHlUaW1pbmdGdW5jdGlvbkZyb20odGhpcyk7CiAgICAgYW5p bWF0aW9uLT5zZXRWYWx1ZUZ1bmN0aW9uKHZhbHVlRnVuY3Rpb24oKSk7CiAKLSAgICBzZXROb25a ZXJvQmVnaW5UaW1lRmxhZyhhbmltYXRpb24uZ2V0KCksIGhhc05vblplcm9CZWdpblRpbWVGbGFn KHRoaXMpKTsKKyAgICBzZXRIYXNFeHBsaWNpdEJlZ2luVGltZSh0b1BsYXRmb3JtQ0FBbmltYXRp b25NYWMoYW5pbWF0aW9uLmdldCgpKS0+cGxhdGZvcm1BbmltYXRpb24oKSwgaGFzRXhwbGljaXRC ZWdpblRpbWUocGxhdGZvcm1BbmltYXRpb24oKSkpOwogICAgIAogICAgIC8vIENvcHkgdGhlIHNw ZWNpZmljIEJhc2ljIG9yIEtleWZyYW1lIHZhbHVlcwogICAgIGlmIChhbmltYXRpb25UeXBlKCkg PT0gS2V5ZnJhbWUpIHsKQEAgLTIyNSwxMjUgKzIyNCwxMjUgQEAgUGxhdGZvcm1BbmltYXRpb25S ZWYgUGxhdGZvcm1DQUFuaW1hdGlvbk1hYzo6cGxhdGZvcm1BbmltYXRpb24oKSBjb25zdAogCiBT dHJpbmcgUGxhdGZvcm1DQUFuaW1hdGlvbk1hYzo6a2V5UGF0aCgpIGNvbnN0CiB7Ci0gICAgcmV0 dXJuIFttX2FuaW1hdGlvbi5nZXQoKSBrZXlQYXRoXTsKKyAgICByZXR1cm4gW21fYW5pbWF0aW9u IGtleVBhdGhdOwogfQogCiBDRlRpbWVJbnRlcnZhbCBQbGF0Zm9ybUNBQW5pbWF0aW9uTWFjOjpi ZWdpblRpbWUoKSBjb25zdAogewotICAgIHJldHVybiBbbV9hbmltYXRpb24uZ2V0KCkgYmVnaW5U aW1lXTsKKyAgICByZXR1cm4gW21fYW5pbWF0aW9uIGJlZ2luVGltZV07CiB9CiAKIHZvaWQgUGxh dGZvcm1DQUFuaW1hdGlvbk1hYzo6c2V0QmVnaW5UaW1lKENGVGltZUludGVydmFsIHZhbHVlKQog ewotICAgIFttX2FuaW1hdGlvbi5nZXQoKSBzZXRCZWdpblRpbWU6dmFsdWVdOworICAgIFttX2Fu aW1hdGlvbiBzZXRCZWdpblRpbWU6dmFsdWVdOwogICAgIAogICAgIC8vIEFsc28gc2V0IGEgZmxh ZyB0byB0ZWxsIHVzIGlmIHdlJ3ZlIHBhc3NlZCBpbiBhIDAgdmFsdWUuIAogICAgIC8vIFRoZSBm bGFnIGlzIG5lZWRlZCBiZWNhdXNlIGxhdGVyIGJlZ2luVGltZSB3aWxsIGdldCBjaGFuZ2VkCiAg ICAgLy8gdG8gdGhlIHRpbWUgYXQgd2hpY2ggaXQgZmlyZWQgYW5kIHdlIG5lZWQgdG8ga25vdyB3 aGV0aGVyCiAgICAgLy8gb3Igbm90IGl0IHdhcyAwIHRvIGJlZ2luIHdpdGguCiAgICAgaWYgKHZh bHVlKQotICAgICAgICBzZXROb25aZXJvQmVnaW5UaW1lRmxhZyh0aGlzLCB0cnVlKTsKKyAgICAg ICAgc2V0SGFzRXhwbGljaXRCZWdpblRpbWUobV9hbmltYXRpb24uZ2V0KCksIHRydWUpOwogfQog CiBDRlRpbWVJbnRlcnZhbCBQbGF0Zm9ybUNBQW5pbWF0aW9uTWFjOjpkdXJhdGlvbigpIGNvbnN0 CiB7Ci0gICAgcmV0dXJuIFttX2FuaW1hdGlvbi5nZXQoKSBkdXJhdGlvbl07CisgICAgcmV0dXJu IFttX2FuaW1hdGlvbiBkdXJhdGlvbl07CiB9CiAKIHZvaWQgUGxhdGZvcm1DQUFuaW1hdGlvbk1h Yzo6c2V0RHVyYXRpb24oQ0ZUaW1lSW50ZXJ2YWwgdmFsdWUpCiB7Ci0gICAgW21fYW5pbWF0aW9u LmdldCgpIHNldER1cmF0aW9uOnZhbHVlXTsKKyAgICBbbV9hbmltYXRpb24gc2V0RHVyYXRpb246 dmFsdWVdOwogfQogCiBmbG9hdCBQbGF0Zm9ybUNBQW5pbWF0aW9uTWFjOjpzcGVlZCgpIGNvbnN0 CiB7Ci0gICAgcmV0dXJuIFttX2FuaW1hdGlvbi5nZXQoKSBzcGVlZF07CisgICAgcmV0dXJuIFtt X2FuaW1hdGlvbiBzcGVlZF07CiB9CiAKIHZvaWQgUGxhdGZvcm1DQUFuaW1hdGlvbk1hYzo6c2V0 U3BlZWQoZmxvYXQgdmFsdWUpCiB7Ci0gICAgW21fYW5pbWF0aW9uLmdldCgpIHNldFNwZWVkOnZh bHVlXTsKKyAgICBbbV9hbmltYXRpb24gc2V0U3BlZWQ6dmFsdWVdOwogfQogCiBDRlRpbWVJbnRl cnZhbCBQbGF0Zm9ybUNBQW5pbWF0aW9uTWFjOjp0aW1lT2Zmc2V0KCkgY29uc3QKIHsKLSAgICBy ZXR1cm4gW21fYW5pbWF0aW9uLmdldCgpIHRpbWVPZmZzZXRdOworICAgIHJldHVybiBbbV9hbmlt YXRpb24gdGltZU9mZnNldF07CiB9CiAKIHZvaWQgUGxhdGZvcm1DQUFuaW1hdGlvbk1hYzo6c2V0 VGltZU9mZnNldChDRlRpbWVJbnRlcnZhbCB2YWx1ZSkKIHsKLSAgICBbbV9hbmltYXRpb24uZ2V0 KCkgc2V0VGltZU9mZnNldDp2YWx1ZV07CisgICAgW21fYW5pbWF0aW9uIHNldFRpbWVPZmZzZXQ6 dmFsdWVdOwogfQogCiBmbG9hdCBQbGF0Zm9ybUNBQW5pbWF0aW9uTWFjOjpyZXBlYXRDb3VudCgp IGNvbnN0CiB7Ci0gICAgcmV0dXJuIFttX2FuaW1hdGlvbi5nZXQoKSByZXBlYXRDb3VudF07Cisg ICAgcmV0dXJuIFttX2FuaW1hdGlvbiByZXBlYXRDb3VudF07CiB9CiAKIHZvaWQgUGxhdGZvcm1D QUFuaW1hdGlvbk1hYzo6c2V0UmVwZWF0Q291bnQoZmxvYXQgdmFsdWUpCiB7Ci0gICAgW21fYW5p bWF0aW9uLmdldCgpIHNldFJlcGVhdENvdW50OnZhbHVlXTsKKyAgICBbbV9hbmltYXRpb24gc2V0 UmVwZWF0Q291bnQ6dmFsdWVdOwogfQogCiBib29sIFBsYXRmb3JtQ0FBbmltYXRpb25NYWM6OmF1 dG9yZXZlcnNlcygpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIFttX2FuaW1hdGlvbi5nZXQoKSBhdXRv cmV2ZXJzZXNdOworICAgIHJldHVybiBbbV9hbmltYXRpb24gYXV0b3JldmVyc2VzXTsKIH0KIAog dm9pZCBQbGF0Zm9ybUNBQW5pbWF0aW9uTWFjOjpzZXRBdXRvcmV2ZXJzZXMoYm9vbCB2YWx1ZSkK IHsKLSAgICBbbV9hbmltYXRpb24uZ2V0KCkgc2V0QXV0b3JldmVyc2VzOnZhbHVlXTsKKyAgICBb bV9hbmltYXRpb24gc2V0QXV0b3JldmVyc2VzOnZhbHVlXTsKIH0KIAogUGxhdGZvcm1DQUFuaW1h dGlvbjo6RmlsbE1vZGVUeXBlIFBsYXRmb3JtQ0FBbmltYXRpb25NYWM6OmZpbGxNb2RlKCkgY29u c3QKIHsKLSAgICByZXR1cm4gZnJvbUNBRmlsbE1vZGVUeXBlKFttX2FuaW1hdGlvbi5nZXQoKSBm aWxsTW9kZV0pOworICAgIHJldHVybiBmcm9tQ0FGaWxsTW9kZVR5cGUoW21fYW5pbWF0aW9uIGZp bGxNb2RlXSk7CiB9CiAKIHZvaWQgUGxhdGZvcm1DQUFuaW1hdGlvbk1hYzo6c2V0RmlsbE1vZGUo RmlsbE1vZGVUeXBlIHZhbHVlKQogewotICAgIFttX2FuaW1hdGlvbi5nZXQoKSBzZXRGaWxsTW9k ZTp0b0NBRmlsbE1vZGVUeXBlKHZhbHVlKV07CisgICAgW21fYW5pbWF0aW9uIHNldEZpbGxNb2Rl OnRvQ0FGaWxsTW9kZVR5cGUodmFsdWUpXTsKIH0KIAogdm9pZCBQbGF0Zm9ybUNBQW5pbWF0aW9u TWFjOjpzZXRUaW1pbmdGdW5jdGlvbihjb25zdCBUaW1pbmdGdW5jdGlvbiogdmFsdWUsIGJvb2wg cmV2ZXJzZSkKIHsKLSAgICBbbV9hbmltYXRpb24uZ2V0KCkgc2V0VGltaW5nRnVuY3Rpb246dG9D QU1lZGlhVGltaW5nRnVuY3Rpb24odmFsdWUsIHJldmVyc2UpXTsKKyAgICBbbV9hbmltYXRpb24g c2V0VGltaW5nRnVuY3Rpb246dG9DQU1lZGlhVGltaW5nRnVuY3Rpb24odmFsdWUsIHJldmVyc2Up XTsKIH0KIAogdm9pZCBQbGF0Zm9ybUNBQW5pbWF0aW9uTWFjOjpjb3B5VGltaW5nRnVuY3Rpb25G cm9tKGNvbnN0IFBsYXRmb3JtQ0FBbmltYXRpb24qIHZhbHVlKQogewotICAgIFttX2FuaW1hdGlv bi5nZXQoKSBzZXRUaW1pbmdGdW5jdGlvbjpbdG9QbGF0Zm9ybUNBQW5pbWF0aW9uTWFjKHZhbHVl KS0+bV9hbmltYXRpb24uZ2V0KCkgdGltaW5nRnVuY3Rpb25dXTsKKyAgICBbbV9hbmltYXRpb24g c2V0VGltaW5nRnVuY3Rpb246W3RvUGxhdGZvcm1DQUFuaW1hdGlvbk1hYyh2YWx1ZSktPm1fYW5p bWF0aW9uLmdldCgpIHRpbWluZ0Z1bmN0aW9uXV07CiB9CiAKIGJvb2wgUGxhdGZvcm1DQUFuaW1h dGlvbk1hYzo6aXNSZW1vdmVkT25Db21wbGV0aW9uKCkgY29uc3QKIHsKLSAgICByZXR1cm4gW21f YW5pbWF0aW9uLmdldCgpIGlzUmVtb3ZlZE9uQ29tcGxldGlvbl07CisgICAgcmV0dXJuIFttX2Fu aW1hdGlvbiBpc1JlbW92ZWRPbkNvbXBsZXRpb25dOwogfQogCiB2b2lkIFBsYXRmb3JtQ0FBbmlt YXRpb25NYWM6OnNldFJlbW92ZWRPbkNvbXBsZXRpb24oYm9vbCB2YWx1ZSkKIHsKLSAgICBbbV9h bmltYXRpb24uZ2V0KCkgc2V0UmVtb3ZlZE9uQ29tcGxldGlvbjp2YWx1ZV07CisgICAgW21fYW5p bWF0aW9uIHNldFJlbW92ZWRPbkNvbXBsZXRpb246dmFsdWVdOwogfQogCiBib29sIFBsYXRmb3Jt Q0FBbmltYXRpb25NYWM6OmlzQWRkaXRpdmUoKSBjb25zdAogewotICAgIHJldHVybiBbbV9hbmlt YXRpb24uZ2V0KCkgaXNBZGRpdGl2ZV07CisgICAgcmV0dXJuIFttX2FuaW1hdGlvbiBpc0FkZGl0 aXZlXTsKIH0KIAogdm9pZCBQbGF0Zm9ybUNBQW5pbWF0aW9uTWFjOjpzZXRBZGRpdGl2ZShib29s IHZhbHVlKQogewotICAgIFttX2FuaW1hdGlvbi5nZXQoKSBzZXRBZGRpdGl2ZTp2YWx1ZV07Cisg ICAgW21fYW5pbWF0aW9uIHNldEFkZGl0aXZlOnZhbHVlXTsKIH0KIAogUGxhdGZvcm1DQUFuaW1h dGlvbjo6VmFsdWVGdW5jdGlvblR5cGUgUGxhdGZvcm1DQUFuaW1hdGlvbk1hYzo6dmFsdWVGdW5j dGlvbigpIGNvbnN0CiB7Ci0gICAgQ0FWYWx1ZUZ1bmN0aW9uKiB2ZiA9IFttX2FuaW1hdGlvbi5n ZXQoKSB2YWx1ZUZ1bmN0aW9uXTsKKyAgICBDQVZhbHVlRnVuY3Rpb24qIHZmID0gW21fYW5pbWF0 aW9uIHZhbHVlRnVuY3Rpb25dOwogICAgIHJldHVybiBmcm9tQ0FWYWx1ZUZ1bmN0aW9uVHlwZShb dmYgbmFtZV0pOwogfQogCiB2b2lkIFBsYXRmb3JtQ0FBbmltYXRpb25NYWM6OnNldFZhbHVlRnVu Y3Rpb24oVmFsdWVGdW5jdGlvblR5cGUgdmFsdWUpCiB7Ci0gICAgW21fYW5pbWF0aW9uLmdldCgp IHNldFZhbHVlRnVuY3Rpb246W0NBVmFsdWVGdW5jdGlvbiBmdW5jdGlvbldpdGhOYW1lOnRvQ0FW YWx1ZUZ1bmN0aW9uVHlwZSh2YWx1ZSldXTsKKyAgICBbbV9hbmltYXRpb24gc2V0VmFsdWVGdW5j dGlvbjpbQ0FWYWx1ZUZ1bmN0aW9uIGZ1bmN0aW9uV2l0aE5hbWU6dG9DQVZhbHVlRnVuY3Rpb25U eXBlKHZhbHVlKV1dOwogfQogCiB2b2lkIFBsYXRmb3JtQ0FBbmltYXRpb25NYWM6OnNldEZyb21W YWx1ZShmbG9hdCB2YWx1ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhL21hYy9QbGF0Zm9ybUNBTGF5ZXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFjLm1tCmluZGV4IDQwNTgwZDk5 YmU2ZDU0ZmFiZGVkNjI1YWE1Zjc4ODRjMmYwMmQzYjIuLmFiNTE4Y2VjZmY0NTI4ZmI5NjdiMTRj MDk4YzRhZjYyMTk4ZWU5MzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhL21hYy9QbGF0Zm9ybUNBTGF5ZXJNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1BsYXRmb3JtQ0FMYXllck1hYy5tbQpAQCAtODYsOSAr ODYsNiBAQCBQbGF0Zm9ybUNBTGF5ZXIqIFBsYXRmb3JtQ0FMYXllcjo6cGxhdGZvcm1DQUxheWVy KHZvaWQqIHBsYXRmb3JtTGF5ZXIpCiAgICAgcmV0dXJuIHBsYXRmb3JtQ0FMYXllcjsKIH0KIAot Ly8gVGhpcyB2YWx1ZSBtdXN0IGJlIHRoZSBzYW1lIGFzIGluIFBsYXRmb3JtQ0FBbmltYXRpb25N YWMubW0KLXN0YXRpYyBOU1N0cmluZyAqIGNvbnN0IFdLTm9uWmVyb0JlZ2luVGltZUZsYWcgPSBA IldLUGxhdGZvcm1DQUFuaW1hdGlvbk5vblplcm9CZWdpblRpbWVGbGFnIjsKLQogc3RhdGljIGRv dWJsZSBtZWRpYVRpbWVUb0N1cnJlbnRUaW1lKENGVGltZUludGVydmFsIHQpCiB7CiAgICAgcmV0 dXJuIG1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgpICsgdCAtIENBQ3VycmVudE1lZGlhVGlt ZSgpOwpAQCAtMTExLDExICsxMDgsOCBAQCBzdGF0aWMgZG91YmxlIG1lZGlhVGltZVRvQ3VycmVu dFRpbWUoQ0ZUaW1lSW50ZXJ2YWwgdCkKICNpZiBQTEFURk9STShJT1MpCiAgICAgV2ViVGhyZWFk TG9jaygpOwogI2VuZGlmCi0gICAgLy8gaGFzTm9uWmVyb0JlZ2luVGltZSBpcyBzdG9yZWQgaW4g YSBrZXkgaW4gdGhlIGFuaW1hdGlvbgotICAgIGJvb2wgaGFzTm9uWmVyb0JlZ2luVGltZSA9IFtb YW5pbWF0aW9uIHZhbHVlRm9yS2V5OldLTm9uWmVyb0JlZ2luVGltZUZsYWddIGJvb2xWYWx1ZV07 CiAgICAgQ0ZUaW1lSW50ZXJ2YWwgc3RhcnRUaW1lOwotCi0gICAgaWYgKGhhc05vblplcm9CZWdp blRpbWUpIHsKKyAgICBpZiAoaGFzRXhwbGljaXRCZWdpblRpbWUoYW5pbWF0aW9uKSkgewogICAg ICAgICAvLyBXZSBkb24ndCBrbm93IHdoYXQgdGltZSBDQSB1c2VkIHRvIGNvbW1pdCB0aGUgYW5p bWF0aW9uLCBzbyBqdXN0IHVzZSB0aGUgY3VycmVudCB0aW1lCiAgICAgICAgIC8vIChldmVuIHRo b3VnaCB0aGlzIHdpbGwgYmUgc2xpZ2h0bHkgb2ZmKS4KICAgICAgICAgc3RhcnRUaW1lID0gbWVk aWFUaW1lVG9DdXJyZW50VGltZShDQUN1cnJlbnRNZWRpYVRpbWUoKSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLm1tIGIv U291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi5tbQpp bmRleCBkNTdmZmU0YzFiYmRkZGFiYTVhZmExMDcwNzJkYTU3NjVmN2UwZTRlLi4xYjg3YWU0YTYz YjUwZDM0MGEzNTRlZThjMWVkMTA0NTcxOWM4MWZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvbWFjL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24ubW0KQEAgLTg4NSw4 ICs4ODUsOCBAQCBSZW1vdGVMYXllclRyZWVUZXh0U3RyZWFtJiBSZW1vdGVMYXllclRyZWVUZXh0 U3RyZWFtOjpvcGVyYXRvcjw8KGNvbnN0IFBsYXRmb3JtQwogICAgIGlmIChhbmltYXRpb24ucmV2 ZXJzZVRpbWluZ0Z1bmN0aW9ucykKICAgICAgICAgZHVtcFByb3BlcnR5KHRzLCAicmV2ZXJzZVRp bWluZ0Z1bmN0aW9ucyIsIGFuaW1hdGlvbi5yZXZlcnNlVGltaW5nRnVuY3Rpb25zKTsKIAotICAg IGlmIChhbmltYXRpb24uaGFzTm9uWmVyb0JlZ2luVGltZSkKLSAgICAgICAgZHVtcFByb3BlcnR5 KHRzLCAiaGFzTm9uWmVyb0JlZ2luVGltZSIsIGFuaW1hdGlvbi5oYXNOb25aZXJvQmVnaW5UaW1l KTsKKyAgICBpZiAoYW5pbWF0aW9uLmhhc0V4cGxpY2l0QmVnaW5UaW1lKQorICAgICAgICBkdW1w UHJvcGVydHkodHMsICJoYXNFeHBsaWNpdEJlZ2luVGltZSIsIGFuaW1hdGlvbi5oYXNFeHBsaWNp dEJlZ2luVGltZSk7CiAKICAgICB0cyA8PCAiXG4iOwogICAgIHRzLmluY3JlYXNlSW5kZW50KCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1BsYXRm b3JtQ0FBbmltYXRpb25SZW1vdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9tYWMvUGxhdGZvcm1DQUFuaW1hdGlvblJlbW90ZS5oCmluZGV4IDg3N2EzZTlkMzNiZTg4ZGRj ZjY5OWUyODMxNjMxODkzZTkxOTlhNGEuLmZjMzFmZjA3ZDI5YWMzMzNmOWEzZWE5NGUyNmExN2Q3 MzMwNzM3MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9t YWMvUGxhdGZvcm1DQUFuaW1hdGlvblJlbW90ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9tYWMvUGxhdGZvcm1DQUFuaW1hdGlvblJlbW90ZS5oCkBAIC0yNTQsNyAr MjU0LDcgQEAgcHVibGljOgogICAgICAgICAgICAgLCByZW1vdmVkT25Db21wbGV0aW9uKHRydWUp CiAgICAgICAgICAgICAsIGFkZGl0aXZlKGZhbHNlKQogICAgICAgICAgICAgLCByZXZlcnNlVGlt aW5nRnVuY3Rpb25zKGZhbHNlKQotICAgICAgICAgICAgLCBoYXNOb25aZXJvQmVnaW5UaW1lKGZh bHNlKQorICAgICAgICAgICAgLCBoYXNFeHBsaWNpdEJlZ2luVGltZShmYWxzZSkKICAgICAgICAg ewogICAgICAgICB9CiAKQEAgLTI3Nyw3ICsyNzcsNyBAQCBwdWJsaWM6CiAgICAgICAgIGJvb2wg cmVtb3ZlZE9uQ29tcGxldGlvbjsKICAgICAgICAgYm9vbCBhZGRpdGl2ZTsKICAgICAgICAgYm9v bCByZXZlcnNlVGltaW5nRnVuY3Rpb25zOwotICAgICAgICBib29sIGhhc05vblplcm9CZWdpblRp bWU7CisgICAgICAgIGJvb2wgaGFzRXhwbGljaXRCZWdpblRpbWU7CiAKICAgICAgICAgLy8gRm9y IGJhc2ljIGFuaW1hdGlvbnMsIHRoZXNlIHZlY3RvcnMgaGF2ZSB0d28gZW50cmllcy4gRm9yIGtl eWZyYW1lIGFuaW1hdGlvbnMsIHR3byBvciBtb3JlLgogICAgICAgICAvLyB0aW1pbmdGdW5jdGlv bnMgaGFzIG4tMSBlbnRyaWVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBQW5pbWF0aW9uUmVtb3RlLm1tIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9QbGF0Zm9ybUNBQW5pbWF0aW9uUmVtb3RlLm1tCmlu ZGV4IDFhNDI4YjQ0YjE0ZDYwZWFlZTQ1MTVjOTVkYmI0MmIwZGFhZjU2YTcuLjJkZTgxNTRmMDQ1 MGI2MTUzZDdiYWNlYWQ2NjVlNGFiNjhiN2EyODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUGxhdGZvcm1DQUFuaW1hdGlvblJlbW90ZS5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1BsYXRmb3JtQ0FBbmltYXRp b25SZW1vdGUubW0KQEAgLTQ2LDcgKzQ2LDcgQEAgc3RhdGljIGRvdWJsZSBtZWRpYVRpbWVUb0N1 cnJlbnRUaW1lKENGVGltZUludGVydmFsIHQpCiAgICAgcmV0dXJuIG1vbm90b25pY2FsbHlJbmNy ZWFzaW5nVGltZSgpICsgdCAtIENBQ3VycmVudE1lZGlhVGltZSgpOwogfQogCi1zdGF0aWMgTlNT dHJpbmcgKiBjb25zdCBXS05vblplcm9CZWdpblRpbWVGbGFnID0gQCJXS1BsYXRmb3JtQ0FBbmlt YXRpb25Ob25aZXJvQmVnaW5UaW1lRmxhZyI7CitzdGF0aWMgTlNTdHJpbmcgKiBjb25zdCBXS0V4 cGxpY2l0QmVnaW5UaW1lRmxhZyA9IEAiV0tQbGF0Zm9ybUNBQW5pbWF0aW9uRXhwbGljaXRCZWdp blRpbWVGbGFnIjsKIAogQGludGVyZmFjZSBXS0FuaW1hdGlvbkRlbGVnYXRlIDogTlNPYmplY3Qg ewogICAgIEdyYXBoaWNzTGF5ZXI6OlBsYXRmb3JtTGF5ZXJJRCBfbGF5ZXJJRDsKQEAgLTY5LDEw ICs2OSwxMCBAQCBzdGF0aWMgTlNTdHJpbmcgKiBjb25zdCBXS05vblplcm9CZWdpblRpbWVGbGFn ID0gQCJXS1BsYXRmb3JtQ0FBbmltYXRpb25Ob25aZXJvQgogCiAtICh2b2lkKWFuaW1hdGlvbkRp ZFN0YXJ0OihDQUFuaW1hdGlvbiAqKWFuaW1hdGlvbgogewotICAgIGJvb2wgaGFzTm9uWmVyb0Jl Z2luVGltZSA9IFtbYW5pbWF0aW9uIHZhbHVlRm9yS2V5OldLTm9uWmVyb0JlZ2luVGltZUZsYWdd IGJvb2xWYWx1ZV07CisgICAgYm9vbCBoYXNFeHBsaWNpdEJlZ2luVGltZSA9IFtbYW5pbWF0aW9u IHZhbHVlRm9yS2V5OldLRXhwbGljaXRCZWdpblRpbWVGbGFnXSBib29sVmFsdWVdOwogICAgIENG VGltZUludGVydmFsIHN0YXJ0VGltZTsKIAotICAgIGlmIChoYXNOb25aZXJvQmVnaW5UaW1lKSB7 CisgICAgaWYgKGhhc0V4cGxpY2l0QmVnaW5UaW1lKSB7CiAgICAgICAgIC8vIFdlIGRvbid0IGtu b3cgd2hhdCB0aW1lIENBIHVzZWQgdG8gY29tbWl0IHRoZSBhbmltYXRpb24sIHNvIGp1c3QgdXNl IHRoZSBjdXJyZW50IHRpbWUKICAgICAgICAgLy8gKGV2ZW4gdGhvdWdoIHRoaXMgd2lsbCBiZSBz bGlnaHRseSBvZmYpLgogICAgICAgICBzdGFydFRpbWUgPSBtZWRpYVRpbWVUb0N1cnJlbnRUaW1l KENBQ3VycmVudE1lZGlhVGltZSgpKTsKQEAgLTE1Nyw3ICsxNTcsNyBAQCB2b2lkIFBsYXRmb3Jt Q0FBbmltYXRpb25SZW1vdGU6OlByb3BlcnRpZXM6OmVuY29kZShJUEM6OkFyZ3VtZW50RW5jb2Rl ciYgZW5jb2RlcgogICAgIGVuY29kZXIgPDwgcmVtb3ZlZE9uQ29tcGxldGlvbjsKICAgICBlbmNv ZGVyIDw8IGFkZGl0aXZlOwogICAgIGVuY29kZXIgPDwgcmV2ZXJzZVRpbWluZ0Z1bmN0aW9uczsK LSAgICBlbmNvZGVyIDw8IGhhc05vblplcm9CZWdpblRpbWU7CisgICAgZW5jb2RlciA8PCBoYXNF eHBsaWNpdEJlZ2luVGltZTsKICAgICAKICAgICBlbmNvZGVyIDw8IGtleVZhbHVlczsKICAgICBl bmNvZGVyIDw8IGtleVRpbWVzOwpAQCAtMjIxLDcgKzIyMSw3IEBAIGJvb2wgUGxhdGZvcm1DQUFu aW1hdGlvblJlbW90ZTo6UHJvcGVydGllczo6ZGVjb2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiBk ZWNvZGVyCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwcm9wZXJ0aWVzLnJldmVyc2VUaW1pbmdG dW5jdGlvbnMpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoIWRlY29kZXIuZGVj b2RlKHByb3BlcnRpZXMuaGFzTm9uWmVyb0JlZ2luVGltZSkpCisgICAgaWYgKCFkZWNvZGVyLmRl Y29kZShwcm9wZXJ0aWVzLmhhc0V4cGxpY2l0QmVnaW5UaW1lKSkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwcm9wZXJ0aWVzLmtleVZhbHVlcykpCkBA IC0zMDgsNyArMzA4LDcgQEAgdm9pZCBQbGF0Zm9ybUNBQW5pbWF0aW9uUmVtb3RlOjpzZXRCZWdp blRpbWUoQ0ZUaW1lSW50ZXJ2YWwgdmFsdWUpCiAgICAgLy8gdG8gdGhlIHRpbWUgYXQgd2hpY2gg aXQgZmlyZWQgYW5kIHdlIG5lZWQgdG8ga25vdyB3aGV0aGVyCiAgICAgLy8gb3Igbm90IGl0IHdh cyAwIHRvIGJlZ2luIHdpdGguCiAgICAgaWYgKHZhbHVlKQotICAgICAgICBtX3Byb3BlcnRpZXMu aGFzTm9uWmVyb0JlZ2luVGltZSA9IHZhbHVlOworICAgICAgICBtX3Byb3BlcnRpZXMuaGFzRXhw bGljaXRCZWdpblRpbWUgPSB2YWx1ZTsKIH0KIAogQ0ZUaW1lSW50ZXJ2YWwgUGxhdGZvcm1DQUFu aW1hdGlvblJlbW90ZTo6ZHVyYXRpb24oKSBjb25zdApAQCAtNzE4LDggKzcxOCw4IEBAIHN0YXRp YyB2b2lkIGFkZEFuaW1hdGlvblRvTGF5ZXIoQ0FMYXllciAqbGF5ZXIsIFJlbW90ZUxheWVyVHJl ZUhvc3QqIGxheWVyVHJlZUhvCiAgICAgaWYgKHByb3BlcnRpZXMudmFsdWVGdW5jdGlvbiAhPSBQ bGF0Zm9ybUNBQW5pbWF0aW9uOjpOb1ZhbHVlRnVuY3Rpb24pCiAgICAgICAgIFtjYUFuaW1hdGlv biBzZXRWYWx1ZUZ1bmN0aW9uOltDQVZhbHVlRnVuY3Rpb24gZnVuY3Rpb25XaXRoTmFtZTp0b0NB VmFsdWVGdW5jdGlvblR5cGUocHJvcGVydGllcy52YWx1ZUZ1bmN0aW9uKV1dOwogICAgIAotICAg IGlmIChwcm9wZXJ0aWVzLmhhc05vblplcm9CZWdpblRpbWUpCi0gICAgICAgIFtjYUFuaW1hdGlv bi5nZXQoKSAgc2V0VmFsdWU6QFlFUyBmb3JLZXk6V0tOb25aZXJvQmVnaW5UaW1lRmxhZ107Cisg ICAgaWYgKHByb3BlcnRpZXMuaGFzRXhwbGljaXRCZWdpblRpbWUpCisgICAgICAgIFtjYUFuaW1h dGlvbi5nZXQoKSAgc2V0VmFsdWU6QFlFUyBmb3JLZXk6V0tFeHBsaWNpdEJlZ2luVGltZUZsYWdd OwogICAgIAogICAgIGlmIChsYXllclRyZWVIb3N0KSB7CiAgICAgICAgIEdyYXBoaWNzTGF5ZXI6 OlBsYXRmb3JtTGF5ZXJJRCBsYXllcklEID0gUmVtb3RlTGF5ZXJUcmVlSG9zdDo6bGF5ZXJJRChs YXllcik7Cg==