190257 2018-10-03 12:06:40 -0700 [Web Animations] REGRESSION: setting 'animation-name: none' after a 'fill: forwards' animation has completed does not revert to the unanimated style 2018-10-06 07:54:32 -0700 1 1 1 Unclassified WebKit Animations Safari Technology Preview Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=190307 InRadar P2 Normal --- 1 graouts graouts cdumez cgarcia dino ews-watchlist ryanhaddad tsavell webkit-bug-importer youennf oldest_to_newest 1466145 0 graouts 2018-10-03 12:06:40 -0700 Setting 'animation-name: none' after a 'fill: forwards' animation has completed does not revert to the unanimated style. 1466146 1 graouts 2018-10-03 12:06:54 -0700 <rdar://problem/41341473> 1466148 2 351541 graouts 2018-10-03 12:13:52 -0700 Created attachment 351541 Patch 1466149 3 351541 dino 2018-10-03 12:17:34 -0700 Comment on attachment 351541 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=351541&action=review > Source/WebCore/animation/AnimationTimeline.cpp:479 > ASSERT(animation); If this is always non-null, can the parameter be a Ref<>? > Source/WebCore/animation/DeclarativeAnimation.h:45 > + Element& target() const { return m_target; } Can this be const Element&? > LayoutTests/animations/animation-fill-forwards-removal.html:20 > + assert_equals(getComputedStyle(target).marginLeft, "100px", "The target element has style values from the final keyframe of its animation."); Have events always fired after we update the final style? I guess so. 1466150 4 graouts 2018-10-03 12:21:31 -0700 (In reply to Dean Jackson from comment #3) > Comment on attachment 351541 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=351541&action=review > > > Source/WebCore/animation/AnimationTimeline.cpp:479 > > ASSERT(animation); > > If this is always non-null, can the parameter be a Ref<>? I'll look into it. > > Source/WebCore/animation/DeclarativeAnimation.h:45 > > + Element& target() const { return m_target; } > > Can this be const Element&? I'll look into it. > > LayoutTests/animations/animation-fill-forwards-removal.html:20 > > + assert_equals(getComputedStyle(target).marginLeft, "100px", "The target element has style values from the final keyframe of its animation."); > > Have events always fired after we update the final style? I guess so. Yes. 1466170 5 graouts 2018-10-03 13:54:24 -0700 Committed r236809: <https://trac.webkit.org/changeset/236809> 1466560 6 tsavell 2018-10-04 16:02:26 -0700 Looks like after https://trac.webkit.org/changeset/236809/webkit imported/mozilla/css-transitions/test_event-dispatch.html has become a flakey timeout. Confirmed using command: run-webkit-tests --root testbuild-236809 imported/mozilla/css-transitions/test_event-dispatch.html --iterations 5000 -f running this on 236809 leads to a low number of timeout, running it on the previous built revision 236806 yields no timeouts. History: https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=imported%2Fmozilla%2Fcss-transitions%2Ftest_event-dispatch.html 1466866 7 youennf 2018-10-06 07:51:27 -0700 Reopening to attach new patch. 1466867 8 351723 youennf 2018-10-06 07:51:28 -0700 Created attachment 351723 Patch 1466868 9 youennf 2018-10-06 07:54:32 -0700 (In reply to youenn fablet from comment #8) > Created attachment 351723 [details] > Patch Bad upload... 351541 2018-10-03 12:13:52 -0700 2018-10-06 07:51:25 -0700 Patch bug-190257-20181003211350.patch text/plain 6046 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2Nzg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTc3ZmQ5OWU5OTgzM2Zh OTI2MmMyMjFmYzY3MjdjZTM5NGRiZmEwMC4uYmU2YTMwOTA5MGRmZWJlN2FhMjYwNjA3OWFhOTY4 YjAxYzM3ZmQyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTEwLTAzICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYiBBbmltYXRpb25z XSBSRUdSRVNTSU9OOiBzZXR0aW5nICdhbmltYXRpb24tbmFtZTogbm9uZScgYWZ0ZXIgYSAnZmls bDogZm9yd2FyZHMnIGFuaW1hdGlvbiBoYXMgY29tcGxldGVkIGRvZXMgbm90IHJldmVydCB0byB0 aGUgdW5hbmltYXRlZCBzdHlsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTkwMjU3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MTM0MTQ3Mz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBhbmlt YXRpb25zL2FuaW1hdGlvbi1maWxsLWZvcndhcmRzLXJlbW92YWwuaHRtbAorCisgICAgICAgIFdo aWxlIHdlIHJlbW92ZWQgYSBkZWNsYXJhdGl2ZSBhbmltYXRpb24gdGhhdCB3YXMgbm8gbG9uZ2Vy IHRhcmdldHRpbmcgaXRzIGVsZW1lbnQsIHdlIHdlcmUgbm90IHJlbW92aW5nIGl0IGZyb20gdGhl IGRlY2xhcmF0aXZlIGFuaW1hdGlvbiBtYXBzCisgICAgICAgIG9uIHRoZSB0aW1lbGluZSwgd2hp Y2ggbWVhbnMgdGhhdCB0aGUgYW5pbWF0aW9uIHdvdWxkIHN0aWxsIGJlIHBpY2tlZCB1cCB3aGVu IHJlc29sdmluZyBzdHlsZXMuIFdlIG5vdyBub3RpZnkgdGhlIHRpbWVsaW5lIHRoYXQgdGhlIGFu aW1hdGlvbgorICAgICAgICB3YXMgZGV0YWNoZWQgZnJvbSB0aGUgZWxlbWVudC4gVGhpcyBwcmVz ZXJ2ZXMgdGhlIERlY2xhcmF0aXZlQW5pbWF0aW9uIHJlbGF0aW9uc2hpcCByZXR1cm5pbmcgdGhl IGVsZW1lbnQgYXMgaXRzIGVmZmVjdCdzIHRhcmdldCBhbmQgdGhlIGRvY3VtZW50CisgICAgICAg IHRpbWVsaW5lIGFzIGl0cyB0aW1lbGluZSwgYnV0IHRoZSBkb2N1bWVudCB0aW1lbGluZSB3aWxs IG5vIGxvbmdlciBzZWUgdGhpcyBhbmltYXRpb24gYXMgdGFyZ2V0aW5nIHRoaXMgZWxlbWVudC4K KworICAgICAgICAqIGFuaW1hdGlvbi9BbmltYXRpb25UaW1lbGluZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpBbmltYXRpb25UaW1lbGluZTo6Y2FuY2VsT3JSZW1vdmVEZWNsYXJhdGl2ZUFuaW1h dGlvbik6CisgICAgICAgICogYW5pbWF0aW9uL0RlY2xhcmF0aXZlQW5pbWF0aW9uLmg6CisgICAg ICAgIChXZWJDb3JlOjpEZWNsYXJhdGl2ZUFuaW1hdGlvbjo6dGFyZ2V0IGNvbnN0KToKKwogMjAx OC0xMC0wMiAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBDb3B5 aW5nIGNvbnRlbnQgd2l0aCBzaGFkb3cgRE9NIGRvZXNuJ3QgY29weSBhbnkgY29udGVudHMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9BbmltYXRpb25UaW1lbGluZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQW5pbWF0aW9uVGltZWxpbmUuY3BwCmluZGV4IDM0 MmIyODM1NDgwZTA5YmI3Zjg1ZDMxZTFkZWM5MjdlNjg4ODVmMzAuLmE2NTFhMGI0NjljMDkyYWMy ZTdmMTVjNDI3Nzg3NTFlYTg3NzI2ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FuaW1h dGlvbi9BbmltYXRpb25UaW1lbGluZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9u L0FuaW1hdGlvblRpbWVsaW5lLmNwcApAQCAtNDc3LDE0ICs0NzcsOCBAQCB2b2lkIEFuaW1hdGlv blRpbWVsaW5lOjp1cGRhdGVDU1NUcmFuc2l0aW9uc0ZvckVsZW1lbnQoRWxlbWVudCYgZWxlbWVu dCwgY29uc3QgUgogdm9pZCBBbmltYXRpb25UaW1lbGluZTo6Y2FuY2VsT3JSZW1vdmVEZWNsYXJh dGl2ZUFuaW1hdGlvbihSZWZQdHI8RGVjbGFyYXRpdmVBbmltYXRpb24+IGFuaW1hdGlvbikKIHsK ICAgICBBU1NFUlQoYW5pbWF0aW9uKTsKLSAgICBpZiAoYXV0byogZWZmZWN0ID0gYW5pbWF0aW9u LT5lZmZlY3QoKSkgewotICAgICAgICBhdXRvIHBoYXNlID0gZWZmZWN0LT5waGFzZSgpOwotICAg ICAgICBpZiAocGhhc2UgIT0gQW5pbWF0aW9uRWZmZWN0UmVhZE9ubHk6OlBoYXNlOjpJZGxlICYm IHBoYXNlICE9IEFuaW1hdGlvbkVmZmVjdFJlYWRPbmx5OjpQaGFzZTo6QWZ0ZXIpIHsKLSAgICAg ICAgICAgIGFuaW1hdGlvbi0+Y2FuY2VsKCk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAg IH0KLSAgICB9Ci0KKyAgICBhbmltYXRpb24tPmNhbmNlbCgpOworICAgIGFuaW1hdGlvbldhc1Jl bW92ZWRGcm9tRWxlbWVudCgqYW5pbWF0aW9uLCBhbmltYXRpb24tPnRhcmdldCgpKTsKICAgICBy ZW1vdmVBbmltYXRpb24oYW5pbWF0aW9uLnJlbGVhc2VOb25OdWxsKCkpOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vRGVjbGFyYXRpdmVBbmltYXRpb24uaCBiL1Nv dXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9EZWNsYXJhdGl2ZUFuaW1hdGlvbi5oCmluZGV4IGQyOGRh ZGI0YjUzZmI5NjU2YzUwNmVjYmQ4MTgxMzFjYWVjY2NmZjYuLmUxMDM2MDhmZTVlNmZjODY5NDM5 YTU1MmI3Y2U0MDgwOTFlNTUxNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlv bi9EZWNsYXJhdGl2ZUFuaW1hdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9E ZWNsYXJhdGl2ZUFuaW1hdGlvbi5oCkBAIC00Miw2ICs0Miw3IEBAIHB1YmxpYzoKIAogICAgIGJv b2wgaXNEZWNsYXJhdGl2ZUFuaW1hdGlvbigpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIHRydWU7IH0K IAorICAgIEVsZW1lbnQmIHRhcmdldCgpIGNvbnN0IHsgcmV0dXJuIG1fdGFyZ2V0OyB9CiAgICAg Y29uc3QgQW5pbWF0aW9uJiBiYWNraW5nQW5pbWF0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9iYWNr aW5nQW5pbWF0aW9uOyB9CiAgICAgdm9pZCBzZXRCYWNraW5nQW5pbWF0aW9uKGNvbnN0IEFuaW1h dGlvbiYpOwogICAgIHZvaWQgaW52YWxpZGF0ZURPTUV2ZW50cyhTZWNvbmRzIGVsYXBzZWRUaW1l ID0gMF9zKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwppbmRleCA0MzI3NTljNDk1YjMxM2E2YjliZTExZGNlNzM1YzQ4NmE2YzIxZWE3 Li44MTZiYzFmYzI3ZTJlMGZmYWIyMTAxNzM3MDkzZTg0YTI4MjRlNmZiIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTYgQEAKKzIwMTgtMTAtMDMgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4K KworICAgICAgICBbV2ViIEFuaW1hdGlvbnNdIFJFR1JFU1NJT046IHNldHRpbmcgJ2FuaW1hdGlv bi1uYW1lOiBub25lJyBhZnRlciBhICdmaWxsOiBmb3J3YXJkcycgYW5pbWF0aW9uIGhhcyBjb21w bGV0ZWQgZG9lcyBub3QgcmV2ZXJ0IHRvIHRoZSB1bmFuaW1hdGVkIHN0eWxlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTAyNTcKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzQxMzQxNDczPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBhIHRlc3QgdGhhdCBjaGVja3MgdGhhdCBhbiBhbmltYXRpb24g d2l0aCBmaWxsOiBmb3J3YXJkcyBubyBsb25nZXIgYXBwbGllcyB0byBhbiBlbGVtZW50IG9uY2Ug aXQncyBiZWVuIHJlbW92ZWQuCisKKyAgICAgICAgKiBhbmltYXRpb25zL2FuaW1hdGlvbi1maWxs LWZvcndhcmRzLXJlbW92YWwtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBhbmltYXRp b25zL2FuaW1hdGlvbi1maWxsLWZvcndhcmRzLXJlbW92YWwuaHRtbDogQWRkZWQuCisKIDIwMTgt MTAtMDIgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAg ICAgW1dpbkNhaXJvXVtCdWlsZEJvdF0gYXJjaGl2ZS10ZXN0LXJlc3VsdHMgZmFpbHMgdG8gZGVs ZXRlIHB5d2Vic29ja2V0LndzLmxvZy1lcnIudHh0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9h bmltYXRpb25zL2FuaW1hdGlvbi1maWxsLWZvcndhcmRzLXJlbW92YWwtZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9hbmltYXRpb24tZmlsbC1mb3J3YXJkcy1yZW1vdmFsLWV4 cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43NjI1ZTdhOTY0YjJhOTAzMDkwODk1YzEzZDM2NjkzMzM0 ODgyYmJhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9hbmltYXRp b24tZmlsbC1mb3J3YXJkcy1yZW1vdmFsLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDMgQEAKKwor UEFTUyBTZXR0aW5nICdhbmltYXRpb24tbmFtZTogbm9uZScgYWZ0ZXIgYSAnZmlsbDogZm9yd2Fy ZHMnIGFuaW1hdGlvbiBoYXMgY29tcGxldGVkIHJldmVydHMgdG8gdGhlIHVuYW5pbWF0ZWQgc3R5 bGUuIAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hbmltYXRpb25zL2FuaW1hdGlvbi1maWxs LWZvcndhcmRzLXJlbW92YWwuaHRtbCBiL0xheW91dFRlc3RzL2FuaW1hdGlvbnMvYW5pbWF0aW9u LWZpbGwtZm9yd2FyZHMtcmVtb3ZhbC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjUwNDRjMTA0Njk5M2YyMTU5 MjBiYzI1N2Q5Yjc2OWNmZGZkNjA4ZmIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9h bmltYXRpb25zL2FuaW1hdGlvbi1maWxsLWZvcndhcmRzLXJlbW92YWwuaHRtbApAQCAtMCwwICsx LDI4IEBACis8IURPQ1RZUEUgaHRtbD4KKzxtZXRhIGNoYXJzZXQ9dXRmLTg+Cis8c3R5bGU+Cisg ICAgQGtleWZyYW1lcyBhbmltYXRpb24geworICAgICAgICB0byB7IG1hcmdpbi1sZWZ0OiAxMDBw eCB9CisgICAgfQorPC9zdHlsZT4KKzxib2R5PgorPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy90 ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL3Rlc3Ro YXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CisKKyd1c2Ugc3RyaWN0JzsKKwor YXN5bmNfdGVzdCh0ID0+IHsKKyAgICBjb25zdCB0YXJnZXQgPSBkb2N1bWVudC5ib2R5LmFwcGVu ZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpKTsKKyAgICB0YXJnZXQuc3R5bGUu YW5pbWF0aW9uID0gImFuaW1hdGlvbiAxMG1zIGZvcndhcmRzIjsKKworICAgIHRhcmdldC5hZGRF dmVudExpc3RlbmVyKCJhbmltYXRpb25lbmQiLCAoKSA9PiB7CisgICAgICAgIGFzc2VydF9lcXVh bHMoZ2V0Q29tcHV0ZWRTdHlsZSh0YXJnZXQpLm1hcmdpbkxlZnQsICIxMDBweCIsICJUaGUgdGFy Z2V0IGVsZW1lbnQgaGFzIHN0eWxlIHZhbHVlcyBmcm9tIHRoZSBmaW5hbCBrZXlmcmFtZSBvZiBp dHMgYW5pbWF0aW9uLiIpOworICAgICAgICB0YXJnZXQuc3R5bGUuYW5pbWF0aW9uID0gIm5vbmUi OworICAgICAgICBhc3NlcnRfZXF1YWxzKGdldENvbXB1dGVkU3R5bGUodGFyZ2V0KS5tYXJnaW5M ZWZ0LCAiMHB4IiwgIlRoZSB0YXJnZXQgZWxlbWVudCBoYXMgbm8gYW5pbWF0aW9uIGFmdGVyIHNl dHRpbmcgJ2FuaW1hdGlvbi1uYW1lOiBub25lJy4iKTsKKyAgICAgICAgdC5kb25lKCk7CisgICAg fSk7Cit9LCAiU2V0dGluZyAnYW5pbWF0aW9uLW5hbWU6IG5vbmUnIGFmdGVyIGEgJ2ZpbGw6IGZv cndhcmRzJyBhbmltYXRpb24gaGFzIGNvbXBsZXRlZCByZXZlcnRzIHRvIHRoZSB1bmFuaW1hdGVk IHN0eWxlLiIpOworCis8L3NjcmlwdD4KKzwvYm9keT4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBm aWxlCg== 351723 2018-10-06 07:51:28 -0700 2018-10-06 07:54:15 -0700 Patch bug-190257-20181006075127.patch text/plain 10357 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2ODE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjk4N2UwNTM5Nzk2Mzg1 NmU4OGU4MTM3NWRmYWJjZmFlM2YxYTZiMy4uZjVmZGYyMDJiYTI4NzVkYjAzZWY2N2QxNzVlNWU4 ZDlhYzdjNzczMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwyNyArMSwzIEBACi0yMDE4LTEwLTAzICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KLQotICAgICAgICBBZGQgVlA4IHN1cHBvcnQg dG8gV2ViUlRDCi0gICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xODk5NzYKLQotICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCi0KLSAgICAgICAg QWRkIGEgcnVudGltZSBmbGFnIHRvIGNvbnRyb2wgYWN0aXZhdGlvbiBvZiBWUDggY29kZWMuCi0g ICAgICAgIEJpbmQgdGhpcyBydW50aW1lIGZsYWcgdG8gdGhlIHZpZGVvIGNvZGVjIGZhY3Rvcmll cy4KLSAgICAgICAgVGVzdDogd2VicnRjL3ZpZGVvLW11dGUtdnA4Lmh0bWwKLQotICAgICAgICAq IE1vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFj a2VuZC5jcHA6Ci0gICAgICAgIChXZWJDb3JlOjpjcmVhdGVMaWJXZWJSVENQZWVyQ29ubmVjdGlv bkJhY2tlbmQpOgotICAgICAgICAqIHBhZ2UvUnVudGltZUVuYWJsZWRGZWF0dXJlcy5oOgotICAg ICAgICAoV2ViQ29yZTo6UnVudGltZUVuYWJsZWRGZWF0dXJlczo6d2ViUlRDVlA4Q29kZWNFbmFi bGVkIGNvbnN0KToKLSAgICAgICAgKFdlYkNvcmU6OlJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNl dFdlYlJUQ1ZQOENvZGVjRW5hYmxlZCk6Ci0gICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0v bGlid2VicnRjL0xpYldlYlJUQ1Byb3ZpZGVyLmg6Ci0gICAgICAgICogcGxhdGZvcm0vbWVkaWFz dHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1Byb3ZpZGVyQ29jb2EuY3BwOgotICAgICAgICAoV2Vi Q29yZTo6TGliV2ViUlRDUHJvdmlkZXJDb2NvYTo6Y3JlYXRlRGVjb2RlckZhY3RvcnkpOgotICAg ICAgICAoV2ViQ29yZTo6TGliV2ViUlRDUHJvdmlkZXJDb2NvYTo6Y3JlYXRlRW5jb2RlckZhY3Rv cnkpOgotICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmNwcDoKLSAgICAgICAgKFdlYkNvcmU6 OkludGVybmFsczo6cmVzZXRUb0NvbnNpc3RlbnRTdGF0ZSk6Ci0gICAgICAgIEVuYWJsZSBWUDgg Y29kZWMgZm9yIHRlc3RzLgotCiAyMDE4LTEwLTAzICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0Bh cHBsZS5jb20+CiAKICAgICAgICAgW1dlYiBBbmltYXRpb25zXSBSRUdSRVNTSU9OOiBzZXR0aW5n ICdhbmltYXRpb24tbmFtZTogbm9uZScgYWZ0ZXIgYSAnZmlsbDogZm9yd2FyZHMnIGFuaW1hdGlv biBoYXMgY29tcGxldGVkIGRvZXMgbm90IHJldmVydCB0byB0aGUgdW5hbmltYXRlZCBzdHlsZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZwppbmRleCA0ODU4YmQ2MzZlZDkzNzU4ZmUxNDllOTYxZDNmOTliMTQwZjVhN2Q5Li5hNjg3 M2MxMzZjYmY4ZTNlNjkyNDljYjRhZmY3YWUzNjA0MWVlMzdmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDI1IEBACisyMDE4LTEwLTA1ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKwor ICAgICAgICBOZXR3b3JrQ2FjaGU6OlN0b3JhZ2Ugc2hvdWxkIGJlIFdURjo6RGVzdHJ1Y3Rpb25U aHJlYWQ6Ok1haW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE5MDMyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFVzZSBXVEY6OkRlc3RydWN0aW9uVGhyZWFkOjpNYWluIHRvIG1ha2Ugc3VyZSB0aGF0IFN0 b3JhZ2UgaXMgZGVzdHJveWVkIGluIHRoZSBtYWluIHRocmVhZC4KKyAgICAgICAgUmVtb3ZlIHRo ZSBjb2RlIHRoYXQgd2FzIG1ha2luZyBzdXJlIHRoYXQgYW55IHJlZiB3YXMgZGVzdHJveWVkIGlu IHRoZSBtYWluIHRocmVhZC4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL0NhY2hl U3RvcmFnZUVuZ2luZUNhY2hlcy5jcHA6IE1ha2Ugc3VyZSB0aGUgY29tcGxldGlvbiBoYW5kbGVy IGlzIG5vdCBudWxsLgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNo ZVN0b3JhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlN0b3JhZ2U6OlRy YXZlcnNlT3BlcmF0aW9uOjpUcmF2ZXJzZU9wZXJhdGlvbik6IE1ha2UgaXQgY2xlYXIgdGhhdCBh IHJlZiBpcyB0YWtlbi4KKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpTdG9yYWdlOjpT dG9yYWdlKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpTdG9yYWdlOjpzeW5jaHJv bml6ZSk6IFByb3RlY3QgJ3RoaXMnIHdoZW4gZGlzcGF0Y2hpbmcgYmFjayB0byB0aGUgbWFpbiB0 aHJlYWQuCisgICAgICAgIE1vdmUgdGhlIGNvZGUgdGhhdCB3YXMgYWZ0ZXIgZGlzcGF0Y2ggYmVm b3JlIGRpc3BhdGNoIHRvIGFsbG93IG1vdmluZyBwcm90ZWN0ZWRUaGlzIGluIHRoZSBkaXNwYXRj aCBsYW1iZGEuCisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3RvcmFnZTo6cmVtb3Zl KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpTdG9yYWdlOjp0cmF2ZXJzZSk6Cisg ICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3RvcmFnZTo6Y2xlYXIpOgorICAgICAgICAo V2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlN0b3JhZ2U6OmRlbGV0ZU9sZFZlcnNpb25zKToKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmg6CisKIDIwMTgt MTAtMDMgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBW UDggc3VwcG9ydCB0byBXZWJSVEMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lQ2FjaGVzLmNwcCBiL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvY2FjaGUvQ2FjaGVTdG9yYWdlRW5naW5lQ2FjaGVzLmNwcAppbmRleCBk OTBiYTE1MWI5MjMxOWUwM2FlNGQ2OTI2Yjk5MDZiNmYwYWY3N2U1Li4xODIzMDIxYmNmZGM4MWIx OGM5MDIzOGJkMDQxMDU1ODE1NzU1YTgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL2NhY2hlL0NhY2hlU3RvcmFnZUVuZ2luZUNhY2hlcy5jcHAKKysrIGIvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9DYWNoZVN0b3JhZ2VFbmdpbmVDYWNoZXMuY3Bw CkBAIC0zNDgsNyArMzQ4LDcgQEAgdm9pZCBDYWNoZXM6OmRpc3Bvc2UoQ2FjaGUmIGNhY2hlKQog ICAgIGF1dG8gcG9zaXRpb24gPSBtX3JlbW92ZWRDYWNoZXMuZmluZE1hdGNoaW5nKFsmXShjb25z dCBhdXRvJiBpdGVtKSB7IHJldHVybiBpdGVtLmlkZW50aWZpZXIoKSA9PSBjYWNoZS5pZGVudGlm aWVyKCk7IH0pOwogICAgIGlmIChwb3NpdGlvbiAhPSBub3RGb3VuZCkgewogICAgICAgICBpZiAo bV9zdG9yYWdlKQotICAgICAgICAgICAgbV9zdG9yYWdlLT5yZW1vdmUoY2FjaGUua2V5cygpLCB7 IH0pOworICAgICAgICAgICAgbV9zdG9yYWdlLT5yZW1vdmUoY2FjaGUua2V5cygpLCBbXSB7IH0p OwogCiAgICAgICAgIG1fcmVtb3ZlZENhY2hlcy5yZW1vdmUocG9zaXRpb24pOwogICAgICAgICBy ZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05l dHdvcmtDYWNoZVN0b3JhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNo ZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmNwcAppbmRleCBlNTExZTkyNjA2NmM2MmM5NmMyMWZjMTUw MGUyMmU3OGYyMTQ5NzA5Li4zYWNlMmNmNmEyM2YyOWI5ZTQ4ZTE3Mzk0NjZlNGIwYTg5YzY4NWM0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtD YWNoZVN0b3JhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUv TmV0d29ya0NhY2hlU3RvcmFnZS5jcHAKQEAgLTEyNCw4ICsxMjQsOCBAQCBwdWJsaWM6CiBzdHJ1 Y3QgU3RvcmFnZTo6VHJhdmVyc2VPcGVyYXRpb24gewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NB VEVEOwogcHVibGljOgotICAgIFRyYXZlcnNlT3BlcmF0aW9uKFN0b3JhZ2UmIHN0b3JhZ2UsIGNv bnN0IFN0cmluZyYgdHlwZSwgT3B0aW9uU2V0PFRyYXZlcnNlRmxhZz4gZmxhZ3MsIFRyYXZlcnNl SGFuZGxlciYmIGhhbmRsZXIpCi0gICAgICAgIDogc3RvcmFnZShzdG9yYWdlKQorICAgIFRyYXZl cnNlT3BlcmF0aW9uKFJlZjxTdG9yYWdlPiYmIHN0b3JhZ2UsIGNvbnN0IFN0cmluZyYgdHlwZSwg T3B0aW9uU2V0PFRyYXZlcnNlRmxhZz4gZmxhZ3MsIFRyYXZlcnNlSGFuZGxlciYmIGhhbmRsZXIp CisgICAgICAgIDogc3RvcmFnZShXVEZNb3ZlKHN0b3JhZ2UpKQogICAgICAgICAsIHR5cGUodHlw ZSkKICAgICAgICAgLCBmbGFncyhmbGFncykKICAgICAgICAgLCBoYW5kbGVyKFdURk1vdmUoaGFu ZGxlcikpCkBAIC0yMzMsNiArMjMzLDggQEAgU3RvcmFnZTo6U3RvcmFnZShjb25zdCBTdHJpbmcm IGJhc2VEaXJlY3RvcnlQYXRoLCBNb2RlIG1vZGUsIFNhbHQgc2FsdCkKICAgICAsIG1fc2VyaWFs QmFja2dyb3VuZElPUXVldWUoV29ya1F1ZXVlOjpjcmVhdGUoImNvbS5hcHBsZS5XZWJLaXQuQ2Fj aGUuU3RvcmFnZS5zZXJpYWxCYWNrZ3JvdW5kIiwgV29ya1F1ZXVlOjpUeXBlOjpTZXJpYWwsIFdv cmtRdWV1ZTo6UU9TOjpCYWNrZ3JvdW5kKSkKICAgICAsIG1fYmxvYlN0b3JhZ2UobWFrZUJsb2JE aXJlY3RvcnlQYXRoKGJhc2VEaXJlY3RvcnlQYXRoKSwgbV9zYWx0KQogeworICAgIEFTU0VSVChS dW5Mb29wOjppc01haW4oKSk7CisKICAgICBkZWxldGVPbGRWZXJzaW9ucygpOwogICAgIHN5bmNo cm9uaXplKCk7CiB9CkBAIC0zMjUsNyArMzI3LDEzIEBAIHZvaWQgU3RvcmFnZTo6c3luY2hyb25p emUoKQogICAgICAgICBpZiAoIXNob3VsZENvbXB1dGVFeGFjdFJlY29yZHNTaXplKQogICAgICAg ICAgICAgcmVjb3Jkc1NpemUgPSBlc3RpbWF0ZVJlY29yZHNTaXplKHJlY29yZENvdW50LCBibG9i Q291bnQpOwogCi0gICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbdGhpcywgcmVjb3Jk RmlsdGVyID0gV1RGTW92ZShyZWNvcmRGaWx0ZXIpLCBibG9iRmlsdGVyID0gV1RGTW92ZShibG9i RmlsdGVyKSwgcmVjb3Jkc1NpemVdKCkgbXV0YWJsZSB7CisgICAgICAgIG1fYmxvYlN0b3JhZ2Uu c3luY2hyb25pemUoKTsKKworICAgICAgICBkZWxldGVFbXB0eVJlY29yZHNEaXJlY3Rvcmllcyhy ZWNvcmRzUGF0aCgpKTsKKworICAgICAgICBMT0coTmV0d29ya0NhY2hlU3RvcmFnZSwgIihOZXR3 b3JrUHJvY2VzcykgY2FjaGUgc3luY2hyb25pemF0aW9uIGNvbXBsZXRlZCBzaXplPSV6dSByZWNv cmRDb3VudD0ldSIsIHJlY29yZHNTaXplLCByZWNvcmRDb3VudCk7CisKKyAgICAgICAgUnVuTG9v cDo6bWFpbigpLmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0 ZWRUaGlzKSwgcmVjb3JkRmlsdGVyID0gV1RGTW92ZShyZWNvcmRGaWx0ZXIpLCBibG9iRmlsdGVy ID0gV1RGTW92ZShibG9iRmlsdGVyKSwgcmVjb3Jkc1NpemVdKCkgbXV0YWJsZSB7CiAgICAgICAg ICAgICBmb3IgKGF1dG8mIHJlY29yZEZpbHRlcktleSA6IG1fcmVjb3JkRmlsdGVySGFzaGVzQWRk ZWREdXJpbmdTeW5jaHJvbml6YXRpb24pCiAgICAgICAgICAgICAgICAgcmVjb3JkRmlsdGVyLT5h ZGQocmVjb3JkRmlsdGVyS2V5KTsKICAgICAgICAgICAgIG1fcmVjb3JkRmlsdGVySGFzaGVzQWRk ZWREdXJpbmdTeW5jaHJvbml6YXRpb24uY2xlYXIoKTsKQEAgLTM0MCwxMyArMzQ4LDYgQEAgdm9p ZCBTdG9yYWdlOjpzeW5jaHJvbml6ZSgpCiAgICAgICAgICAgICBtX3N5bmNocm9uaXphdGlvbklu UHJvZ3Jlc3MgPSBmYWxzZTsKICAgICAgICAgfSk7CiAKLSAgICAgICAgbV9ibG9iU3RvcmFnZS5z eW5jaHJvbml6ZSgpOwotCi0gICAgICAgIGRlbGV0ZUVtcHR5UmVjb3Jkc0RpcmVjdG9yaWVzKHJl Y29yZHNQYXRoKCkpOwotCi0gICAgICAgIExPRyhOZXR3b3JrQ2FjaGVTdG9yYWdlLCAiKE5ldHdv cmtQcm9jZXNzKSBjYWNoZSBzeW5jaHJvbml6YXRpb24gY29tcGxldGVkIHNpemU9JXp1IHJlY29y ZENvdW50PSV1IiwgcmVjb3Jkc1NpemUsIHJlY29yZENvdW50KTsKLQotICAgICAgICBSdW5Mb29w OjptYWluKCkuZGlzcGF0Y2goW3Byb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMp XSB7IH0pOwogICAgIH0pOwogfQogCkBAIC01OTgsMTEgKzU5OSwxMCBAQCB2b2lkIFN0b3JhZ2U6 OnJlbW92ZShjb25zdCBLZXkmIGtleSkKIAogICAgIHNlcmlhbEJhY2tncm91bmRJT1F1ZXVlKCku ZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpLCBr ZXldICgpIG11dGFibGUgewogICAgICAgICBkZWxldGVGaWxlcyhrZXkpOwotICAgICAgICBSdW5M b29wOjptYWluKCkuZGlzcGF0Y2goW3Byb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRo aXMpXSB7IH0pOwogICAgIH0pOwogfQogCi12b2lkIFN0b3JhZ2U6OnJlbW92ZShjb25zdCBWZWN0 b3I8S2V5PiYga2V5cywgRnVuY3Rpb248dm9pZCAoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKK3Zv aWQgU3RvcmFnZTo6cmVtb3ZlKGNvbnN0IFZlY3RvcjxLZXk+JiBrZXlzLCBDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6 OmlzTWFpbigpKTsKIApAQCAtNjIwLDEwICs2MjAsNyBAQCB2b2lkIFN0b3JhZ2U6OnJlbW92ZShj b25zdCBWZWN0b3I8S2V5PiYga2V5cywgRnVuY3Rpb248dm9pZCAoKT4mJiBjb21wbGV0aW9uSGFu ZAogICAgICAgICBmb3IgKGF1dG8mIGtleSA6IGtleXNUb1JlbW92ZSkKICAgICAgICAgICAgIGRl bGV0ZUZpbGVzKGtleSk7CiAKLSAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtwcm90 ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKSwgY29tcGxldGlvbkhhbmRsZXIgPSBX VEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0gewotICAgICAgICAgICAgaWYgKGNvbXBsZXRpb25I YW5kbGVyKQotICAgICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7Ci0gICAgICAgIH0p OworICAgICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goV1RGTW92ZShjb21wbGV0aW9uSGFu ZGxlcikpOwogICAgIH0pOwogfQogCkBAIC05MDksNyArOTA2LDcgQEAgdm9pZCBTdG9yYWdlOjp0 cmF2ZXJzZShjb25zdCBTdHJpbmcmIHR5cGUsIE9wdGlvblNldDxUcmF2ZXJzZUZsYWc+IGZsYWdz LCBUcmF2ZXIKICAgICBBU1NFUlQodHJhdmVyc2VIYW5kbGVyKTsKICAgICAvLyBBdm9pZCBub24t dGhyZWFkIHNhZmUgRnVuY3Rpb24gY29waWVzLgogCi0gICAgYXV0byB0cmF2ZXJzZU9wZXJhdGlv blB0ciA9IHN0ZDo6bWFrZV91bmlxdWU8VHJhdmVyc2VPcGVyYXRpb24+KCp0aGlzLCB0eXBlLCBm bGFncywgV1RGTW92ZSh0cmF2ZXJzZUhhbmRsZXIpKTsKKyAgICBhdXRvIHRyYXZlcnNlT3BlcmF0 aW9uUHRyID0gc3RkOjptYWtlX3VuaXF1ZTxUcmF2ZXJzZU9wZXJhdGlvbj4obWFrZVJlZigqdGhp cyksIHR5cGUsIGZsYWdzLCBXVEZNb3ZlKHRyYXZlcnNlSGFuZGxlcikpOwogICAgIGF1dG8mIHRy YXZlcnNlT3BlcmF0aW9uID0gKnRyYXZlcnNlT3BlcmF0aW9uUHRyOwogICAgIG1fYWN0aXZlVHJh dmVyc2VPcGVyYXRpb25zLmFkZChXVEZNb3ZlKHRyYXZlcnNlT3BlcmF0aW9uUHRyKSk7CiAKQEAg LTk5Nyw3ICs5OTQsNyBAQCB2b2lkIFN0b3JhZ2U6OnNldENhcGFjaXR5KHNpemVfdCBjYXBhY2l0 eSkKICAgICBzaHJpbmtJZk5lZWRlZCgpOwogfQogCi12b2lkIFN0b3JhZ2U6OmNsZWFyKGNvbnN0 IFN0cmluZyYgdHlwZSwgV2FsbFRpbWUgbW9kaWZpZWRTaW5jZVRpbWUsIEZ1bmN0aW9uPHZvaWQg KCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCit2b2lkIFN0b3JhZ2U6OmNsZWFyKGNvbnN0IFN0cmlu ZyYgdHlwZSwgV2FsbFRpbWUgbW9kaWZpZWRTaW5jZVRpbWUsIENvbXBsZXRpb25IYW5kbGVyPHZv aWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWlu KCkpOwogICAgIExPRyhOZXR3b3JrQ2FjaGVTdG9yYWdlLCAiKE5ldHdvcmtQcm9jZXNzKSBjbGVh cmluZyBjYWNoZSIpOwpAQCAtMTAyNSwxMCArMTAyMiw3IEBAIHZvaWQgU3RvcmFnZTo6Y2xlYXIo Y29uc3QgU3RyaW5nJiB0eXBlLCBXYWxsVGltZSBtb2RpZmllZFNpbmNlVGltZSwgRnVuY3Rpb248 dm9pCiAgICAgICAgIC8vIFRoaXMgY2xlYW5zIHVucmVmZXJlbmNlZCBibG9icy4KICAgICAgICAg bV9ibG9iU3RvcmFnZS5zeW5jaHJvbml6ZSgpOwogCi0gICAgICAgIFJ1bkxvb3A6Om1haW4oKS5k aXNwYXRjaChbcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIGNvbXBsZXRp b25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildIHsKLSAgICAgICAgICAgIGlm IChjb21wbGV0aW9uSGFuZGxlcikKLSAgICAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigp OwotICAgICAgICB9KTsKKyAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFdURk1vdmUo Y29tcGxldGlvbkhhbmRsZXIpKTsKICAgICB9KTsKIH0KIApAQCAtMTE0Nyw4ICsxMTQxLDYgQEAg dm9pZCBTdG9yYWdlOjpkZWxldGVPbGRWZXJzaW9ucygpCiAKICAgICAgICAgICAgIGRlbGV0ZURp cmVjdG9yeVJlY3Vyc2l2ZWx5KG9sZFZlcnNpb25QYXRoKTsKICAgICAgICAgfSk7Ci0KLSAgICAg ICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90 ZWN0ZWRUaGlzKV0geyB9KTsKICAgICB9KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmggYi9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaAppbmRleCAzODEx Zjk2ZGFjNGJmMGFjODkxOThkYjIxMzJmNmEyMTY3NjBlMDc5Li5lZmE2ZDEyYmU5OWY0YTQ4YmY4 MTEzMWRhOGU5MDVkYzczZjMzNmJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaApAQCAtNDUsNyArNDUsNyBA QCBuYW1lc3BhY2UgTmV0d29ya0NhY2hlIHsKIAogY2xhc3MgSU9DaGFubmVsOwogCi1jbGFzcyBT dG9yYWdlIDogcHVibGljIFRocmVhZFNhZmVSZWZDb3VudGVkPFN0b3JhZ2U+IHsKK2NsYXNzIFN0 b3JhZ2UgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8U3RvcmFnZSwgV1RGOjpEZXN0cnVj dGlvblRocmVhZDo6TWFpbj4gewogcHVibGljOgogICAgIGVudW0gY2xhc3MgTW9kZSB7IE5vcm1h bCwgQXZvaWRSYW5kb21uZXNzIH07CiAgICAgc3RhdGljIFJlZlB0cjxTdG9yYWdlPiBvcGVuKGNv bnN0IFN0cmluZyYgY2FjaGVQYXRoLCBNb2RlKTsKQEAgLTg1LDggKzg1LDggQEAgcHVibGljOgog ICAgIHZvaWQgc3RvcmUoY29uc3QgUmVjb3JkJiwgTWFwcGVkQm9keUhhbmRsZXImJiwgQ29tcGxl dGlvbkhhbmRsZXI8dm9pZCgpPiYmID0geyB9KTsKIAogICAgIHZvaWQgcmVtb3ZlKGNvbnN0IEtl eSYpOwotICAgIHZvaWQgcmVtb3ZlKGNvbnN0IFZlY3RvcjxLZXk+JiwgRnVuY3Rpb248dm9pZCAo KT4mJik7Ci0gICAgdm9pZCBjbGVhcihjb25zdCBTdHJpbmcmIHR5cGUsIFdhbGxUaW1lIG1vZGlm aWVkU2luY2VUaW1lLCBGdW5jdGlvbjx2b2lkICgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKTsKKyAg ICB2b2lkIHJlbW92ZShjb25zdCBWZWN0b3I8S2V5PiYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo KT4mJik7CisgICAgdm9pZCBjbGVhcihjb25zdCBTdHJpbmcmIHR5cGUsIFdhbGxUaW1lIG1vZGlm aWVkU2luY2VUaW1lLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwogCiAgICAgc3RydWN0 IFJlY29yZEluZm8gewogICAgICAgICBzaXplX3QgYm9keVNpemU7Cg==