239906 2022-04-29 11:40:45 -0700 REGRESSION (r289032): rotate animation doesn't interpolate between 0 and 1turn without forced 50% 2022-09-13 00:32:10 -0700 1 1 1 Unclassified WebKit Animations Safari Technology Preview Mac (Apple Silicon) macOS 12 RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=235311 https://codepen.io/mattaningram/pen/zYROyqL InRadar P2 Normal --- 1 mattaningram mrobinson dino ews-watchlist graouts graouts mattaningram mrobinson simon.fraser webkit-bug-importer oldest_to_newest 1865488 0 mattaningram 2022-04-29 11:40:45 -0700 In certain situations Safari Technology Preview is not interpolating properly between 0 and 1turn in a keyframe animation. I noticed my loading spinner wasn't working anymore in Safari Technology Preview so I created a codepen to illustrate the bug: https://codepen.io/mattaningram/pen/zYROyqL If you uncomment the second spinner animation keyframe you will see that forcing Safari to interpolate to a 50% position in the 0 to 1 turn make the animation behave the way it does in older Safari versions and other browsers. However this behavior of not automatically interpolating between 0 and 1turn is not reproducible in a simpler example. 1867295 1 webkit-bug-importer 2022-05-06 11:41:13 -0700 <rdar://problem/92872316> 1868103 2 graouts 2022-05-11 05:35:19 -0700 Regressed with r289032, the fix for bug 235311. Cc'ing Martin Robinson, who wrote the regressing commit. 1868129 3 mrobinson 2022-05-11 07:40:37 -0700 This seems to be an issue with CoreAnimation. I confirmed that the test case worked for WebKitGTK (which just animates using WebCore interpolation), but fails for hardware animations using the CoreAnimation backend. 1868135 4 459166 mrobinson 2022-05-11 07:54:47 -0700 Created attachment 459166 Reduced test case using a single function for transform I suspect that this was an issue before, but was hidden by the fact that this animation was previously falling back to software. I've attached a reduced test case that fails in Mac WebKit and only uses a single transform function (ie should not be affected by my change). 1868150 5 graouts 2022-05-11 08:49:38 -0700 It's perfectly fine to not run an accelerated animation for this case if we can't find a way to run it with CA, especially if that was our previous behavior. 1868151 6 mrobinson 2022-05-11 08:50:54 -0700 (In reply to Antoine Quint from comment #5) > It's perfectly fine to not run an accelerated animation for this case if we > can't find a way to run it with CA, especially if that was our previous > behavior. It's quite possible this is indeed a regression, but I don't understand how yet. I'll do a deeper investigation. 1868741 7 459298 mrobinson 2022-05-13 07:02:10 -0700 Created attachment 459298 Patch 1868742 8 graouts 2022-05-13 07:04:55 -0700 Writing tests for the runtime behavior of an accelerated animation is notoriously difficult :( 1868743 9 mrobinson 2022-05-13 07:06:02 -0700 I've posted what I think is a fix for this, but haven't yet marked it for review. I'm investigating now how to write a test. When pausing an animation (an approach that's often used for reference testing), I believe that WebKit uses the software path because rendering is correct without the fix. 1870373 10 mrobinson 2022-05-19 08:02:41 -0700 Pull request: https://github.com/WebKit/WebKit/pull/781 1871520 11 ews-feeder 2022-05-24 09:58:37 -0700 Committed r294752 (250920@main): <https://commits.webkit.org/250920@main> Reviewed commits have been landed. Closing PR #781 and removing active labels. 1898153 12 graouts 2022-09-13 00:32:10 -0700 This caused bug 243864. 459166 2022-05-11 07:54:47 -0700 2022-05-11 07:54:47 -0700 Reduced test case using a single function for transform spin.html text/html 449 mrobinson PHN0eWxlPgoubG9hZGluZy1zcGlubmVyIHsKICAgIHBlcnNwZWN0aXZlOiAyNTBweDsKICAgIHdp ZHRoOiA4MHB4OwogICAgaGVpZ2h0OiA4MHB4Owp9CgogQGtleWZyYW1lcyBzcGlubmVyLWFuaW1h dGlvbiB7CiAgICAgMCUgewogICAgICAgICB0cmFuc2Zvcm06IHJvdGF0ZVkoMCk7CiAgICB9CiAg ICAgMTAwJSB7CiAgICAgICAgIHRyYW5zZm9ybTogcm90YXRlWSgtMXR1cm4pOwogICAgfQp9Cgou c3Bpbm5lci1jaXJjbGUgewogICAgd2lkdGg6IDEwMCU7CiAgICBoZWlnaHQ6IDEwMCU7CiAgICBh bmltYXRpb246IHNwaW5uZXItYW5pbWF0aW9uIDEuNXMgaW5maW5pdGUgbGluZWFyOwogICAgYmFj a2dyb3VuZC1jb2xvcjogYmx1ZTsKfQo8L3N0eWxlPgoKPGRpdiBjbGFzcz0ibG9hZGluZy1zcGlu bmVyIj4KICA8ZGl2IGNsYXNzPSJzcGlubmVyLWNpcmNsZSI+PC9kaXY+CjwvZGl2Pgo= 459298 2022-05-13 07:02:10 -0700 2022-05-19 08:02:56 -0700 Patch bug-239906-20220513160209.patch text/plain 8213 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMjk0MDU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDkxZWU3ZDFiMjdmZjNk YjQzZWFkYzkwZGRjOTY5MDA2NWZjZDBhMi4uMzBlYzI0ZWFkZDA3MDFkNDdkYTAzOWZkNTY2MDQ1 M2MwZGI4MmE5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTA1LTEzICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25Ad2Via2l0Lm9yZz4KKworICAgICAgICBSRUdSRVNTSU9O IChyMjg5MDMyKTogcm90YXRlIGFuaW1hdGlvbiBkb2Vzbid0IGludGVycG9sYXRlIGJldHdlZW4g MCBhbmQgMXR1cm4gd2l0aG91dCBmb3JjZWQgNTAlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzk5MDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIEkgY2FuIG5vdCBmaWd1cmUgb3V0 IGhvdyB0byB0ZXN0IHRoaXMgeWV0LCBiZWNhdXNlCisgICAgICAgIHdoZW4gcGF1c2luZyBhbmlt YXRpb25zIHRoZSBzb2Z0d2FyZSBwYXRoIGlzIHVzZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dHJhbnNm b3JtYXRpb25BbmltYXRpb25WYWx1ZUF0KToKKyAgICAgICAgKFdlYkNvcmU6Omhhc0JpZ1JvdGF0 aW9uQW5nbGUpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNBOjpjcmVhdGVUcmFu c2Zvcm1BbmltYXRpb25zRnJvbUtleWZyYW1lcyk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGlj c0xheWVyQ0E6OnNldFRyYW5zZm9ybUFuaW1hdGlvbkVuZHBvaW50cyk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvdHJhbnNmb3Jtcy9UcmFuc2Zvcm1PcGVyYXRpb25zLmg6CisgICAgICAg IChXZWJDb3JlOjpTaGFyZWRQcmltaXRpdmVzUHJlZml4OjpwcmltaXRpdmVzIGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OlNoYXJlZFByaW1pdGl2ZXNQcmVmaXg6OnByaW1pdGl2ZXMpOiBEZWxl dGVkLgorCiAyMDIyLTA1LTEwICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgog CiAgICAgICAgIFJlbW92ZSB0aGUgdW5uZWVkZWQgU3R5bGVQcm9wZXJ0aWVzQmFzZSBhZnRlciBC dWcgMjQwMjQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j YS9HcmFwaGljc0xheWVyQ0EuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2EvR3JhcGhpY3NMYXllckNBLmNwcAppbmRleCAwMjNlNDY2YzA3OWE4YTUxMDg1OTdhZjNlNDU2 MTMxYTM5NTkzZmFlLi5lNDQzZTQ2ZDI3YzA3ZTA0MmY5ZWQ2NDQyNTc4ZjcyZGE0M2IyMWI5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xh eWVyQ0EuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBo aWNzTGF5ZXJDQS5jcHAKQEAgLTM0NzcsNiArMzQ3NywzMCBAQCBib29sIEdyYXBoaWNzTGF5ZXJD QTo6YXBwZW5kVG9VbmNvbW1pdHRlZEFuaW1hdGlvbnMoY29uc3QgS2V5ZnJhbWVWYWx1ZUxpc3Qm IHZhbAogICAgIHJldHVybiB0cnVlOwogfQogCitzdGF0aWMgY29uc3QgVHJhbnNmb3JtT3BlcmF0 aW9ucyYgdHJhbnNmb3JtYXRpb25BbmltYXRpb25WYWx1ZUF0KGNvbnN0IEtleWZyYW1lVmFsdWVM aXN0JiB2YWx1ZUxpc3QsIHVuc2lnbmVkIGkpCit7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PGNv bnN0IFRyYW5zZm9ybUFuaW1hdGlvblZhbHVlJj4odmFsdWVMaXN0LmF0KGkpKS52YWx1ZSgpOwor fQorCitzdGF0aWMgYm9vbCBoYXNCaWdSb3RhdGlvbkFuZ2xlKGNvbnN0IEtleWZyYW1lVmFsdWVM aXN0JiB2YWx1ZUxpc3QsIGNvbnN0IFNoYXJlZFByaW1pdGl2ZXNQcmVmaXgmIHByZWZpeCkKK3sK KyAgICBjb25zdCBhdXRvJiBwcmltaXRpdmVzID0gcHJlZml4LnByaW1pdGl2ZXMoKTsKKyAgICBm b3IgKHVuc2lnbmVkIGFuaW1hdGlvbkluZGV4ID0gMDsgYW5pbWF0aW9uSW5kZXggPCBwcmltaXRp dmVzLnNpemUoKTsgKythbmltYXRpb25JbmRleCkgeworICAgICAgICBUcmFuc2Zvcm1PcGVyYXRp b246Ok9wZXJhdGlvblR5cGUgdHlwZSA9IHByaW1pdGl2ZXNbYW5pbWF0aW9uSW5kZXhdOworICAg ICAgICBpZiAodHlwZSAhPSBUcmFuc2Zvcm1PcGVyYXRpb246OlJPVEFURSAmJiB0eXBlICE9IFRy YW5zZm9ybU9wZXJhdGlvbjo6Uk9UQVRFXzNEKQorICAgICAgICAgICAgY29udGludWU7CisgICAg ICAgIGZvciAoc2l6ZV90IGkgPSAxOyBpIDwgdmFsdWVMaXN0LnNpemUoKTsgKytpKSB7CisgICAg ICAgICAgICBhdXRvIHByZXZPcGVyYXRpb24gPSBzdGF0aWNfY2FzdDxjb25zdCBSb3RhdGVUcmFu c2Zvcm1PcGVyYXRpb24qPih0cmFuc2Zvcm1hdGlvbkFuaW1hdGlvblZhbHVlQXQodmFsdWVMaXN0 LCBpIC0gMSkuYXQoYW5pbWF0aW9uSW5kZXgpKTsKKyAgICAgICAgICAgIGF1dG8gb3BlcmF0aW9u ID0gc3RhdGljX2Nhc3Q8Y29uc3QgUm90YXRlVHJhbnNmb3JtT3BlcmF0aW9uKj4odHJhbnNmb3Jt YXRpb25BbmltYXRpb25WYWx1ZUF0KHZhbHVlTGlzdCwgaSkuYXQoYW5pbWF0aW9uSW5kZXgpKTsK KyAgICAgICAgICAgIGF1dG8gYW5nbGUgPSBzdGQ6OmFicygocHJldk9wZXJhdGlvbiA/IHByZXZP cGVyYXRpb24tPmFuZ2xlKCkgOiAwLjApIC0gKG9wZXJhdGlvbiA/IG9wZXJhdGlvbi0+YW5nbGUo KSA6IDAuMCkpOworICAgICAgICAgICAgaWYgKGFuZ2xlID4gMTgwLjApCisgICAgICAgICAgICAg ICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4gZmFsc2U7Cit9 CisKIGJvb2wgR3JhcGhpY3NMYXllckNBOjpjcmVhdGVUcmFuc2Zvcm1BbmltYXRpb25zRnJvbUtl eWZyYW1lcyhjb25zdCBLZXlmcmFtZVZhbHVlTGlzdCYgdmFsdWVMaXN0LCBjb25zdCBBbmltYXRp b24qIGFuaW1hdGlvbiwgY29uc3QgU3RyaW5nJiBhbmltYXRpb25OYW1lLCBTZWNvbmRzIHRpbWVP ZmZzZXQsIGNvbnN0IEZsb2F0U2l6ZSYgYm94U2l6ZSwgYm9vbCBrZXlmcmFtZXNTaG91bGRVc2VB bmltYXRpb25XaWRlVGltaW5nRnVuY3Rpb24pCiB7CiAgICAgQVNTRVJUKGFuaW1hdGVkUHJvcGVy dHlJc1RyYW5zZm9ybU9yUmVsYXRlZCh2YWx1ZUxpc3QucHJvcGVydHkoKSkpOwpAQCAtMzQ5Myw3 ICszNTE3LDEzIEBAIGJvb2wgR3JhcGhpY3NMYXllckNBOjpjcmVhdGVUcmFuc2Zvcm1BbmltYXRp b25zRnJvbUtleWZyYW1lcyhjb25zdCBLZXlmcmFtZVZhbHVlCiAgICAgLy8gdGhlIHByaW1pdGl2 ZXMgc2hhcmVkIGJldHdlZW4gYW55IHR3byBhZGphY2VudCBrZXlmcmFtZXMuCiAgICAgU2hhcmVk UHJpbWl0aXZlc1ByZWZpeCBwcmVmaXg7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCB2YWx1 ZUxpc3Quc2l6ZSgpOyArK2kpCi0gICAgICAgIHByZWZpeC51cGRhdGUoc3RhdGljX2Nhc3Q8Y29u c3QgVHJhbnNmb3JtQW5pbWF0aW9uVmFsdWUmPih2YWx1ZUxpc3QuYXQoaSkpLnZhbHVlKCkpOwor ICAgICAgICBwcmVmaXgudXBkYXRlKHRyYW5zZm9ybWF0aW9uQW5pbWF0aW9uVmFsdWVBdCh2YWx1 ZUxpc3QsIGkpKTsKKworICAgIC8vIElmIHRoaXMgYW5pbWF0aW9uIGhhcyBhIGJpZyByb3RhdGlv biBiZXR3ZWVuIHR3byBrZXlmcmFtZXMsIGZhbGwgYmFjayB0byBzb2Z0d2FyZSBhbmltYXRpb24u IENvcmVBbmltYXRpb24KKyAgICAvLyB3aWxsIGFsd2F5cyB0YWtlIHRoZSBzaG9ydGVzdCBwYXRo IGJldHdlZW4gdHdvIHJvdGF0aW9ucywgd2hpY2ggd2lsbCByZXN1bHQgaW4gaW5jb3JyZWN0IGFu aW1hdGlvbiB3aGVuCisgICAgLy8gdGhlIGtleWZyYW1lcyBzcGVjaWZ5IGFuZ2xlcyBsYXJnZXIg dGhhbiBvbmUgaGFsZiByb3RhdGlvbi4KKyAgICBpZiAoaGFzQmlnUm90YXRpb25BbmdsZSh2YWx1 ZUxpc3QsIHByZWZpeCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGNvbnN0IGF1dG8m IHByaW1pdGl2ZXMgPSBwcmVmaXgucHJpbWl0aXZlcygpOwogICAgIHVuc2lnbmVkIG51bWJlck9m U2hhcmVkUHJpbWl0aXZlcyA9IHZhbHVlTGlzdC5zaXplKCkgPiAxID8gcHJpbWl0aXZlcy5zaXpl KCkgOiAwOwpAQCAtMzcyMiwxMyArMzc1MiwxMyBAQCBib29sIEdyYXBoaWNzTGF5ZXJDQTo6c2V0 VHJhbnNmb3JtQW5pbWF0aW9uRW5kcG9pbnRzKGNvbnN0IEtleWZyYW1lVmFsdWVMaXN0JiB2YQog ICAgIHVuc2lnbmVkIGZyb21JbmRleCA9ICFmb3J3YXJkczsKICAgICB1bnNpZ25lZCB0b0luZGV4 ID0gZm9yd2FyZHM7CiAgICAgCi0gICAgYXV0byYgc3RhcnRWYWx1ZSA9IHN0YXRpY19jYXN0PGNv bnN0IFRyYW5zZm9ybUFuaW1hdGlvblZhbHVlJj4odmFsdWVMaXN0LmF0KGZyb21JbmRleCkpOwot ICAgIGF1dG8mIGVuZFZhbHVlID0gc3RhdGljX2Nhc3Q8Y29uc3QgVHJhbnNmb3JtQW5pbWF0aW9u VmFsdWUmPih2YWx1ZUxpc3QuYXQodG9JbmRleCkpOworICAgIGNvbnN0IGF1dG8mIHN0YXJ0VmFs dWUgPSB0cmFuc2Zvcm1hdGlvbkFuaW1hdGlvblZhbHVlQXQodmFsdWVMaXN0LCBmcm9tSW5kZXgp OworICAgIGNvbnN0IGF1dG8mIGVuZFZhbHVlID0gdHJhbnNmb3JtYXRpb25BbmltYXRpb25WYWx1 ZUF0KHZhbHVlTGlzdCwgdG9JbmRleCk7CiAKICAgICBpZiAoaXNNYXRyaXhBbmltYXRpb24pIHsK ICAgICAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXggZnJvbVRyYW5zZm9ybSwgdG9UcmFuc2Zvcm07 Ci0gICAgICAgIHN0YXJ0VmFsdWUudmFsdWUoKS5hcHBseShib3hTaXplLCBmcm9tVHJhbnNmb3Jt KTsKLSAgICAgICAgZW5kVmFsdWUudmFsdWUoKS5hcHBseShib3hTaXplLCB0b1RyYW5zZm9ybSk7 CisgICAgICAgIHN0YXJ0VmFsdWUuYXBwbHkoYm94U2l6ZSwgZnJvbVRyYW5zZm9ybSk7CisgICAg ICAgIGVuZFZhbHVlLmFwcGx5KGJveFNpemUsIHRvVHJhbnNmb3JtKTsKIAogICAgICAgICAvLyBJ ZiBhbnkgbWF0cml4IGlzIHNpbmd1bGFyLCBDQSB3b24ndCBhbmltYXRlIGl0IGNvcnJlY3RseS4g U28gZmFsbCBiYWNrIHRvIHNvZnR3YXJlIGFuaW1hdGlvbgogICAgICAgICBpZiAoIWZyb21UcmFu c2Zvcm0uaXNJbnZlcnRpYmxlKCkgfHwgIXRvVHJhbnNmb3JtLmlzSW52ZXJ0aWJsZSgpKQpAQCAt MzczOSwyNyArMzc2OSwyNyBAQCBib29sIEdyYXBoaWNzTGF5ZXJDQTo6c2V0VHJhbnNmb3JtQW5p bWF0aW9uRW5kcG9pbnRzKGNvbnN0IEtleWZyYW1lVmFsdWVMaXN0JiB2YQogICAgIH0gZWxzZSB7 CiAgICAgICAgIGlmIChpc1RyYW5zZm9ybVR5cGVOdW1iZXIodHJhbnNmb3JtT3BUeXBlKSkgewog ICAgICAgICAgICAgZmxvYXQgZnJvbVZhbHVlOwotICAgICAgICAgICAgZ2V0VHJhbnNmb3JtRnVu Y3Rpb25WYWx1ZShzdGFydFZhbHVlLnZhbHVlKCkuYXQoZnVuY3Rpb25JbmRleCksIHRyYW5zZm9y bU9wVHlwZSwgYm94U2l6ZSwgZnJvbVZhbHVlKTsKKyAgICAgICAgICAgIGdldFRyYW5zZm9ybUZ1 bmN0aW9uVmFsdWUoc3RhcnRWYWx1ZS5hdChmdW5jdGlvbkluZGV4KSwgdHJhbnNmb3JtT3BUeXBl LCBib3hTaXplLCBmcm9tVmFsdWUpOwogICAgICAgICAgICAgYmFzaWNBbmltLT5zZXRGcm9tVmFs dWUoZnJvbVZhbHVlKTsKICAgICAgICAgICAgIAogICAgICAgICAgICAgZmxvYXQgdG9WYWx1ZTsK LSAgICAgICAgICAgIGdldFRyYW5zZm9ybUZ1bmN0aW9uVmFsdWUoZW5kVmFsdWUudmFsdWUoKS5h dChmdW5jdGlvbkluZGV4KSwgdHJhbnNmb3JtT3BUeXBlLCBib3hTaXplLCB0b1ZhbHVlKTsKKyAg ICAgICAgICAgIGdldFRyYW5zZm9ybUZ1bmN0aW9uVmFsdWUoZW5kVmFsdWUuYXQoZnVuY3Rpb25J bmRleCksIHRyYW5zZm9ybU9wVHlwZSwgYm94U2l6ZSwgdG9WYWx1ZSk7CiAgICAgICAgICAgICBi YXNpY0FuaW0tPnNldFRvVmFsdWUodG9WYWx1ZSk7CiAgICAgICAgIH0gZWxzZSBpZiAoaXNUcmFu c2Zvcm1UeXBlRmxvYXRQb2ludDNEKHRyYW5zZm9ybU9wVHlwZSkpIHsKICAgICAgICAgICAgIEZs b2F0UG9pbnQzRCBmcm9tVmFsdWU7Ci0gICAgICAgICAgICBnZXRUcmFuc2Zvcm1GdW5jdGlvblZh bHVlKHN0YXJ0VmFsdWUudmFsdWUoKS5hdChmdW5jdGlvbkluZGV4KSwgdHJhbnNmb3JtT3BUeXBl LCBib3hTaXplLCBmcm9tVmFsdWUpOworICAgICAgICAgICAgZ2V0VHJhbnNmb3JtRnVuY3Rpb25W YWx1ZShzdGFydFZhbHVlLmF0KGZ1bmN0aW9uSW5kZXgpLCB0cmFuc2Zvcm1PcFR5cGUsIGJveFNp emUsIGZyb21WYWx1ZSk7CiAgICAgICAgICAgICBiYXNpY0FuaW0tPnNldEZyb21WYWx1ZShmcm9t VmFsdWUpOwogICAgICAgICAgICAgCiAgICAgICAgICAgICBGbG9hdFBvaW50M0QgdG9WYWx1ZTsK LSAgICAgICAgICAgIGdldFRyYW5zZm9ybUZ1bmN0aW9uVmFsdWUoZW5kVmFsdWUudmFsdWUoKS5h dChmdW5jdGlvbkluZGV4KSwgdHJhbnNmb3JtT3BUeXBlLCBib3hTaXplLCB0b1ZhbHVlKTsKKyAg ICAgICAgICAgIGdldFRyYW5zZm9ybUZ1bmN0aW9uVmFsdWUoZW5kVmFsdWUuYXQoZnVuY3Rpb25J bmRleCksIHRyYW5zZm9ybU9wVHlwZSwgYm94U2l6ZSwgdG9WYWx1ZSk7CiAgICAgICAgICAgICBi YXNpY0FuaW0tPnNldFRvVmFsdWUodG9WYWx1ZSk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAg ICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCBmcm9tVmFsdWU7Ci0gICAgICAgICAgICBnZXRUcmFu c2Zvcm1GdW5jdGlvblZhbHVlKHN0YXJ0VmFsdWUudmFsdWUoKS5hdChmdW5jdGlvbkluZGV4KSwg dHJhbnNmb3JtT3BUeXBlLCBib3hTaXplLCBmcm9tVmFsdWUpOworICAgICAgICAgICAgZ2V0VHJh bnNmb3JtRnVuY3Rpb25WYWx1ZShzdGFydFZhbHVlLmF0KGZ1bmN0aW9uSW5kZXgpLCB0cmFuc2Zv cm1PcFR5cGUsIGJveFNpemUsIGZyb21WYWx1ZSk7CiAgICAgICAgICAgICBiYXNpY0FuaW0tPnNl dEZyb21WYWx1ZShmcm9tVmFsdWUpOwogCiAgICAgICAgICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJp eCB0b1ZhbHVlOwotICAgICAgICAgICAgZ2V0VHJhbnNmb3JtRnVuY3Rpb25WYWx1ZShlbmRWYWx1 ZS52YWx1ZSgpLmF0KGZ1bmN0aW9uSW5kZXgpLCB0cmFuc2Zvcm1PcFR5cGUsIGJveFNpemUsIHRv VmFsdWUpOworICAgICAgICAgICAgZ2V0VHJhbnNmb3JtRnVuY3Rpb25WYWx1ZShlbmRWYWx1ZS5h dChmdW5jdGlvbkluZGV4KSwgdHJhbnNmb3JtT3BUeXBlLCBib3hTaXplLCB0b1ZhbHVlKTsKICAg ICAgICAgICAgIGJhc2ljQW5pbS0+c2V0VG9WYWx1ZSh0b1ZhbHVlKTsKICAgICAgICAgfQogICAg IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RyYW5zZm9y bXMvVHJhbnNmb3JtT3BlcmF0aW9ucy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvdHJhbnNmb3Jtcy9UcmFuc2Zvcm1PcGVyYXRpb25zLmgKaW5kZXggNjI0MTViZjQzZGNjZmY1 MDY0ZDQ3MjQ5ODQ2NTkyMjNlYjIzMjUzOC4uZjdhYzRiYzgxZTYzN2JkN2NhM2Q5MmViZjhjZjY2 YTQ1ZWQwZDEzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv dHJhbnNmb3Jtcy9UcmFuc2Zvcm1PcGVyYXRpb25zLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvdHJhbnNmb3Jtcy9UcmFuc2Zvcm1PcGVyYXRpb25zLmgKQEAgLTExOCw3 ICsxMTgsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB+U2hhcmVkUHJpbWl0aXZlc1ByZWZpeCgp ID0gZGVmYXVsdDsKICAgICB2b2lkIHVwZGF0ZShjb25zdCBUcmFuc2Zvcm1PcGVyYXRpb25zJik7 CiAgICAgYm9vbCBoYWRJbmNvbXBhdGlibGVUcmFuc2Zvcm1GdW5jdGlvbnMoKSB7IHJldHVybiBt X2luZGV4T2ZGaXJzdE1pc21hdGNoLmhhc192YWx1ZSgpOyB9Ci0gICAgY29uc3QgVmVjdG9yPFRy YW5zZm9ybU9wZXJhdGlvbjo6T3BlcmF0aW9uVHlwZT4mIHByaW1pdGl2ZXMoKSB7IHJldHVybiBt X3ByaW1pdGl2ZXM7IH0KKyAgICBjb25zdCBWZWN0b3I8VHJhbnNmb3JtT3BlcmF0aW9uOjpPcGVy YXRpb25UeXBlPiYgcHJpbWl0aXZlcygpIGNvbnN0IHsgcmV0dXJuIG1fcHJpbWl0aXZlczsgfQog CiBwcml2YXRlOgogICAgIHN0ZDo6b3B0aW9uYWw8c2l6ZV90PiBtX2luZGV4T2ZGaXJzdE1pc21h dGNoOwo=