190996 2018-10-27 13:59:05 -0700 [Web Animations] Move bindings methods requiring style flush from CSSAnimation to DeclarativeAnimation 2018-10-28 00:52:31 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 graouts graouts dino webkit-bug-importer oldest_to_newest 1472747 0 graouts 2018-10-27 13:59:05 -0700 [Web Animations] Move bindings methods requiring style flush from CSSAnimation to DeclarativeAnimation 1472748 1 353246 graouts 2018-10-27 14:01:39 -0700 Created attachment 353246 Patch 1472749 2 353246 dino 2018-10-27 14:04:09 -0700 Comment on attachment 353246 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=353246&action=review > Source/WebCore/animation/CSSAnimation.cpp:-126 > - auto currentTime = DeclarativeAnimation::bindingsCurrentTime(); > - if (currentTime) { > - if (auto* animationEffect = effect()) > - return std::max(0.0, std::min(currentTime.value(), animationEffect->timing()->activeDuration().milliseconds())); > - } > - return currentTime; is this logic in WebAnimation::bindingsCurrentTime? 1472750 3 graouts 2018-10-27 14:08:54 -0700 This code was actually not necessary. Will make a note in the ChangeLog when landing. 1472800 4 graouts 2018-10-28 00:51:50 -0700 Committed r237498: <https://trac.webkit.org/changeset/237498> 1472801 5 webkit-bug-importer 2018-10-28 00:52:31 -0700 <rdar://problem/45617858> 353246 2018-10-27 14:01:39 -0700 2018-10-27 14:04:09 -0700 Patch bug-190996-20181027230138.patch text/plain 10243 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3NDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGM5MzU3OWQ4OThjY2Fh MTc4MDg2ZTc3OWJhY2ZjMzk0NTY1NjQwOC4uNWRjZjM1ZTA4NGRjZWE4NTUzMzJmMzM3NjAzOTZm ZTc5NmI1NTMxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE4LTEwLTI3ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYiBBbmltYXRpb25z XSBNb3ZlIGJpbmRpbmdzIG1ldGhvZHMgcmVxdWlyaW5nIHN0eWxlIGZsdXNoIGZyb20gQ1NTQW5p bWF0aW9uIHRvIERlY2xhcmF0aXZlQW5pbWF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTA5OTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZpbmcgYWxsIG9mIHRoZSBJREwgYmluZGluZ3MgbWV0 aG9kcyB0aGF0IHJlcXVpcmUgZmx1c2hpbmcgc3R5bGUgZnJvbSBDU1NBbmltYXRpb24gdG8gaXRz IHN1cGVyY2xhc3MKKyAgICAgICAgRGVjbGFyYXRpdmVBbmltYXRpb24gc28gd2UgZm9sbG93IHRo ZSBzYW1lIHJvdXRlIGluIENTU1RyYW5zaXRpb24uCisKKyAgICAgICAgKiBhbmltYXRpb24vQ1NT QW5pbWF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0FuaW1hdGlvbjo6YmluZGluZ3NQ bGF5KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU0FuaW1hdGlvbjo6YmluZGluZ3NQYXVzZSk6Cisg ICAgICAgIChXZWJDb3JlOjpDU1NBbmltYXRpb246OmJpbmRpbmdzU3RhcnRUaW1lIGNvbnN0KTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkNTU0FuaW1hdGlvbjo6c2V0QmluZGluZ3NTdGFy dFRpbWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Q1NTQW5pbWF0aW9uOjpiaW5kaW5n c0N1cnJlbnRUaW1lIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkNTU0FuaW1h dGlvbjo6c2V0QmluZGluZ3NDdXJyZW50VGltZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpDU1NBbmltYXRpb246OmJpbmRpbmdzUGxheVN0YXRlIGNvbnN0KTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OkNTU0FuaW1hdGlvbjo6YmluZGluZ3NQZW5kaW5nIGNvbnN0KTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OkNTU0FuaW1hdGlvbjo6YmluZGluZ3NSZWFkeSk6IERlbGV0 ZWQuCisgICAgICAgIChXZWJDb3JlOjpDU1NBbmltYXRpb246OmJpbmRpbmdzRmluaXNoZWQpOiBE ZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Q1NTQW5pbWF0aW9uOjpmbHVzaFBlbmRpbmdTdHls ZUNoYW5nZXMgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGFuaW1hdGlvbi9DU1NBbmltYXRp b24uaDoKKyAgICAgICAgKiBhbmltYXRpb24vRGVjbGFyYXRpdmVBbmltYXRpb24uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RGVjbGFyYXRpdmVBbmltYXRpb246OmJpbmRpbmdzU3RhcnRUaW1lIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkRlY2xhcmF0aXZlQW5pbWF0aW9uOjpzZXRCaW5kaW5n c1N0YXJ0VGltZSk6CisgICAgICAgIChXZWJDb3JlOjpEZWNsYXJhdGl2ZUFuaW1hdGlvbjo6Ymlu ZGluZ3NDdXJyZW50VGltZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpEZWNsYXJhdGl2ZUFu aW1hdGlvbjo6c2V0QmluZGluZ3NDdXJyZW50VGltZSk6CisgICAgICAgIChXZWJDb3JlOjpEZWNs YXJhdGl2ZUFuaW1hdGlvbjo6YmluZGluZ3NQbGF5U3RhdGUgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6RGVjbGFyYXRpdmVBbmltYXRpb246OmJpbmRpbmdzUGVuZGluZyBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpEZWNsYXJhdGl2ZUFuaW1hdGlvbjo6YmluZGluZ3NSZWFkeSk6CisgICAg ICAgIChXZWJDb3JlOjpEZWNsYXJhdGl2ZUFuaW1hdGlvbjo6YmluZGluZ3NGaW5pc2hlZCk6Cisg ICAgICAgIChXZWJDb3JlOjpEZWNsYXJhdGl2ZUFuaW1hdGlvbjo6YmluZGluZ3NQbGF5KToKKyAg ICAgICAgKFdlYkNvcmU6OkRlY2xhcmF0aXZlQW5pbWF0aW9uOjpiaW5kaW5nc1BhdXNlKToKKyAg ICAgICAgKFdlYkNvcmU6OkRlY2xhcmF0aXZlQW5pbWF0aW9uOjpmbHVzaFBlbmRpbmdTdHlsZUNo YW5nZXMgY29uc3QpOgorICAgICAgICAqIGFuaW1hdGlvbi9EZWNsYXJhdGl2ZUFuaW1hdGlvbi5o OgorCiAyMDE4LTEwLTI2ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAg ICAgICAgW1dlYiBBbmltYXRpb25zXSBSZW1vdmUgdXNlbGVzcyBpbnRlcm5hbHMgbWV0aG9kcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0NTU0FuaW1hdGlvbi5jcHAgYi9T b3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQ1NTQW5pbWF0aW9uLmNwcAppbmRleCBmMzg3YjdjZDg3 NDVhZTBjZjAwOTU3MzliOWNlMjQ1MDk3MDMzMDUxLi4zZmM0ODEwZjczZmM2ODcwMjA5OGU5NTk0 ZTQ0ZjMyN2NjMGMxMzcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQ1NT QW5pbWF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQ1NTQW5pbWF0aW9u LmNwcApAQCAtMTAzLDgxICsxMDMsMTYgQEAgdm9pZCBDU1NBbmltYXRpb246OnN5bmNQcm9wZXJ0 aWVzV2l0aEJhY2tpbmdBbmltYXRpb24oKQogICAgIHVuc3VzcGVuZEVmZmVjdEludmFsaWRhdGlv bigpOwogfQogCi1zdGQ6Om9wdGlvbmFsPGRvdWJsZT4gQ1NTQW5pbWF0aW9uOjpiaW5kaW5nc1N0 YXJ0VGltZSgpIGNvbnN0Ci17Ci0gICAgZmx1c2hQZW5kaW5nU3R5bGVDaGFuZ2VzKCk7Ci0gICAg cmV0dXJuIERlY2xhcmF0aXZlQW5pbWF0aW9uOjpiaW5kaW5nc1N0YXJ0VGltZSgpOwotfQotCi12 b2lkIENTU0FuaW1hdGlvbjo6c2V0QmluZGluZ3NTdGFydFRpbWUoc3RkOjpvcHRpb25hbDxkb3Vi bGU+IHN0YXJ0VGltZSkKLXsKLSAgICBmbHVzaFBlbmRpbmdTdHlsZUNoYW5nZXMoKTsKLSAgICBy ZXR1cm4gRGVjbGFyYXRpdmVBbmltYXRpb246OnNldEJpbmRpbmdzU3RhcnRUaW1lKHN0YXJ0VGlt ZSk7Ci19Ci0KLXN0ZDo6b3B0aW9uYWw8ZG91YmxlPiBDU1NBbmltYXRpb246OmJpbmRpbmdzQ3Vy cmVudFRpbWUoKSBjb25zdAotewotICAgIGZsdXNoUGVuZGluZ1N0eWxlQ2hhbmdlcygpOwotICAg IGF1dG8gY3VycmVudFRpbWUgPSBEZWNsYXJhdGl2ZUFuaW1hdGlvbjo6YmluZGluZ3NDdXJyZW50 VGltZSgpOwotICAgIGlmIChjdXJyZW50VGltZSkgewotICAgICAgICBpZiAoYXV0byogYW5pbWF0 aW9uRWZmZWN0ID0gZWZmZWN0KCkpCi0gICAgICAgICAgICByZXR1cm4gc3RkOjptYXgoMC4wLCBz dGQ6Om1pbihjdXJyZW50VGltZS52YWx1ZSgpLCBhbmltYXRpb25FZmZlY3QtPnRpbWluZygpLT5h Y3RpdmVEdXJhdGlvbigpLm1pbGxpc2Vjb25kcygpKSk7Ci0gICAgfQotICAgIHJldHVybiBjdXJy ZW50VGltZTsKLX0KLQotRXhjZXB0aW9uT3I8dm9pZD4gQ1NTQW5pbWF0aW9uOjpzZXRCaW5kaW5n c0N1cnJlbnRUaW1lKHN0ZDo6b3B0aW9uYWw8ZG91YmxlPiBjdXJyZW50VGltZSkKLXsKLSAgICBm bHVzaFBlbmRpbmdTdHlsZUNoYW5nZXMoKTsKLSAgICByZXR1cm4gRGVjbGFyYXRpdmVBbmltYXRp b246OnNldEJpbmRpbmdzQ3VycmVudFRpbWUoY3VycmVudFRpbWUpOwotfQotCi1XZWJBbmltYXRp b246OlBsYXlTdGF0ZSBDU1NBbmltYXRpb246OmJpbmRpbmdzUGxheVN0YXRlKCkgY29uc3QKLXsK LSAgICBmbHVzaFBlbmRpbmdTdHlsZUNoYW5nZXMoKTsKLSAgICByZXR1cm4gRGVjbGFyYXRpdmVB bmltYXRpb246OmJpbmRpbmdzUGxheVN0YXRlKCk7Ci19Ci0KLWJvb2wgQ1NTQW5pbWF0aW9uOjpi aW5kaW5nc1BlbmRpbmcoKSBjb25zdAotewotICAgIGZsdXNoUGVuZGluZ1N0eWxlQ2hhbmdlcygp OwotICAgIHJldHVybiBEZWNsYXJhdGl2ZUFuaW1hdGlvbjo6YmluZGluZ3NQZW5kaW5nKCk7Ci19 Ci0KLVdlYkFuaW1hdGlvbjo6UmVhZHlQcm9taXNlJiBDU1NBbmltYXRpb246OmJpbmRpbmdzUmVh ZHkoKQotewotICAgIGZsdXNoUGVuZGluZ1N0eWxlQ2hhbmdlcygpOwotICAgIHJldHVybiBEZWNs YXJhdGl2ZUFuaW1hdGlvbjo6YmluZGluZ3NSZWFkeSgpOwotfQotCi1XZWJBbmltYXRpb246OkZp bmlzaGVkUHJvbWlzZSYgQ1NTQW5pbWF0aW9uOjpiaW5kaW5nc0ZpbmlzaGVkKCkKLXsKLSAgICBm bHVzaFBlbmRpbmdTdHlsZUNoYW5nZXMoKTsKLSAgICByZXR1cm4gRGVjbGFyYXRpdmVBbmltYXRp b246OmJpbmRpbmdzRmluaXNoZWQoKTsKLX0KLQogRXhjZXB0aW9uT3I8dm9pZD4gQ1NTQW5pbWF0 aW9uOjpiaW5kaW5nc1BsYXkoKQogewotICAgIGZsdXNoUGVuZGluZ1N0eWxlQ2hhbmdlcygpOwog ICAgIG1fc3RpY2t5UGF1c2VkID0gZmFsc2U7CiAgICAgcmV0dXJuIERlY2xhcmF0aXZlQW5pbWF0 aW9uOjpiaW5kaW5nc1BsYXkoKTsKIH0KIAogRXhjZXB0aW9uT3I8dm9pZD4gQ1NTQW5pbWF0aW9u OjpiaW5kaW5nc1BhdXNlKCkKIHsKLSAgICBmbHVzaFBlbmRpbmdTdHlsZUNoYW5nZXMoKTsKICAg ICBtX3N0aWNreVBhdXNlZCA9IHRydWU7CiAgICAgcmV0dXJuIERlY2xhcmF0aXZlQW5pbWF0aW9u OjpiaW5kaW5nc1BhdXNlKCk7CiB9CiAKLXZvaWQgQ1NTQW5pbWF0aW9uOjpmbHVzaFBlbmRpbmdT dHlsZUNoYW5nZXMoKSBjb25zdAotewotICAgIGlmIChhdXRvKiBhbmltYXRpb25FZmZlY3QgPSBl ZmZlY3QoKSkgewotICAgICAgICBpZiAoaXM8S2V5ZnJhbWVFZmZlY3RSZWFkT25seT4oYW5pbWF0 aW9uRWZmZWN0KSkgewotICAgICAgICAgICAgaWYgKGF1dG8qIHRhcmdldCA9IGRvd25jYXN0PEtl eWZyYW1lRWZmZWN0UmVhZE9ubHk+KGFuaW1hdGlvbkVmZmVjdCktPnRhcmdldCgpKQotICAgICAg ICAgICAgICAgIHRhcmdldC0+ZG9jdW1lbnQoKS51cGRhdGVTdHlsZUlmTmVlZGVkKCk7Ci0gICAg ICAgIH0KLSAgICB9Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9DU1NBbmltYXRpb24uaCBiL1NvdXJjZS9XZWJDb3JlL2Fu aW1hdGlvbi9DU1NBbmltYXRpb24uaAppbmRleCAwN2E0MmUxODhkNjUxNWY4YTk3ZjdjZTQ3M2Rm YzViY2MwNTBiMDFlLi42MzYwOTcxNjg0OWYxMDhiN2RmOWYwZDlkMDUwY2Y0ODJjODEwZTgzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQ1NTQW5pbWF0aW9uLmgKKysrIGIv U291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0NTU0FuaW1hdGlvbi5oCkBAIC00MywxNCArNDMsNiBA QCBwdWJsaWM6CiAgICAgY29uc3QgU3RyaW5nJiBhbmltYXRpb25OYW1lKCkgY29uc3QgeyByZXR1 cm4gbV9hbmltYXRpb25OYW1lOyB9CiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIHVuYW5pbWF0ZWRT dHlsZSgpIGNvbnN0IHsgcmV0dXJuICptX3VuYW5pbWF0ZWRTdHlsZTsgfQogCi0gICAgc3RkOjpv cHRpb25hbDxkb3VibGU+IGJpbmRpbmdzU3RhcnRUaW1lKCkgY29uc3QgZmluYWw7Ci0gICAgdm9p ZCBzZXRCaW5kaW5nc1N0YXJ0VGltZShzdGQ6Om9wdGlvbmFsPGRvdWJsZT4pIGZpbmFsOwotICAg IHN0ZDo6b3B0aW9uYWw8ZG91YmxlPiBiaW5kaW5nc0N1cnJlbnRUaW1lKCkgY29uc3QgZmluYWw7 Ci0gICAgRXhjZXB0aW9uT3I8dm9pZD4gc2V0QmluZGluZ3NDdXJyZW50VGltZShzdGQ6Om9wdGlv bmFsPGRvdWJsZT4pIGZpbmFsOwotICAgIFdlYkFuaW1hdGlvbjo6UGxheVN0YXRlIGJpbmRpbmdz UGxheVN0YXRlKCkgY29uc3QgZmluYWw7Ci0gICAgYm9vbCBiaW5kaW5nc1BlbmRpbmcoKSBjb25z dCBmaW5hbDsKLSAgICBXZWJBbmltYXRpb246OlJlYWR5UHJvbWlzZSYgYmluZGluZ3NSZWFkeSgp IGZpbmFsOwotICAgIFdlYkFuaW1hdGlvbjo6RmluaXNoZWRQcm9taXNlJiBiaW5kaW5nc0Zpbmlz aGVkKCkgZmluYWw7CiAgICAgRXhjZXB0aW9uT3I8dm9pZD4gYmluZGluZ3NQbGF5KCkgZmluYWw7 CiAgICAgRXhjZXB0aW9uT3I8dm9pZD4gYmluZGluZ3NQYXVzZSgpIGZpbmFsOwogCkBAIC02MCw4 ICs1Miw2IEBAIHByb3RlY3RlZDoKIHByaXZhdGU6CiAgICAgQ1NTQW5pbWF0aW9uKEVsZW1lbnQm LCBjb25zdCBBbmltYXRpb24mLCBjb25zdCBSZW5kZXJTdHlsZSYpOwogCi0gICAgdm9pZCBmbHVz aFBlbmRpbmdTdHlsZUNoYW5nZXMoKSBjb25zdDsKLQogICAgIFN0cmluZyBtX2FuaW1hdGlvbk5h bWU7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0eWxlPiBtX3VuYW5pbWF0ZWRTdHlsZTsK ICAgICBib29sIG1fc3RpY2t5UGF1c2VkIHsgZmFsc2UgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2FuaW1hdGlvbi9EZWNsYXJhdGl2ZUFuaW1hdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9hbmltYXRpb24vRGVjbGFyYXRpdmVBbmltYXRpb24uY3BwCmluZGV4IDhhNzRiOGFkMTllOWRm ZTkxYjg4MzkwYTBmMmI2NDYyYmJhYmVkZTUuLjUyYzllYWZjMzFmODFlYjY0OTg5ZmQwNGMwMzE1 Y2EyZTFkYjAwMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9EZWNsYXJh dGl2ZUFuaW1hdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0RlY2xhcmF0 aXZlQW5pbWF0aW9uLmNwcApAQCAtODQsNiArODQsNzYgQEAgdm9pZCBEZWNsYXJhdGl2ZUFuaW1h dGlvbjo6c3luY1Byb3BlcnRpZXNXaXRoQmFja2luZ0FuaW1hdGlvbigpCiB7CiB9CiAKK3N0ZDo6 b3B0aW9uYWw8ZG91YmxlPiBEZWNsYXJhdGl2ZUFuaW1hdGlvbjo6YmluZGluZ3NTdGFydFRpbWUo KSBjb25zdAoreworICAgIGZsdXNoUGVuZGluZ1N0eWxlQ2hhbmdlcygpOworICAgIHJldHVybiBX ZWJBbmltYXRpb246OmJpbmRpbmdzU3RhcnRUaW1lKCk7Cit9CisKK3ZvaWQgRGVjbGFyYXRpdmVB bmltYXRpb246OnNldEJpbmRpbmdzU3RhcnRUaW1lKHN0ZDo6b3B0aW9uYWw8ZG91YmxlPiBzdGFy dFRpbWUpCit7CisgICAgZmx1c2hQZW5kaW5nU3R5bGVDaGFuZ2VzKCk7CisgICAgcmV0dXJuIFdl YkFuaW1hdGlvbjo6c2V0QmluZGluZ3NTdGFydFRpbWUoc3RhcnRUaW1lKTsKK30KKworc3RkOjpv cHRpb25hbDxkb3VibGU+IERlY2xhcmF0aXZlQW5pbWF0aW9uOjpiaW5kaW5nc0N1cnJlbnRUaW1l KCkgY29uc3QKK3sKKyAgICBmbHVzaFBlbmRpbmdTdHlsZUNoYW5nZXMoKTsKKyAgICByZXR1cm4g V2ViQW5pbWF0aW9uOjpiaW5kaW5nc0N1cnJlbnRUaW1lKCk7Cit9CisKK0V4Y2VwdGlvbk9yPHZv aWQ+IERlY2xhcmF0aXZlQW5pbWF0aW9uOjpzZXRCaW5kaW5nc0N1cnJlbnRUaW1lKHN0ZDo6b3B0 aW9uYWw8ZG91YmxlPiBjdXJyZW50VGltZSkKK3sKKyAgICBmbHVzaFBlbmRpbmdTdHlsZUNoYW5n ZXMoKTsKKyAgICByZXR1cm4gV2ViQW5pbWF0aW9uOjpzZXRCaW5kaW5nc0N1cnJlbnRUaW1lKGN1 cnJlbnRUaW1lKTsKK30KKworV2ViQW5pbWF0aW9uOjpQbGF5U3RhdGUgRGVjbGFyYXRpdmVBbmlt YXRpb246OmJpbmRpbmdzUGxheVN0YXRlKCkgY29uc3QKK3sKKyAgICBmbHVzaFBlbmRpbmdTdHls ZUNoYW5nZXMoKTsKKyAgICByZXR1cm4gV2ViQW5pbWF0aW9uOjpiaW5kaW5nc1BsYXlTdGF0ZSgp OworfQorCitib29sIERlY2xhcmF0aXZlQW5pbWF0aW9uOjpiaW5kaW5nc1BlbmRpbmcoKSBjb25z dAoreworICAgIGZsdXNoUGVuZGluZ1N0eWxlQ2hhbmdlcygpOworICAgIHJldHVybiBXZWJBbmlt YXRpb246OmJpbmRpbmdzUGVuZGluZygpOworfQorCitXZWJBbmltYXRpb246OlJlYWR5UHJvbWlz ZSYgRGVjbGFyYXRpdmVBbmltYXRpb246OmJpbmRpbmdzUmVhZHkoKQoreworICAgIGZsdXNoUGVu ZGluZ1N0eWxlQ2hhbmdlcygpOworICAgIHJldHVybiBXZWJBbmltYXRpb246OmJpbmRpbmdzUmVh ZHkoKTsKK30KKworV2ViQW5pbWF0aW9uOjpGaW5pc2hlZFByb21pc2UmIERlY2xhcmF0aXZlQW5p bWF0aW9uOjpiaW5kaW5nc0ZpbmlzaGVkKCkKK3sKKyAgICBmbHVzaFBlbmRpbmdTdHlsZUNoYW5n ZXMoKTsKKyAgICByZXR1cm4gV2ViQW5pbWF0aW9uOjpiaW5kaW5nc0ZpbmlzaGVkKCk7Cit9CisK K0V4Y2VwdGlvbk9yPHZvaWQ+IERlY2xhcmF0aXZlQW5pbWF0aW9uOjpiaW5kaW5nc1BsYXkoKQor eworICAgIGZsdXNoUGVuZGluZ1N0eWxlQ2hhbmdlcygpOworICAgIHJldHVybiBXZWJBbmltYXRp b246OmJpbmRpbmdzUGxheSgpOworfQorCitFeGNlcHRpb25Pcjx2b2lkPiBEZWNsYXJhdGl2ZUFu aW1hdGlvbjo6YmluZGluZ3NQYXVzZSgpCit7CisgICAgZmx1c2hQZW5kaW5nU3R5bGVDaGFuZ2Vz KCk7CisgICAgcmV0dXJuIFdlYkFuaW1hdGlvbjo6YmluZGluZ3NQYXVzZSgpOworfQorCit2b2lk IERlY2xhcmF0aXZlQW5pbWF0aW9uOjpmbHVzaFBlbmRpbmdTdHlsZUNoYW5nZXMoKSBjb25zdAor eworICAgIGlmIChhdXRvKiBhbmltYXRpb25FZmZlY3QgPSBlZmZlY3QoKSkgeworICAgICAgICBp ZiAoaXM8S2V5ZnJhbWVFZmZlY3RSZWFkT25seT4oYW5pbWF0aW9uRWZmZWN0KSkgeworICAgICAg ICAgICAgaWYgKGF1dG8qIHRhcmdldCA9IGRvd25jYXN0PEtleWZyYW1lRWZmZWN0UmVhZE9ubHk+ KGFuaW1hdGlvbkVmZmVjdCktPnRhcmdldCgpKQorICAgICAgICAgICAgICAgIHRhcmdldC0+ZG9j dW1lbnQoKS51cGRhdGVTdHlsZUlmTmVlZGVkKCk7CisgICAgICAgIH0KKyAgICB9Cit9CisKIHZv aWQgRGVjbGFyYXRpdmVBbmltYXRpb246OnNldFRpbWVsaW5lKFJlZlB0cjxBbmltYXRpb25UaW1l bGluZT4mJiBuZXdUaW1lbGluZSkKIHsKICAgICBpZiAodGltZWxpbmUoKSAmJiAhbmV3VGltZWxp bmUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vRGVjbGFyYXRpdmVBbmlt YXRpb24uaCBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9EZWNsYXJhdGl2ZUFuaW1hdGlvbi5o CmluZGV4IGUxMDM2MDhmZTVlNmZjODY5NDM5YTU1MmI3Y2U0MDgwOTFlNTUxNzEuLjE1NDAzODk0 YzYxMmQ3YzhlYTVhNzViZmIzYTY4NjdjNmY0ODJkNzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2FuaW1hdGlvbi9EZWNsYXJhdGl2ZUFuaW1hdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2FuaW1hdGlvbi9EZWNsYXJhdGl2ZUFuaW1hdGlvbi5oCkBAIC00Nyw2ICs0NywxNyBAQCBwdWJs aWM6CiAgICAgdm9pZCBzZXRCYWNraW5nQW5pbWF0aW9uKGNvbnN0IEFuaW1hdGlvbiYpOwogICAg IHZvaWQgaW52YWxpZGF0ZURPTUV2ZW50cyhTZWNvbmRzIGVsYXBzZWRUaW1lID0gMF9zKTsKIAor ICAgIHN0ZDo6b3B0aW9uYWw8ZG91YmxlPiBiaW5kaW5nc1N0YXJ0VGltZSgpIGNvbnN0IGZpbmFs OworICAgIHZvaWQgc2V0QmluZGluZ3NTdGFydFRpbWUoc3RkOjpvcHRpb25hbDxkb3VibGU+KSBm aW5hbDsKKyAgICBzdGQ6Om9wdGlvbmFsPGRvdWJsZT4gYmluZGluZ3NDdXJyZW50VGltZSgpIGNv bnN0IGZpbmFsOworICAgIEV4Y2VwdGlvbk9yPHZvaWQ+IHNldEJpbmRpbmdzQ3VycmVudFRpbWUo c3RkOjpvcHRpb25hbDxkb3VibGU+KSBmaW5hbDsKKyAgICBXZWJBbmltYXRpb246OlBsYXlTdGF0 ZSBiaW5kaW5nc1BsYXlTdGF0ZSgpIGNvbnN0IGZpbmFsOworICAgIGJvb2wgYmluZGluZ3NQZW5k aW5nKCkgY29uc3QgZmluYWw7CisgICAgV2ViQW5pbWF0aW9uOjpSZWFkeVByb21pc2UmIGJpbmRp bmdzUmVhZHkoKSBmaW5hbDsKKyAgICBXZWJBbmltYXRpb246OkZpbmlzaGVkUHJvbWlzZSYgYmlu ZGluZ3NGaW5pc2hlZCgpIGZpbmFsOworICAgIEV4Y2VwdGlvbk9yPHZvaWQ+IGJpbmRpbmdzUGxh eSgpIG92ZXJyaWRlOworICAgIEV4Y2VwdGlvbk9yPHZvaWQ+IGJpbmRpbmdzUGF1c2UoKSBvdmVy cmlkZTsKKwogICAgIHZvaWQgc2V0VGltZWxpbmUoUmVmUHRyPEFuaW1hdGlvblRpbWVsaW5lPiYm KSBmaW5hbDsKICAgICB2b2lkIGNhbmNlbCgpIGZpbmFsOwogCkBAIC01Nyw2ICs2OCw3IEBAIHBy b3RlY3RlZDoKICAgICB2aXJ0dWFsIHZvaWQgc3luY1Byb3BlcnRpZXNXaXRoQmFja2luZ0FuaW1h dGlvbigpOwogCiBwcml2YXRlOgorICAgIHZvaWQgZmx1c2hQZW5kaW5nU3R5bGVDaGFuZ2VzKCkg Y29uc3Q7CiAgICAgQW5pbWF0aW9uRWZmZWN0UmVhZE9ubHk6OlBoYXNlIHBoYXNlV2l0aG91dEVm ZmVjdCgpIGNvbnN0OwogICAgIHZvaWQgZW5xdWV1ZURPTUV2ZW50KGNvbnN0IEF0b21pY1N0cmlu ZyYsIFNlY29uZHMpOwogICAgIHZvaWQgcmVtb3ZlKCkgZmluYWw7Cg==