209423 2020-03-23 06:44:16 -0700 [Web Animations] Refactor cancelDeclarativeAnimationsForElement and willDestroyRendererForElement on AnimationTimeline 2020-03-23 07:42:17 -0700 1 1 1 Unclassified WebKit Animations WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 graouts graouts dino esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan pdr webkit-bug-importer oldest_to_newest 1632818 0 graouts 2020-03-23 06:44:16 -0700 [Web Animations] Refactor cancelDeclarativeAnimationsForElement and willDestroyRendererForElement on AnimationTimeline 1632819 1 394259 graouts 2020-03-23 06:47:04 -0700 Created attachment 394259 Patch 1632822 2 394259 koivisto 2020-03-23 06:54:56 -0700 Comment on attachment 394259 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394259&action=review > Source/WebCore/animation/WebAnimation.h:96 > + virtual void cancel(Silently = Silently::No); Maybe Silently could be renamed to something more descriptive? enum class CancelType { CompletePromises, DontCompletePromises } or whatever the appropriate terminology is? 1632826 3 graouts 2020-03-23 07:05:49 -0700 (In reply to Antti Koivisto from comment #2) > Comment on attachment 394259 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=394259&action=review > > > Source/WebCore/animation/WebAnimation.h:96 > > + virtual void cancel(Silently = Silently::No); > > Maybe Silently could be renamed to something more descriptive? > > enum class CancelType { CompletePromises, DontCompletePromises } > > or whatever the appropriate terminology is? After discussing directly with Antti, we figured that because this did not involve just promise rejection, but dispatch of the "cancel" event and timeline notification, that the "Silently" term was not so bad after all and would keep it as-is. 1632845 4 graouts 2020-03-23 07:41:14 -0700 Committed r258842: <https://trac.webkit.org/changeset/258842> 1632846 5 webkit-bug-importer 2020-03-23 07:42:17 -0700 <rdar://problem/60774456> 394259 2020-03-23 06:47:04 -0700 2020-03-23 06:54:56 -0700 Patch bug-209423-20200323144703.patch text/plain 8884 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4ODM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODEyMjQ0NDc4MDY0NTcy NWUxYmJjODI0Y2UzNDFmYWI5MTFlNWYxNS4uMTgzZjA0MTkyZThkYmUzNDE4ZTJjZjdiNDY3ODEw ZGEzZmNiNGVlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIwLTAzLTIzICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYiBBbmltYXRpb25z XSBSZWZhY3RvciBjYW5jZWxEZWNsYXJhdGl2ZUFuaW1hdGlvbnNGb3JFbGVtZW50IGFuZCB3aWxs RGVzdHJveVJlbmRlcmVyRm9yRWxlbWVudCBvbiBBbmltYXRpb25UaW1lbGluZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5NDIzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIG1ldGhvZHMgY2FuY2Vs RGVjbGFyYXRpdmVBbmltYXRpb25zRm9yRWxlbWVudCBhbmQgd2lsbERlc3Ryb3lSZW5kZXJlckZv ckVsZW1lbnQgb24gQW5pbWF0aW9uVGltZWxpbmUgZGlkIHRoZSBzYW1lCisgICAgICAgIHRoaW5n IHNhdmUgZm9yIHRoZSBhcmd1bWVudCBwYXNzZWQgdG8gV2ViQW5pbWF0aW9uOjpjYW5jZWwoKS4g V2Ugbm93IHJlZmFjdG9yIHRob3NlIHR3byBtZXRob2RzIGludG8gYSBzaW5nbGUKKyAgICAgICAg Y2FuY2VsRGVjbGFyYXRpdmVBbmltYXRpb25zRm9yRWxlbWVudCBtZXRob2Qgd2l0aCBhbiBhcmd1 bWVudCB0byBzZXQgd2hldGhlciBjYW5jZWxhdGlvbiBzaG91bGQgYmUgc2lsZW50LgorICAgICAg ICBBcyBhIHJlc3VsdCwgd2UgYWxzbyBjaGFuZ2UgV2ViQW5pbWF0aW9uOjpjYW5jZWwoKSB0byBo YXZlIGEgc2luZ2xlIGZsYXZvciBpbnN0ZWFkIG9mIG9uZSB3aXRob3V0IGFuIGFyZ3VtZW50IGFu ZCBvbmUKKyAgICAgICAgd2l0aCB0aGUgc2lsZW50IGFyZ3VtZW50LgorCisgICAgICAgIE5vIHRl c3QgYmVjYXVzZSB0aGVyZSBpcyBubyBjaGFuZ2UgaW4gdmlzaWJsZSBiZWhhdmlvci4KKworICAg ICAgICAqIGFuaW1hdGlvbi9BbmltYXRpb25UaW1lbGluZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpBbmltYXRpb25UaW1lbGluZTo6ZWxlbWVudFdhc1JlbW92ZWQpOgorICAgICAgICAoV2ViQ29y ZTo6QW5pbWF0aW9uVGltZWxpbmU6OmNhbmNlbERlY2xhcmF0aXZlQW5pbWF0aW9uc0ZvckVsZW1l bnQpOgorICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uVGltZWxpbmU6OndpbGxEZXN0cm95UmVu ZGVyZXJGb3JFbGVtZW50KTogRGVsZXRlZC4KKyAgICAgICAgKiBhbmltYXRpb24vQW5pbWF0aW9u VGltZWxpbmUuaDoKKyAgICAgICAgKiBhbmltYXRpb24vRGVjbGFyYXRpdmVBbmltYXRpb24uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RGVjbGFyYXRpdmVBbmltYXRpb246OmNhbmNlbCk6CisgICAg ICAgICogYW5pbWF0aW9uL0RlY2xhcmF0aXZlQW5pbWF0aW9uLmg6CisgICAgICAgICogYW5pbWF0 aW9uL1dlYkFuaW1hdGlvbi5jcHA6CisgICAgICAgICogYW5pbWF0aW9uL1dlYkFuaW1hdGlvbi5o OgorICAgICAgICAqIHJlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlVXBkYXRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlVXBkYXRlcjo6dGVhckRvd25SZW5kZXJlcnMpOgor CiAyMDIwLTAzLTIzICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAg ICAgW1dlYiBBbmltYXRpb25zXSBFbGVtZW50QW5pbWF0aW9uUmFyZURhdGEgaXMgY3JlYXRlZCB0 b28gZnJlcXVlbnRseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0FuaW1h dGlvblRpbWVsaW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9BbmltYXRpb25UaW1l bGluZS5jcHAKaW5kZXggMTJhODgwYzM4ODZhNmM1NDFhMzUwNDljOTEwNjI1NDgwOTk5NTk5Yy4u NjU0MGRkYWM2MDYyZWZhNzEzMDY4YWYwZjFhNDc2ODc3MDExZGVmZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0FuaW1hdGlvblRpbWVsaW5lLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9hbmltYXRpb24vQW5pbWF0aW9uVGltZWxpbmUuY3BwCkBAIC0xODgsMjUgKzE4OCw5 IEBAIHZvaWQgQW5pbWF0aW9uVGltZWxpbmU6OnJlbW92ZUNTU0FuaW1hdGlvbkNyZWF0ZWRCeU1h cmt1cChFbGVtZW50JiBlbGVtZW50LCBDU1NBCiAgICAgfQogfQogCi12b2lkIEFuaW1hdGlvblRp bWVsaW5lOjp3aWxsRGVzdHJveVJlbmRlcmVyRm9yRWxlbWVudChFbGVtZW50JiBlbGVtZW50KQot ewotICAgIGlmIChhdXRvKiB0cmFuc2l0aW9ucyA9IGVsZW1lbnQudHJhbnNpdGlvbnMoKSkgewot ICAgICAgICBmb3IgKGF1dG8mIGNzc1RyYW5zaXRpb24gOiAqdHJhbnNpdGlvbnMpCi0gICAgICAg ICAgICBjc3NUcmFuc2l0aW9uLT5jYW5jZWwoV2ViQW5pbWF0aW9uOjpTaWxlbnRseTo6WWVzKTsK LSAgICB9Ci0KLSAgICBpZiAoYXV0byogY3NzQW5pbWF0aW9ucyA9IGVsZW1lbnQuY3NzQW5pbWF0 aW9ucygpKSB7Ci0gICAgICAgIGZvciAoYXV0byYgY3NzQW5pbWF0aW9uIDogKmNzc0FuaW1hdGlv bnMpIHsKLSAgICAgICAgICAgIGlmIChpczxDU1NBbmltYXRpb24+KGNzc0FuaW1hdGlvbikpCi0g ICAgICAgICAgICAgICAgcmVtb3ZlQ1NTQW5pbWF0aW9uQ3JlYXRlZEJ5TWFya3VwKGVsZW1lbnQs IGRvd25jYXN0PENTU0FuaW1hdGlvbj4oKmNzc0FuaW1hdGlvbikpOwotICAgICAgICAgICAgY3Nz QW5pbWF0aW9uLT5jYW5jZWwoV2ViQW5pbWF0aW9uOjpTaWxlbnRseTo6WWVzKTsKLSAgICAgICAg fQotICAgIH0KLX0KLQogdm9pZCBBbmltYXRpb25UaW1lbGluZTo6ZWxlbWVudFdhc1JlbW92ZWQo RWxlbWVudCYgZWxlbWVudCkKIHsKLSAgICB3aWxsRGVzdHJveVJlbmRlcmVyRm9yRWxlbWVudChl bGVtZW50KTsKKyAgICBjYW5jZWxEZWNsYXJhdGl2ZUFuaW1hdGlvbnNGb3JFbGVtZW50KGVsZW1l bnQsIFdlYkFuaW1hdGlvbjo6U2lsZW50bHk6Olllcyk7CiB9CiAKIHZvaWQgQW5pbWF0aW9uVGlt ZWxpbmU6OnJlbW92ZUFuaW1hdGlvbnNGb3JFbGVtZW50KEVsZW1lbnQmIGVsZW1lbnQpCkBAIC0y MjEsMTggKzIwNSwxOCBAQCB2b2lkIEFuaW1hdGlvblRpbWVsaW5lOjp3aWxsQ2hhbmdlUmVuZGVy ZXJGb3JFbGVtZW50KEVsZW1lbnQmIGVsZW1lbnQpCiAgICAgICAgIGFuaW1hdGlvbi0+d2lsbENo YW5nZVJlbmRlcmVyKCk7CiB9CiAKLXZvaWQgQW5pbWF0aW9uVGltZWxpbmU6OmNhbmNlbERlY2xh cmF0aXZlQW5pbWF0aW9uc0ZvckVsZW1lbnQoRWxlbWVudCYgZWxlbWVudCkKK3ZvaWQgQW5pbWF0 aW9uVGltZWxpbmU6OmNhbmNlbERlY2xhcmF0aXZlQW5pbWF0aW9uc0ZvckVsZW1lbnQoRWxlbWVu dCYgZWxlbWVudCwgV2ViQW5pbWF0aW9uOjpTaWxlbnRseSBzaWxlbnRseSkKIHsKICAgICBpZiAo YXV0byogdHJhbnNpdGlvbnMgPSBlbGVtZW50LnRyYW5zaXRpb25zKCkpIHsKICAgICAgICAgZm9y IChhdXRvJiBjc3NUcmFuc2l0aW9uIDogKnRyYW5zaXRpb25zKQotICAgICAgICAgICAgY3NzVHJh bnNpdGlvbi0+Y2FuY2VsKCk7CisgICAgICAgICAgICBjc3NUcmFuc2l0aW9uLT5jYW5jZWwoc2ls ZW50bHkpOwogICAgIH0KIAogICAgIGlmIChhdXRvKiBjc3NBbmltYXRpb25zID0gZWxlbWVudC5j c3NBbmltYXRpb25zKCkpIHsKICAgICAgICAgZm9yIChhdXRvJiBjc3NBbmltYXRpb24gOiAqY3Nz QW5pbWF0aW9ucykgewogICAgICAgICAgICAgaWYgKGlzPENTU0FuaW1hdGlvbj4oY3NzQW5pbWF0 aW9uKSkKICAgICAgICAgICAgICAgICByZW1vdmVDU1NBbmltYXRpb25DcmVhdGVkQnlNYXJrdXAo ZWxlbWVudCwgZG93bmNhc3Q8Q1NTQW5pbWF0aW9uPigqY3NzQW5pbWF0aW9uKSk7Ci0gICAgICAg ICAgICBjc3NBbmltYXRpb24tPmNhbmNlbCgpOworICAgICAgICAgICAgY3NzQW5pbWF0aW9uLT5j YW5jZWwoc2lsZW50bHkpOwogICAgICAgICB9CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYW5pbWF0aW9uL0FuaW1hdGlvblRpbWVsaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9h bmltYXRpb24vQW5pbWF0aW9uVGltZWxpbmUuaAppbmRleCBjZTlmYmEyMGVmOWQ1MTNhNmIxMGQz YjE5OGU0ODUwY2I5Yjg1ODkxLi5kZjFhZTFlNmU4YTcyYmY1ODRkNTIzNzcwZDQwOWI3NTcyN2Fi MTBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQW5pbWF0aW9uVGltZWxp bmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQW5pbWF0aW9uVGltZWxpbmUuaApA QCAtNjQsOCArNjQsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCByZW1vdmVBbmltYXRpb25zRm9yRWxl bWVudChFbGVtZW50Jik7CiAKICAgICB2b2lkIHdpbGxDaGFuZ2VSZW5kZXJlckZvckVsZW1lbnQo RWxlbWVudCYpOwotICAgIHZvaWQgd2lsbERlc3Ryb3lSZW5kZXJlckZvckVsZW1lbnQoRWxlbWVu dCYpOwotICAgIHZvaWQgY2FuY2VsRGVjbGFyYXRpdmVBbmltYXRpb25zRm9yRWxlbWVudChFbGVt ZW50Jik7CisgICAgdm9pZCBjYW5jZWxEZWNsYXJhdGl2ZUFuaW1hdGlvbnNGb3JFbGVtZW50KEVs ZW1lbnQmLCBXZWJBbmltYXRpb246OlNpbGVudGx5KTsKIAogICAgIHZpcnR1YWwgdm9pZCBhbmlt YXRpb25XYXNBZGRlZFRvRWxlbWVudChXZWJBbmltYXRpb24mLCBFbGVtZW50Jik7CiAgICAgdmly dHVhbCB2b2lkIGFuaW1hdGlvbldhc1JlbW92ZWRGcm9tRWxlbWVudChXZWJBbmltYXRpb24mLCBF bGVtZW50Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vRGVjbGFyYXRp dmVBbmltYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0RlY2xhcmF0aXZlQW5p bWF0aW9uLmNwcAppbmRleCA3MmM2Y2YyNmY5MGQ1MGQwMGM0ZmI4MTI2ZjBmOTg4YzBjZDY1NTg1 Li40MjBmNzY5OTViODc3ZWMwZTMzM2Y0ZTkzMzNhYjY2NjQ4MTg5NDJlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9hbmltYXRpb24vRGVjbGFyYXRpdmVBbmltYXRpb24uY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9EZWNsYXJhdGl2ZUFuaW1hdGlvbi5jcHAKQEAgLTIwOCw3 ICsyMDgsNyBAQCB2b2lkIERlY2xhcmF0aXZlQW5pbWF0aW9uOjpzZXRUaW1lbGluZShSZWZQdHI8 QW5pbWF0aW9uVGltZWxpbmU+JiYgbmV3VGltZWxpbmUpCiAgICAgV2ViQW5pbWF0aW9uOjpzZXRU aW1lbGluZShXVEZNb3ZlKG5ld1RpbWVsaW5lKSk7CiB9CiAKLXZvaWQgRGVjbGFyYXRpdmVBbmlt YXRpb246OmNhbmNlbCgpCit2b2lkIERlY2xhcmF0aXZlQW5pbWF0aW9uOjpjYW5jZWwoU2lsZW50 bHkgc2lsZW50bHkpCiB7CiAgICAgYXV0byBjYW5jZWxhdGlvblRpbWUgPSAwX3M7CiAgICAgaWYg KGF1dG8qIGFuaW1hdGlvbkVmZmVjdCA9IGVmZmVjdCgpKSB7CkBAIC0yMTYsNyArMjE2LDcgQEAg dm9pZCBEZWNsYXJhdGl2ZUFuaW1hdGlvbjo6Y2FuY2VsKCkKICAgICAgICAgICAgIGNhbmNlbGF0 aW9uVGltZSA9ICphY3RpdmVUaW1lOwogICAgIH0KIAotICAgIFdlYkFuaW1hdGlvbjo6Y2FuY2Vs KCk7CisgICAgV2ViQW5pbWF0aW9uOjpjYW5jZWwoc2lsZW50bHkpOwogCiAgICAgaW52YWxpZGF0 ZURPTUV2ZW50cyhjYW5jZWxhdGlvblRpbWUpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYW5pbWF0aW9uL0RlY2xhcmF0aXZlQW5pbWF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9hbmlt YXRpb24vRGVjbGFyYXRpdmVBbmltYXRpb24uaAppbmRleCBiYWFmOTI1NTE5ZTdiZmNlZWQ2ZjRj ZmI2ZWM5Njk5YTNjZDlkMTYwLi45OGU3OGFhMjc4ZTEyN2UxNDJkMzBlZDhiNGY2MGM4ODFiZDNj NGM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vRGVjbGFyYXRpdmVBbmlt YXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vRGVjbGFyYXRpdmVBbmltYXRp b24uaApAQCAtNjMsNyArNjMsNyBAQCBwdWJsaWM6CiAgICAgRXhjZXB0aW9uT3I8dm9pZD4gYmlu ZGluZ3NQYXVzZSgpIG92ZXJyaWRlOwogCiAgICAgdm9pZCBzZXRUaW1lbGluZShSZWZQdHI8QW5p bWF0aW9uVGltZWxpbmU+JiYpIGZpbmFsOwotICAgIHZvaWQgY2FuY2VsKCkgZmluYWw7CisgICAg dm9pZCBjYW5jZWwoU2lsZW50bHkgPSBTaWxlbnRseTo6Tm8pIGZpbmFsOwogCiAgICAgdm9pZCB0 aWNrKCkgb3ZlcnJpZGU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9X ZWJBbmltYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL1dlYkFuaW1hdGlvbi5j cHAKaW5kZXggNzhiMzMzYWM0OTA4ODcwM2U3N2RmYmEyNjViYjdlMjJiOTQ4ZGVhNy4uNjUyMTlh YzZjOGM5YzQ3MzM5NDk2OTgzYWYyNGViYTMzZTg0ZjAyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYW5pbWF0aW9uL1dlYkFuaW1hdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYW5p bWF0aW9uL1dlYkFuaW1hdGlvbi5jcHAKQEAgLTYwNCwxMiArNjA0LDYgQEAgU2Vjb25kcyBXZWJB bmltYXRpb246OmVmZmVjdEVuZFRpbWUoKSBjb25zdAogICAgIHJldHVybiBtX2VmZmVjdCA/IG1f ZWZmZWN0LT5lbmRUaW1lKCkgOiAwX3M7CiB9CiAKLXZvaWQgV2ViQW5pbWF0aW9uOjpjYW5jZWwo KQotewotICAgIGNhbmNlbChTaWxlbnRseTo6Tm8pOwotICAgIGludmFsaWRhdGVFZmZlY3QoKTsK LX0KLQogdm9pZCBXZWJBbmltYXRpb246OmNhbmNlbChTaWxlbnRseSBzaWxlbnRseSkKIHsKICAg ICBMT0dfV0lUSF9TVFJFQU0oQW5pbWF0aW9ucywgc3RyZWFtIDw8ICJXZWJBbmltYXRpb24gIiA8 PCB0aGlzIDw8ICIgY2FuY2VsKHNpbGVudGx5ICIgPDwgKHNpbGVudGx5ID09IFNpbGVudGx5OjpZ ZXMpIDw8ICIpIChjdXJyZW50IHRpbWUgaXMgIiA8PCBjdXJyZW50VGltZSgpIDw8ICIpIik7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vV2ViQW5pbWF0aW9uLmggYi9Tb3Vy Y2UvV2ViQ29yZS9hbmltYXRpb24vV2ViQW5pbWF0aW9uLmgKaW5kZXggYjE0MDA1YTBjZWI2Y2Rk NjE1OGMzYWRmOGJhN2NlZGFlYWYxY2E3Mi4uZDcwYzJmMjAwNDFjYTI3NWVhZjBmNDdjOTA3ZjQ2 ZTU4ZDc3NTI4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL1dlYkFuaW1h dGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9XZWJBbmltYXRpb24uaApAQCAt OTMsOCArOTMsNyBAQCBwdWJsaWM6CiAgICAgdXNpbmcgRmluaXNoZWRQcm9taXNlID0gRE9NUHJv bWlzZVByb3h5V2l0aFJlc29sdmVDYWxsYmFjazxJRExJbnRlcmZhY2U8V2ViQW5pbWF0aW9uPj47 CiAgICAgRmluaXNoZWRQcm9taXNlJiBmaW5pc2hlZCgpIHsgcmV0dXJuIG1fZmluaXNoZWRQcm9t aXNlLmdldCgpOyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgY2FuY2VsKCk7Ci0gICAgdm9pZCBjYW5j ZWwoU2lsZW50bHkpOworICAgIHZpcnR1YWwgdm9pZCBjYW5jZWwoU2lsZW50bHkgPSBTaWxlbnRs eTo6Tm8pOwogICAgIEV4Y2VwdGlvbk9yPHZvaWQ+IGZpbmlzaCgpOwogICAgIEV4Y2VwdGlvbk9y PHZvaWQ+IHBsYXkoKTsKICAgICB2b2lkIHVwZGF0ZVBsYXliYWNrUmF0ZShkb3VibGUpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVVcGRh dGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlVXBk YXRlci5jcHAKaW5kZXggMTk1NDkxYWIxMzVlZTAxMzA3OTJkYjc2ODYyNzI2ZDI2ODcxNmFkYS4u YTViN2ZiY2JhZDNlODE4OWIyZmRkNjQwYWQ2YTRhY2FkYjg2Mjk2ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVVcGRhdGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZVVwZGF0ZXIuY3Bw CkBAIC01NzMsOSArNTczLDkgQEAgdm9pZCBSZW5kZXJUcmVlVXBkYXRlcjo6dGVhckRvd25SZW5k ZXJlcnMoRWxlbWVudCYgcm9vdCwgVGVhcmRvd25UeXBlIHRlYXJkb3duVHkKICAgICAgICAgICAg IGNhc2UgVGVhcmRvd25UeXBlOjpSZW5kZXJlclVwZGF0ZUNhbmNlbGluZ0FuaW1hdGlvbnM6CiAg ICAgICAgICAgICAgICAgaWYgKHRpbWVsaW5lKSB7CiAgICAgICAgICAgICAgICAgICAgIGlmIChk b2N1bWVudC5yZW5kZXJUcmVlQmVpbmdEZXN0cm95ZWQoKSkKLSAgICAgICAgICAgICAgICAgICAg ICAgIHRpbWVsaW5lLT53aWxsRGVzdHJveVJlbmRlcmVyRm9yRWxlbWVudChlbGVtZW50KTsKKyAg ICAgICAgICAgICAgICAgICAgICAgIHRpbWVsaW5lLT5jYW5jZWxEZWNsYXJhdGl2ZUFuaW1hdGlv bnNGb3JFbGVtZW50KGVsZW1lbnQsIFdlYkFuaW1hdGlvbjo6U2lsZW50bHk6Olllcyk7CiAgICAg ICAgICAgICAgICAgICAgIGVsc2UgaWYgKHRlYXJkb3duVHlwZSA9PSBUZWFyZG93blR5cGU6OlJl bmRlcmVyVXBkYXRlQ2FuY2VsaW5nQW5pbWF0aW9ucykKLSAgICAgICAgICAgICAgICAgICAgICAg IHRpbWVsaW5lLT5jYW5jZWxEZWNsYXJhdGl2ZUFuaW1hdGlvbnNGb3JFbGVtZW50KGVsZW1lbnQp OworICAgICAgICAgICAgICAgICAgICAgICAgdGltZWxpbmUtPmNhbmNlbERlY2xhcmF0aXZlQW5p bWF0aW9uc0ZvckVsZW1lbnQoZWxlbWVudCwgV2ViQW5pbWF0aW9uOjpTaWxlbnRseTo6Tm8pOwog ICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBhbmltYXRpb25Db250cm9sbGVyLmNh bmNlbEFuaW1hdGlvbnMoZWxlbWVudCk7CiAgICAgICAgICAgICAgICAgYnJlYWs7Cg==