222979 2021-03-09 08:35:18 -0800 REGRESSION (r273003): Animated style may lose original display property value 2021-03-09 13:17:51 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr zalan oldest_to_newest 1737582 0 koivisto 2021-03-09 08:35:18 -0800 We need pre-blockification display value in some cases. 1737584 1 422704 koivisto 2021-03-09 08:35:41 -0800 Created attachment 422704 wip 1737586 2 koivisto 2021-03-09 08:37:47 -0800 rdar://75056684 1737636 3 422721 koivisto 2021-03-09 10:03:42 -0800 Created attachment 422721 patch 1737733 4 ews-feeder 2021-03-09 13:17:48 -0800 Committed r274170: <https://commits.webkit.org/r274170> All reviewed patches have been landed. Closing bug and clearing flags on attachment 422721. 422704 2021-03-09 08:35:41 -0800 2021-03-09 10:03:42 -0800 wip animation-original-display.patch text/plain 9367 koivisto ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvYW5pbWF0aW9uL2FuaW1hdGlvbi1kaXNwbGF5 LXN0eWxlLWFkanVzdG1lbnQtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvYW5pbWF0 aW9uL2FuaW1hdGlvbi1kaXNwbGF5LXN0eWxlLWFkanVzdG1lbnQtZXhwZWN0ZWQuaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjFhMmZmMDA5ZTdlOAotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvYW5pbWF0aW9uL2FuaW1hdGlvbi1kaXNwbGF5 LXN0eWxlLWFkanVzdG1lbnQtZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDE4IEBACis8c3R5bGU+ CisudGVzdCB7CisgICAgdGV4dC1hbGlnbjogY2VudGVyOworICAgIGJvcmRlcjogMnB4IHNvbGlk IGdyZWVuOworICAgIGhlaWdodDoxMDBweDsKK30KKy50ZXN0ID4gc3BhbiB7CisgICAgdG9wOiA0 MHB4OworICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICB3aWR0aDogNjRweDsKKyAgICBoZWln aHQ6IDY0cHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjogI2ZmNDUwMDsKKyAgICBib3JkZXItcmFk aXVzOiAxMDAlOworfQorPC9zdHlsZT4KKzxib2R5PgorPGRpdiBjbGFzcz10ZXN0PjxzcGFuPjwv c3Bhbj5jZW50ZXJlZDwvZGl2PgorPC9ib2R5PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9hbmltYXRpb24vYW5pbWF0aW9uLWRpc3BsYXktc3R5bGUtYWRqdXN0bWVudC5odG1sIGIvTGF5 b3V0VGVzdHMvZmFzdC9hbmltYXRpb24vYW5pbWF0aW9uLWRpc3BsYXktc3R5bGUtYWRqdXN0bWVu dC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uNjUyNGFhNzQ1 NjA5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9hbmltYXRpb24vYW5pbWF0 aW9uLWRpc3BsYXktc3R5bGUtYWRqdXN0bWVudC5odG1sCkBAIC0wLDAgKzEsMjUgQEAKKzxzdHls ZT4KK0BrZXlmcmFtZXMgc2NhbGVvdXQgeworICAgIDAlIHsKKyAgICB9CisgICAgdG8geworICAg IH0KK30KKy50ZXN0IHsKKyAgICB0ZXh0LWFsaWduOiBjZW50ZXI7CisgICAgYm9yZGVyOiAycHgg c29saWQgZ3JlZW47CisgICAgaGVpZ2h0OjEwMHB4OworfQorLnRlc3QgPiBzcGFuIHsKKyAgICB0 b3A6IDQwcHg7CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIHdpZHRoOiA2NHB4OworICAg IGhlaWdodDogNjRweDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjZmY0NTAwOworICAgIGJvcmRl ci1yYWRpdXM6IDEwMCU7CisgICAgYW5pbWF0aW9uOnNjYWxlb3V0IDEuNXMgaW5maW5pdGUgZWFz ZS1pbi1vdXQKK30KKzwvc3R5bGU+Cis8Ym9keT4KKzxkaXYgY2xhc3M9dGVzdD48c3Bhbj48L3Nw YW4+Y2VudGVyZWQ8L2Rpdj4KKzwvYm9keT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUaGVtZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWUuY3BwCmluZGV4IDVmZDZlOWM5OGVlOC4uODBlZTFmNTBhYWQ3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAKQEAgLTgyLDkgKzgyLDkgQEAgdm9pZCBSZW5k ZXJUaGVtZTo6YWRqdXN0U3R5bGUoUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBFbGVtZW50KiBl bGVtZW50LCBjb25zdAogICAgICAgICB8fCBzdHlsZS5kaXNwbGF5KCkgPT0gRGlzcGxheVR5cGU6 OlRhYmxlSGVhZGVyR3JvdXAgfHwgc3R5bGUuZGlzcGxheSgpID09IERpc3BsYXlUeXBlOjpUYWJs ZUZvb3Rlckdyb3VwCiAgICAgICAgIHx8IHN0eWxlLmRpc3BsYXkoKSA9PSBEaXNwbGF5VHlwZTo6 VGFibGVSb3cgfHwgc3R5bGUuZGlzcGxheSgpID09IERpc3BsYXlUeXBlOjpUYWJsZUNvbHVtbkdy b3VwIHx8IHN0eWxlLmRpc3BsYXkoKSA9PSBEaXNwbGF5VHlwZTo6VGFibGVDb2x1bW4KICAgICAg ICAgfHwgc3R5bGUuZGlzcGxheSgpID09IERpc3BsYXlUeXBlOjpUYWJsZUNlbGwgfHwgc3R5bGUu ZGlzcGxheSgpID09IERpc3BsYXlUeXBlOjpUYWJsZUNhcHRpb24pCi0gICAgICAgIHN0eWxlLnNl dERpc3BsYXkoRGlzcGxheVR5cGU6OklubGluZUJsb2NrKTsKKyAgICAgICAgc3R5bGUuc2V0RWZm ZWN0aXZlRGlzcGxheShEaXNwbGF5VHlwZTo6SW5saW5lQmxvY2spOwogICAgIGVsc2UgaWYgKHN0 eWxlLmRpc3BsYXkoKSA9PSBEaXNwbGF5VHlwZTo6TGlzdEl0ZW0gfHwgc3R5bGUuZGlzcGxheSgp ID09IERpc3BsYXlUeXBlOjpUYWJsZSkKLSAgICAgICAgc3R5bGUuc2V0RGlzcGxheShEaXNwbGF5 VHlwZTo6QmxvY2spOworICAgICAgICBzdHlsZS5zZXRFZmZlY3RpdmVEaXNwbGF5KERpc3BsYXlU eXBlOjpCbG9jayk7CiAKICAgICBpZiAodXNlckFnZW50QXBwZWFyYW5jZVN0eWxlICYmIGlzQ29u dHJvbFN0eWxlZChzdHlsZSwgKnVzZXJBZ2VudEFwcGVhcmFuY2VTdHlsZSkpIHsKICAgICAgICAg c3dpdGNoIChwYXJ0KSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5 bGUvUmVuZGVyU3R5bGUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJT dHlsZS5oCmluZGV4IGVhZDg1ODdiZTcxMy4uNzUyN2ZiZmJkZDNlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaApAQCAtODQyLDggKzg0MiwxMiBAQCBw dWJsaWM6CiAKIC8vIGF0dHJpYnV0ZSBzZXR0ZXIgbWV0aG9kcwogCi0gICAgdm9pZCBzZXREaXNw bGF5KERpc3BsYXlUeXBlIHYpIHsgbV9ub25Jbmhlcml0ZWRGbGFncy5lZmZlY3RpdmVEaXNwbGF5 ID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHYpOyB9Ci0gICAgdm9pZCBzZXRPcmlnaW5hbERpc3Bs YXkoRGlzcGxheVR5cGUgdikgeyBtX25vbkluaGVyaXRlZEZsYWdzLm9yaWdpbmFsRGlzcGxheSA9 IHN0YXRpY19jYXN0PHVuc2lnbmVkPih2KTsgfQorICAgIHZvaWQgc2V0RGlzcGxheShEaXNwbGF5 VHlwZSB2KQorICAgIHsKKyAgICAgICAgbV9ub25Jbmhlcml0ZWRGbGFncy5lZmZlY3RpdmVEaXNw bGF5ID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHYpOworICAgICAgICBtX25vbkluaGVyaXRlZEZs YWdzLm9yaWdpbmFsRGlzcGxheSA9IHN0YXRpY19jYXN0PHVuc2lnbmVkPih2KTsKKyAgICB9Cisg ICAgdm9pZCBzZXRFZmZlY3RpdmVEaXNwbGF5KERpc3BsYXlUeXBlIHYpIHsgbV9ub25Jbmhlcml0 ZWRGbGFncy5lZmZlY3RpdmVEaXNwbGF5ID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHYpOyB9CiAg ICAgdm9pZCBzZXRQb3NpdGlvbihQb3NpdGlvblR5cGUgdikgeyBtX25vbkluaGVyaXRlZEZsYWdz LnBvc2l0aW9uID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHYpOyB9CiAgICAgdm9pZCBzZXRGbG9h dGluZyhGbG9hdCB2KSB7IG1fbm9uSW5oZXJpdGVkRmxhZ3MuZmxvYXRpbmcgPSBzdGF0aWNfY2Fz dDx1bnNpZ25lZD4odik7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5 bGVBZGp1c3Rlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUFkanVzdGVyLmNwcApp bmRleCBmOTAyNzQ3NTFmNzMuLjYyMGYzMWFlMzlhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvc3R5bGUvU3R5bGVBZGp1c3Rlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5 bGVBZGp1c3Rlci5jcHAKQEAgLTI0Myw5ICsyNDMsNiBAQCBPcHRpb25TZXQ8RXZlbnRMaXN0ZW5l clJlZ2lvblR5cGU+IEFkanVzdGVyOjpjb21wdXRlRXZlbnRMaXN0ZW5lclJlZ2lvblR5cGVzKGNv bgogCiB2b2lkIEFkanVzdGVyOjphZGp1c3QoUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBSZW5k ZXJTdHlsZSogdXNlckFnZW50QXBwZWFyYW5jZVN0eWxlKSBjb25zdAogewotICAgIC8vIENhY2hl IG91ciBvcmlnaW5hbCBkaXNwbGF5LgotICAgIHN0eWxlLnNldE9yaWdpbmFsRGlzcGxheShzdHls ZS5kaXNwbGF5KCkpOwotCiAgICAgaWYgKHN0eWxlLmRpc3BsYXkoKSA9PSBEaXNwbGF5VHlwZTo6 Q29udGVudHMpCiAgICAgICAgIGFkanVzdERpc3BsYXlDb250ZW50c1N0eWxlKHN0eWxlKTsKIApA QCAtMjU3LDEwICsyNTQsMTAgQEAgdm9pZCBBZGp1c3Rlcjo6YWRqdXN0KFJlbmRlclN0eWxlJiBz dHlsZSwgY29uc3QgUmVuZGVyU3R5bGUqIHVzZXJBZ2VudEFwcGVhcmFuY2UKICAgICAgICAgICAg IC8vIHRoZXNlIHRhZ3MgdG8gcmV0YWluIHRoZWlyIGRpc3BsYXkgdHlwZXMuCiAgICAgICAgICAg ICBpZiAobV9kb2N1bWVudC5pblF1aXJrc01vZGUoKSkgewogICAgICAgICAgICAgICAgIGlmICht X2VsZW1lbnQtPmhhc1RhZ05hbWUodGRUYWcpKSB7Ci0gICAgICAgICAgICAgICAgICAgIHN0eWxl LnNldERpc3BsYXkoRGlzcGxheVR5cGU6OlRhYmxlQ2VsbCk7CisgICAgICAgICAgICAgICAgICAg IHN0eWxlLnNldEVmZmVjdGl2ZURpc3BsYXkoRGlzcGxheVR5cGU6OlRhYmxlQ2VsbCk7CiAgICAg ICAgICAgICAgICAgICAgIHN0eWxlLnNldEZsb2F0aW5nKEZsb2F0OjpObyk7CiAgICAgICAgICAg ICAgICAgfSBlbHNlIGlmIChpczxIVE1MVGFibGVFbGVtZW50PigqbV9lbGVtZW50KSkKLSAgICAg ICAgICAgICAgICAgICAgc3R5bGUuc2V0RGlzcGxheShzdHlsZS5pc0Rpc3BsYXlJbmxpbmVUeXBl KCkgPyBEaXNwbGF5VHlwZTo6SW5saW5lVGFibGUgOiBEaXNwbGF5VHlwZTo6VGFibGUpOworICAg ICAgICAgICAgICAgICAgICBzdHlsZS5zZXRFZmZlY3RpdmVEaXNwbGF5KHN0eWxlLmlzRGlzcGxh eUlubGluZVR5cGUoKSA/IERpc3BsYXlUeXBlOjpJbmxpbmVUYWJsZSA6IERpc3BsYXlUeXBlOjpU YWJsZSk7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGlmIChtX2VsZW1lbnQtPmhhc1Rh Z05hbWUodGRUYWcpIHx8IG1fZWxlbWVudC0+aGFzVGFnTmFtZSh0aFRhZykpIHsKQEAgLTI4Myw3 ICsyODAsNyBAQCB2b2lkIEFkanVzdGVyOjphZGp1c3QoUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25z dCBSZW5kZXJTdHlsZSogdXNlckFnZW50QXBwZWFyYW5jZQogICAgICAgICAgICAgLy8gZml4IGEg Y3Jhc2ggd2hlcmUgYSBzaXRlIHRyaWVzIHRvIHBvc2l0aW9uIHRoZXNlIG9iamVjdHMuIFRoZXkg YWxzbyBuZXZlciBob25vciBkaXNwbGF5LgogICAgICAgICAgICAgaWYgKG1fZWxlbWVudC0+aGFz VGFnTmFtZShmcmFtZVRhZykgfHwgbV9lbGVtZW50LT5oYXNUYWdOYW1lKGZyYW1lc2V0VGFnKSkg ewogICAgICAgICAgICAgICAgIHN0eWxlLnNldFBvc2l0aW9uKFBvc2l0aW9uVHlwZTo6U3RhdGlj KTsKLSAgICAgICAgICAgICAgICBzdHlsZS5zZXREaXNwbGF5KERpc3BsYXlUeXBlOjpCbG9jayk7 CisgICAgICAgICAgICAgICAgc3R5bGUuc2V0RWZmZWN0aXZlRGlzcGxheShEaXNwbGF5VHlwZTo6 QmxvY2spOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAvLyBSdWJ5IHRleHQgZG9lcyBu b3Qgc3VwcG9ydCBmbG9hdCBvciBwb3NpdGlvbi4gVGhpcyBtaWdodCBjaGFuZ2Ugd2l0aCBldm9s dXRpb24gb2YgdGhlIHNwZWNpZmljYXRpb24uCkBAIC0zMDAsMTcgKzI5NywxNyBAQCB2b2lkIEFk anVzdGVyOjphZGp1c3QoUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSogdXNl ckFnZW50QXBwZWFyYW5jZQogICAgICAgICAgICAgICAgIHN0eWxlLnNldFRleHRBbGlnbihUZXh0 QWxpZ25Nb2RlOjpDZW50ZXIpOwogCiAgICAgICAgICAgICBpZiAobV9lbGVtZW50LT5oYXNUYWdO YW1lKGxlZ2VuZFRhZykpCi0gICAgICAgICAgICAgICAgc3R5bGUuc2V0RGlzcGxheShEaXNwbGF5 VHlwZTo6QmxvY2spOworICAgICAgICAgICAgICAgIHN0eWxlLnNldEVmZmVjdGl2ZURpc3BsYXko RGlzcGxheVR5cGU6OkJsb2NrKTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIEFic29sdXRlL2Zp eGVkIHBvc2l0aW9uZWQgZWxlbWVudHMsIGZsb2F0aW5nIGVsZW1lbnRzIGFuZCB0aGUgZG9jdW1l bnQgZWxlbWVudCBuZWVkIGJsb2NrLWxpa2Ugb3V0c2lkZSBkaXNwbGF5LgogICAgICAgICBpZiAo c3R5bGUuaGFzT3V0T2ZGbG93UG9zaXRpb24oKSB8fCBzdHlsZS5pc0Zsb2F0aW5nKCkgfHwgKG1f ZWxlbWVudCAmJiBtX2RvY3VtZW50LmRvY3VtZW50RWxlbWVudCgpID09IG1fZWxlbWVudCkpCi0g ICAgICAgICAgICBzdHlsZS5zZXREaXNwbGF5KGVxdWl2YWxlbnRCbG9ja0Rpc3BsYXkoc3R5bGUs IG1fZG9jdW1lbnQpKTsKKyAgICAgICAgICAgIHN0eWxlLnNldEVmZmVjdGl2ZURpc3BsYXkoZXF1 aXZhbGVudEJsb2NrRGlzcGxheShzdHlsZSwgbV9kb2N1bWVudCkpOwogCiAgICAgICAgIC8vIEZJ WE1FOiBEb24ndCBzdXBwb3J0IHRoaXMgbXV0YXRpb24gZm9yIHBzZXVkbyBzdHlsZXMgbGlrZSBm aXJzdC1sZXR0ZXIgb3IgZmlyc3QtbGluZSwgc2luY2UgaXQncyBub3QgY29tcGxldGVseQogICAg ICAgICAvLyBjbGVhciBob3cgdGhhdCBzaG91bGQgd29yay4KICAgICAgICAgaWYgKHN0eWxlLmRp c3BsYXkoKSA9PSBEaXNwbGF5VHlwZTo6SW5saW5lICYmIHN0eWxlLnN0eWxlVHlwZSgpID09IFBz ZXVkb0lkOjpOb25lICYmIHN0eWxlLndyaXRpbmdNb2RlKCkgIT0gbV9wYXJlbnRTdHlsZS53cml0 aW5nTW9kZSgpKQotICAgICAgICAgICAgc3R5bGUuc2V0RGlzcGxheShEaXNwbGF5VHlwZTo6SW5s aW5lQmxvY2spOworICAgICAgICAgICAgc3R5bGUuc2V0RWZmZWN0aXZlRGlzcGxheShEaXNwbGF5 VHlwZTo6SW5saW5lQmxvY2spOwogCiAgICAgICAgIC8vIEFmdGVyIHBlcmZvcm1pbmcgdGhlIGRp c3BsYXkgbXV0YXRpb24sIGNoZWNrIHRhYmxlIHJvd3MuIFdlIGRvIG5vdCBob25vciBwb3NpdGlv bjpyZWxhdGl2ZSBvciBwb3NpdGlvbjpzdGlja3kgb24KICAgICAgICAgLy8gdGFibGUgcm93cyBv ciBjZWxscy4gVGhpcyBoYXMgYmVlbiBlc3RhYmxpc2hlZCBmb3IgcG9zaXRpb246cmVsYXRpdmUg aW4gQ1NTMi4xIChhbmQgY2F1c2VkIGEgY3Jhc2ggaW4gY29udGFpbmluZ0Jsb2NrKCkKQEAgLTMz Nyw3ICszMzQsNyBAQCB2b2lkIEFkanVzdGVyOjphZGp1c3QoUmVuZGVyU3R5bGUmIHN0eWxlLCBj b25zdCBSZW5kZXJTdHlsZSogdXNlckFnZW50QXBwZWFyYW5jZQogICAgICAgICAvLyAiQSBwYXJl bnQgd2l0aCBhIGdyaWQgb3IgZmxleCBkaXNwbGF5IHZhbHVlIGJsb2NraWZpZXMgdGhlIGJveOKA mXMgZGlzcGxheSB0eXBlLiIKICAgICAgICAgaWYgKG1fcGFyZW50Qm94U3R5bGUuaXNEaXNwbGF5 RmxleGlibGVPckdyaWRCb3goKSkgewogICAgICAgICAgICAgc3R5bGUuc2V0RmxvYXRpbmcoRmxv YXQ6Ok5vKTsKLSAgICAgICAgICAgIHN0eWxlLnNldERpc3BsYXkoZXF1aXZhbGVudEJsb2NrRGlz cGxheShzdHlsZSwgbV9kb2N1bWVudCkpOworICAgICAgICAgICAgc3R5bGUuc2V0RWZmZWN0aXZl RGlzcGxheShlcXVpdmFsZW50QmxvY2tEaXNwbGF5KHN0eWxlLCBtX2RvY3VtZW50KSk7CiAgICAg ICAgIH0KICAgICB9CiAKQEAgLTU0NCwxNyArNTQxLDE3IEBAIHZvaWQgQWRqdXN0ZXI6OmFkanVz dERpc3BsYXlDb250ZW50c1N0eWxlKFJlbmRlclN0eWxlJiBzdHlsZSkgY29uc3QKIHsKICAgICBp ZiAoIW1fZWxlbWVudCkgewogICAgICAgICBpZiAoc3R5bGUuc3R5bGVUeXBlKCkgIT0gUHNldWRv SWQ6OkJlZm9yZSAmJiBzdHlsZS5zdHlsZVR5cGUoKSAhPSBQc2V1ZG9JZDo6QWZ0ZXIpCi0gICAg ICAgICAgICBzdHlsZS5zZXREaXNwbGF5KERpc3BsYXlUeXBlOjpOb25lKTsKKyAgICAgICAgICAg IHN0eWxlLnNldEVmZmVjdGl2ZURpc3BsYXkoRGlzcGxheVR5cGU6Ok5vbmUpOwogICAgICAgICBy ZXR1cm47CiAgICAgfQogCiAgICAgaWYgKG1fZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50KCkgPT0g bV9lbGVtZW50KSB7Ci0gICAgICAgIHN0eWxlLnNldERpc3BsYXkoRGlzcGxheVR5cGU6OkJsb2Nr KTsKKyAgICAgICAgc3R5bGUuc2V0RWZmZWN0aXZlRGlzcGxheShEaXNwbGF5VHlwZTo6QmxvY2sp OwogICAgICAgICByZXR1cm47CiAgICAgfQogCiAgICAgaWYgKGhhc0VmZmVjdGl2ZURpc3BsYXlO b25lRm9yRGlzcGxheUNvbnRlbnRzKCptX2VsZW1lbnQpKQotICAgICAgICBzdHlsZS5zZXREaXNw bGF5KERpc3BsYXlUeXBlOjpOb25lKTsKKyAgICAgICAgc3R5bGUuc2V0RWZmZWN0aXZlRGlzcGxh eShEaXNwbGF5VHlwZTo6Tm9uZSk7CiB9CiAKIHZvaWQgQWRqdXN0ZXI6OmFkanVzdFNWR0VsZW1l bnRTdHlsZShSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IFNWR0VsZW1lbnQmIHN2Z0VsZW1lbnQp CkBAIC01NzEsNyArNTY4LDcgQEAgdm9pZCBBZGp1c3Rlcjo6YWRqdXN0U1ZHRWxlbWVudFN0eWxl KFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3QgU1ZHRWxlbWVudCYgc3ZnRWwKIAogICAgIC8vIFNW RyB0ZXh0IGxheW91dCBjb2RlIGV4cGVjdHMgdXMgdG8gYmUgYSBibG9jay1sZXZlbCBzdHlsZSBl bGVtZW50LgogICAgIGlmICgoc3ZnRWxlbWVudC5oYXNUYWdOYW1lKFNWR05hbWVzOjpmb3JlaWdu T2JqZWN0VGFnKSB8fCBzdmdFbGVtZW50Lmhhc1RhZ05hbWUoU1ZHTmFtZXM6OnRleHRUYWcpKSAm JiBzdHlsZS5pc0Rpc3BsYXlJbmxpbmVUeXBlKCkpCi0gICAgICAgIHN0eWxlLnNldERpc3BsYXko RGlzcGxheVR5cGU6OkJsb2NrKTsKKyAgICAgICAgc3R5bGUuc2V0RWZmZWN0aXZlRGlzcGxheShE aXNwbGF5VHlwZTo6QmxvY2spOwogfQogCiB2b2lkIEFkanVzdGVyOjphZGp1c3RBbmltYXRlZFN0 eWxlKFJlbmRlclN0eWxlJiBzdHlsZSwgT3B0aW9uU2V0PEFuaW1hdGlvbkltcGFjdD4gaW1wYWN0 KSBjb25zdApAQCAtNjMwLDcgKzYyNyw3IEBAIHZvaWQgQWRqdXN0ZXI6OmFkanVzdEZvclNpdGVT cGVjaWZpY1F1aXJrcyhSZW5kZXJTdHlsZSYgc3R5bGUpIGNvbnN0CiAgICAgICAgICAgICBpZiAo ZGl2Lmhhc0NsYXNzKCkgJiYgZGl2LmNsYXNzTmFtZXMoKS5jb250YWlucyhpbnN0cmVhbU5hdGl2 ZVZpZGVvRGl2Q2xhc3MpKSB7CiAgICAgICAgICAgICAgICAgYXV0byogdmlkZW8gPSBkaXYudHJl ZVNjb3BlKCkuZ2V0RWxlbWVudEJ5SWQodmlkZW9FbGVtZW50SUQpOwogICAgICAgICAgICAgICAg IGlmIChpczxIVE1MVmlkZW9FbGVtZW50Pih2aWRlbykgJiYgZG93bmNhc3Q8SFRNTFZpZGVvRWxl bWVudD4oKnZpZGVvKS5pc0Z1bGxzY3JlZW4oKSkKLSAgICAgICAgICAgICAgICAgICAgc3R5bGUu c2V0RGlzcGxheShEaXNwbGF5VHlwZTo6QmxvY2spOworICAgICAgICAgICAgICAgICAgICBzdHls ZS5zZXRFZmZlY3RpdmVEaXNwbGF5KERpc3BsYXlUeXBlOjpCbG9jayk7CiAgICAgICAgICAgICB9 CiAgICAgICAgIH0KICAgICB9Cg== 422721 2021-03-09 10:03:42 -0800 2021-03-09 13:17:50 -0800 patch animation-original-display-2.patch text/plain 11961 koivisto ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzNzExYzk5NDJmNGUuLmNhMzgyMWY4NzVmNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDIxLTAzLTA5ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAg ICBSRUdSRVNTSU9OIChyMjczMDAzKTogQW5pbWF0ZWQgc3R5bGUgbWF5IGxvc2Ugb3JpZ2luYWwg ZGlzcGxheSBwcm9wZXJ0eSB2YWx1ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjIyOTc5CisgICAgICAgIHJkYXI6Ly83NTA1NjY4NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9hbmltYXRpb24v YW5pbWF0aW9uLWRpc3BsYXktc3R5bGUtYWRqdXN0bWVudC1leHBlY3RlZC5odG1sOiBBZGRlZC4K KyAgICAgICAgKiBmYXN0L2FuaW1hdGlvbi9hbmltYXRpb24tZGlzcGxheS1zdHlsZS1hZGp1c3Rt ZW50Lmh0bWw6IEFkZGVkLgorCiAyMDIxLTAzLTA5ICBLaW1tbyBLaW5udW5lbiAgPGtraW5udW5l bkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViR0wyOiBSZWQgZmxpY2tlcmluZyB3aGVuIHVzaW5n IGNvcHlUZXhJbWFnZTJEKCkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvYW5pbWF0aW9u L2FuaW1hdGlvbi1kaXNwbGF5LXN0eWxlLWFkanVzdG1lbnQtZXhwZWN0ZWQuaHRtbCBiL0xheW91 dFRlc3RzL2Zhc3QvYW5pbWF0aW9uL2FuaW1hdGlvbi1kaXNwbGF5LXN0eWxlLWFkanVzdG1lbnQt ZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjFh MmZmMDA5ZTdlOAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvYW5pbWF0aW9u L2FuaW1hdGlvbi1kaXNwbGF5LXN0eWxlLWFkanVzdG1lbnQtZXhwZWN0ZWQuaHRtbApAQCAtMCww ICsxLDE4IEBACis8c3R5bGU+CisudGVzdCB7CisgICAgdGV4dC1hbGlnbjogY2VudGVyOworICAg IGJvcmRlcjogMnB4IHNvbGlkIGdyZWVuOworICAgIGhlaWdodDoxMDBweDsKK30KKy50ZXN0ID4g c3BhbiB7CisgICAgdG9wOiA0MHB4OworICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICB3aWR0 aDogNjRweDsKKyAgICBoZWlnaHQ6IDY0cHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjogI2ZmNDUw MDsKKyAgICBib3JkZXItcmFkaXVzOiAxMDAlOworfQorPC9zdHlsZT4KKzxib2R5PgorPGRpdiBj bGFzcz10ZXN0PjxzcGFuPjwvc3Bhbj5jZW50ZXJlZDwvZGl2PgorPC9ib2R5PgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZmFzdC9hbmltYXRpb24vYW5pbWF0aW9uLWRpc3BsYXktc3R5bGUtYWRq dXN0bWVudC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9hbmltYXRpb24vYW5pbWF0aW9uLWRpc3Bs YXktc3R5bGUtYWRqdXN0bWVudC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMC4uNjUyNGFhNzQ1NjA5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFz dC9hbmltYXRpb24vYW5pbWF0aW9uLWRpc3BsYXktc3R5bGUtYWRqdXN0bWVudC5odG1sCkBAIC0w LDAgKzEsMjUgQEAKKzxzdHlsZT4KK0BrZXlmcmFtZXMgc2NhbGVvdXQgeworICAgIDAlIHsKKyAg ICB9CisgICAgdG8geworICAgIH0KK30KKy50ZXN0IHsKKyAgICB0ZXh0LWFsaWduOiBjZW50ZXI7 CisgICAgYm9yZGVyOiAycHggc29saWQgZ3JlZW47CisgICAgaGVpZ2h0OjEwMHB4OworfQorLnRl c3QgPiBzcGFuIHsKKyAgICB0b3A6IDQwcHg7CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAg IHdpZHRoOiA2NHB4OworICAgIGhlaWdodDogNjRweDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiAj ZmY0NTAwOworICAgIGJvcmRlci1yYWRpdXM6IDEwMCU7CisgICAgYW5pbWF0aW9uOnNjYWxlb3V0 IDEuNXMgaW5maW5pdGUgZWFzZS1pbi1vdXQKK30KKzwvc3R5bGU+Cis8Ym9keT4KKzxkaXYgY2xh c3M9dGVzdD48c3Bhbj48L3NwYW4+Y2VudGVyZWQ8L2Rpdj4KKzwvYm9keT4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRl eCA4Y2Y5OWVjNWRjMDguLmIwM2Y2ODE4NGRkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBA CisyMDIxLTAzLTA5ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAg ICBSRUdSRVNTSU9OIChyMjczMDAzKTogQW5pbWF0ZWQgc3R5bGUgbWF5IGxvc2Ugb3JpZ2luYWwg ZGlzcGxheSBwcm9wZXJ0eSB2YWx1ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjIyOTc5CisgICAgICAgIHJkYXI6Ly83NTA1NjY4NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZhc3QvYW5pbWF0 aW9uL2FuaW1hdGlvbi1kaXNwbGF5LXN0eWxlLWFkanVzdG1lbnQuaHRtbAorCisgICAgICAgIFRo ZSBvcmlnaW5hbCAobm9uLWJsb2NraWZpZWQpIGRpc3BsYXkgcHJvcGVydHkgdmFsdWUgaXMgc2F2 ZWQgaW4gdGhlIGJlZ2lubmluZyBvZiBTdHlsZTo6QWRqdXN0ZXI6OmFkanVzdC4KKyAgICAgICAg SXQgaXMgbmVlZGVkIHRvIGltcGxlbWVudCBhYnNvbHV0ZSBwb3NpdGlvbmluZyBjb3JyZWN0bHkg aW4gc29tZSBzaXR1YXRpb25zLiBIb3dldmVyIHdpdGggYW5pbWF0aW9ucworICAgICAgICB0aGUg c3R5bGUgYWRqdXN0bWVudCBjb2RlIG1heSBydW4gdHdpY2Ugb24gdGhlIHNhbWUgc3R5bGUgYW5k IHRoZSBzZWNvbmQgcnVuIHdpbGwgY2xvYmJlciB0aGUgc2F2ZWQgb3JpZ2luYWwgdmFsdWUuCisK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyVGhlbWU6OmFkanVzdFN0eWxlKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVu ZGVyU3R5bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpzZXREaXNwbGF5KToK KworICAgICAgICBBbHdheXMgc2F2ZSB0aGUgb3JpZ2luYWwgdmFsdWUgd2hlbiBzZXR0aW5nIHRo ZSBwcm9wZXJ0eSBub3JtYWxseS4KKworICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OnNl dEVmZmVjdGl2ZURpc3BsYXkpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OnNldE9y aWdpbmFsRGlzcGxheSk6IERlbGV0ZWQuCisKKyAgICAgICAgQWRkIHNldEVmZmVjdGl2ZURpc3Bs YXkgdGhhdCBkb2Vzbid0IGFmZmVjdCB0aGUgb3JpZ2luYWwgdmFsdWUgZm9yIGFkanVzdGVyIHVz ZS4KKworICAgICAgICAqIHN0eWxlL1N0eWxlQWRqdXN0ZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6U3R5bGU6OkFkanVzdGVyOjphZGp1c3QgY29uc3QpOgorCisgICAgICAgIFJlbW92ZSB0aGUg c2F2aW5nIG9mIHRoZSBvcmlnaW5hbCB2YWx1ZS4KKyAgICAgICAgVXNlIHNldEVmZmVjdGl2ZURp c3BsYXkgaW4gYWxsIGFkanVzdGVyIGNvZGUsIHByZXNlcnZpbmcgdGhlIG9yaWdpbmFsIHZhbHVl LgorCisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6QWRqdXN0ZXI6OmFkanVzdERpc3BsYXlDb250 ZW50c1N0eWxlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpBZGp1c3Rlcjo6YWRq dXN0U1ZHRWxlbWVudFN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpBZGp1c3Rlcjo6 YWRqdXN0Rm9yU2l0ZVNwZWNpZmljUXVpcmtzIGNvbnN0KToKKwogMjAyMS0wMy0wOSAgS2ltbW8g S2lubnVuZW4gIDxra2lubnVuZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYkdMMjogUmVkIGZs aWNrZXJpbmcgd2hlbiB1c2luZyBjb3B5VGV4SW1hZ2UyRCgpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRoZW1lLmNwcAppbmRleCA1ZmQ2ZTljOThlZTguLjgwZWUxZjUwYWFkNyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCkBAIC04Miw5ICs4Miw5IEBA IHZvaWQgUmVuZGVyVGhlbWU6OmFkanVzdFN0eWxlKFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3Qg RWxlbWVudCogZWxlbWVudCwgY29uc3QKICAgICAgICAgfHwgc3R5bGUuZGlzcGxheSgpID09IERp c3BsYXlUeXBlOjpUYWJsZUhlYWRlckdyb3VwIHx8IHN0eWxlLmRpc3BsYXkoKSA9PSBEaXNwbGF5 VHlwZTo6VGFibGVGb290ZXJHcm91cAogICAgICAgICB8fCBzdHlsZS5kaXNwbGF5KCkgPT0gRGlz cGxheVR5cGU6OlRhYmxlUm93IHx8IHN0eWxlLmRpc3BsYXkoKSA9PSBEaXNwbGF5VHlwZTo6VGFi bGVDb2x1bW5Hcm91cCB8fCBzdHlsZS5kaXNwbGF5KCkgPT0gRGlzcGxheVR5cGU6OlRhYmxlQ29s dW1uCiAgICAgICAgIHx8IHN0eWxlLmRpc3BsYXkoKSA9PSBEaXNwbGF5VHlwZTo6VGFibGVDZWxs IHx8IHN0eWxlLmRpc3BsYXkoKSA9PSBEaXNwbGF5VHlwZTo6VGFibGVDYXB0aW9uKQotICAgICAg ICBzdHlsZS5zZXREaXNwbGF5KERpc3BsYXlUeXBlOjpJbmxpbmVCbG9jayk7CisgICAgICAgIHN0 eWxlLnNldEVmZmVjdGl2ZURpc3BsYXkoRGlzcGxheVR5cGU6OklubGluZUJsb2NrKTsKICAgICBl bHNlIGlmIChzdHlsZS5kaXNwbGF5KCkgPT0gRGlzcGxheVR5cGU6Okxpc3RJdGVtIHx8IHN0eWxl LmRpc3BsYXkoKSA9PSBEaXNwbGF5VHlwZTo6VGFibGUpCi0gICAgICAgIHN0eWxlLnNldERpc3Bs YXkoRGlzcGxheVR5cGU6OkJsb2NrKTsKKyAgICAgICAgc3R5bGUuc2V0RWZmZWN0aXZlRGlzcGxh eShEaXNwbGF5VHlwZTo6QmxvY2spOwogCiAgICAgaWYgKHVzZXJBZ2VudEFwcGVhcmFuY2VTdHls ZSAmJiBpc0NvbnRyb2xTdHlsZWQoc3R5bGUsICp1c2VyQWdlbnRBcHBlYXJhbmNlU3R5bGUpKSB7 CiAgICAgICAgIHN3aXRjaCAocGFydCkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5 bGUvUmVuZGVyU3R5bGUuaAppbmRleCBlYWQ4NTg3YmU3MTMuLjNhZjNkM2Y5Njc3ZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKQEAgLTg0Miw4ICs4 NDIsMTIgQEAgcHVibGljOgogCiAvLyBhdHRyaWJ1dGUgc2V0dGVyIG1ldGhvZHMKIAotICAgIHZv aWQgc2V0RGlzcGxheShEaXNwbGF5VHlwZSB2KSB7IG1fbm9uSW5oZXJpdGVkRmxhZ3MuZWZmZWN0 aXZlRGlzcGxheSA9IHN0YXRpY19jYXN0PHVuc2lnbmVkPih2KTsgfQotICAgIHZvaWQgc2V0T3Jp Z2luYWxEaXNwbGF5KERpc3BsYXlUeXBlIHYpIHsgbV9ub25Jbmhlcml0ZWRGbGFncy5vcmlnaW5h bERpc3BsYXkgPSBzdGF0aWNfY2FzdDx1bnNpZ25lZD4odik7IH0KKyAgICB2b2lkIHNldERpc3Bs YXkoRGlzcGxheVR5cGUgdmFsdWUpCisgICAgeworICAgICAgICBtX25vbkluaGVyaXRlZEZsYWdz Lm9yaWdpbmFsRGlzcGxheSA9IHN0YXRpY19jYXN0PHVuc2lnbmVkPih2YWx1ZSk7CisgICAgICAg IG1fbm9uSW5oZXJpdGVkRmxhZ3MuZWZmZWN0aXZlRGlzcGxheSA9IG1fbm9uSW5oZXJpdGVkRmxh Z3Mub3JpZ2luYWxEaXNwbGF5OworICAgIH0KKyAgICB2b2lkIHNldEVmZmVjdGl2ZURpc3BsYXko RGlzcGxheVR5cGUgdikgeyBtX25vbkluaGVyaXRlZEZsYWdzLmVmZmVjdGl2ZURpc3BsYXkgPSBz dGF0aWNfY2FzdDx1bnNpZ25lZD4odik7IH0KICAgICB2b2lkIHNldFBvc2l0aW9uKFBvc2l0aW9u VHlwZSB2KSB7IG1fbm9uSW5oZXJpdGVkRmxhZ3MucG9zaXRpb24gPSBzdGF0aWNfY2FzdDx1bnNp Z25lZD4odik7IH0KICAgICB2b2lkIHNldEZsb2F0aW5nKEZsb2F0IHYpIHsgbV9ub25Jbmhlcml0 ZWRGbGFncy5mbG9hdGluZyA9IHN0YXRpY19jYXN0PHVuc2lnbmVkPih2KTsgfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUFkanVzdGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3N0eWxlL1N0eWxlQWRqdXN0ZXIuY3BwCmluZGV4IGY5MDI3NDc1MWY3My4uNjIwZjMxYWUz OWE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUFkanVzdGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUFkanVzdGVyLmNwcApAQCAtMjQzLDkgKzI0 Myw2IEBAIE9wdGlvblNldDxFdmVudExpc3RlbmVyUmVnaW9uVHlwZT4gQWRqdXN0ZXI6OmNvbXB1 dGVFdmVudExpc3RlbmVyUmVnaW9uVHlwZXMoY29uCiAKIHZvaWQgQWRqdXN0ZXI6OmFkanVzdChS ZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlKiB1c2VyQWdlbnRBcHBlYXJhbmNl U3R5bGUpIGNvbnN0CiB7Ci0gICAgLy8gQ2FjaGUgb3VyIG9yaWdpbmFsIGRpc3BsYXkuCi0gICAg c3R5bGUuc2V0T3JpZ2luYWxEaXNwbGF5KHN0eWxlLmRpc3BsYXkoKSk7Ci0KICAgICBpZiAoc3R5 bGUuZGlzcGxheSgpID09IERpc3BsYXlUeXBlOjpDb250ZW50cykKICAgICAgICAgYWRqdXN0RGlz cGxheUNvbnRlbnRzU3R5bGUoc3R5bGUpOwogCkBAIC0yNTcsMTAgKzI1NCwxMCBAQCB2b2lkIEFk anVzdGVyOjphZGp1c3QoUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBSZW5kZXJTdHlsZSogdXNl ckFnZW50QXBwZWFyYW5jZQogICAgICAgICAgICAgLy8gdGhlc2UgdGFncyB0byByZXRhaW4gdGhl aXIgZGlzcGxheSB0eXBlcy4KICAgICAgICAgICAgIGlmIChtX2RvY3VtZW50LmluUXVpcmtzTW9k ZSgpKSB7CiAgICAgICAgICAgICAgICAgaWYgKG1fZWxlbWVudC0+aGFzVGFnTmFtZSh0ZFRhZykp IHsKLSAgICAgICAgICAgICAgICAgICAgc3R5bGUuc2V0RGlzcGxheShEaXNwbGF5VHlwZTo6VGFi bGVDZWxsKTsKKyAgICAgICAgICAgICAgICAgICAgc3R5bGUuc2V0RWZmZWN0aXZlRGlzcGxheShE aXNwbGF5VHlwZTo6VGFibGVDZWxsKTsKICAgICAgICAgICAgICAgICAgICAgc3R5bGUuc2V0Rmxv YXRpbmcoRmxvYXQ6Ok5vKTsKICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKGlzPEhUTUxUYWJs ZUVsZW1lbnQ+KCptX2VsZW1lbnQpKQotICAgICAgICAgICAgICAgICAgICBzdHlsZS5zZXREaXNw bGF5KHN0eWxlLmlzRGlzcGxheUlubGluZVR5cGUoKSA/IERpc3BsYXlUeXBlOjpJbmxpbmVUYWJs ZSA6IERpc3BsYXlUeXBlOjpUYWJsZSk7CisgICAgICAgICAgICAgICAgICAgIHN0eWxlLnNldEVm ZmVjdGl2ZURpc3BsYXkoc3R5bGUuaXNEaXNwbGF5SW5saW5lVHlwZSgpID8gRGlzcGxheVR5cGU6 OklubGluZVRhYmxlIDogRGlzcGxheVR5cGU6OlRhYmxlKTsKICAgICAgICAgICAgIH0KIAogICAg ICAgICAgICAgaWYgKG1fZWxlbWVudC0+aGFzVGFnTmFtZSh0ZFRhZykgfHwgbV9lbGVtZW50LT5o YXNUYWdOYW1lKHRoVGFnKSkgewpAQCAtMjgzLDcgKzI4MCw3IEBAIHZvaWQgQWRqdXN0ZXI6OmFk anVzdChSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlKiB1c2VyQWdlbnRBcHBl YXJhbmNlCiAgICAgICAgICAgICAvLyBmaXggYSBjcmFzaCB3aGVyZSBhIHNpdGUgdHJpZXMgdG8g cG9zaXRpb24gdGhlc2Ugb2JqZWN0cy4gVGhleSBhbHNvIG5ldmVyIGhvbm9yIGRpc3BsYXkuCiAg ICAgICAgICAgICBpZiAobV9lbGVtZW50LT5oYXNUYWdOYW1lKGZyYW1lVGFnKSB8fCBtX2VsZW1l bnQtPmhhc1RhZ05hbWUoZnJhbWVzZXRUYWcpKSB7CiAgICAgICAgICAgICAgICAgc3R5bGUuc2V0 UG9zaXRpb24oUG9zaXRpb25UeXBlOjpTdGF0aWMpOwotICAgICAgICAgICAgICAgIHN0eWxlLnNl dERpc3BsYXkoRGlzcGxheVR5cGU6OkJsb2NrKTsKKyAgICAgICAgICAgICAgICBzdHlsZS5zZXRF ZmZlY3RpdmVEaXNwbGF5KERpc3BsYXlUeXBlOjpCbG9jayk7CiAgICAgICAgICAgICB9CiAKICAg ICAgICAgICAgIC8vIFJ1YnkgdGV4dCBkb2VzIG5vdCBzdXBwb3J0IGZsb2F0IG9yIHBvc2l0aW9u LiBUaGlzIG1pZ2h0IGNoYW5nZSB3aXRoIGV2b2x1dGlvbiBvZiB0aGUgc3BlY2lmaWNhdGlvbi4K QEAgLTMwMCwxNyArMjk3LDE3IEBAIHZvaWQgQWRqdXN0ZXI6OmFkanVzdChSZW5kZXJTdHlsZSYg c3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlKiB1c2VyQWdlbnRBcHBlYXJhbmNlCiAgICAgICAgICAg ICAgICAgc3R5bGUuc2V0VGV4dEFsaWduKFRleHRBbGlnbk1vZGU6OkNlbnRlcik7CiAKICAgICAg ICAgICAgIGlmIChtX2VsZW1lbnQtPmhhc1RhZ05hbWUobGVnZW5kVGFnKSkKLSAgICAgICAgICAg ICAgICBzdHlsZS5zZXREaXNwbGF5KERpc3BsYXlUeXBlOjpCbG9jayk7CisgICAgICAgICAgICAg ICAgc3R5bGUuc2V0RWZmZWN0aXZlRGlzcGxheShEaXNwbGF5VHlwZTo6QmxvY2spOwogICAgICAg ICB9CiAKICAgICAgICAgLy8gQWJzb2x1dGUvZml4ZWQgcG9zaXRpb25lZCBlbGVtZW50cywgZmxv YXRpbmcgZWxlbWVudHMgYW5kIHRoZSBkb2N1bWVudCBlbGVtZW50IG5lZWQgYmxvY2stbGlrZSBv dXRzaWRlIGRpc3BsYXkuCiAgICAgICAgIGlmIChzdHlsZS5oYXNPdXRPZkZsb3dQb3NpdGlvbigp IHx8IHN0eWxlLmlzRmxvYXRpbmcoKSB8fCAobV9lbGVtZW50ICYmIG1fZG9jdW1lbnQuZG9jdW1l bnRFbGVtZW50KCkgPT0gbV9lbGVtZW50KSkKLSAgICAgICAgICAgIHN0eWxlLnNldERpc3BsYXko ZXF1aXZhbGVudEJsb2NrRGlzcGxheShzdHlsZSwgbV9kb2N1bWVudCkpOworICAgICAgICAgICAg c3R5bGUuc2V0RWZmZWN0aXZlRGlzcGxheShlcXVpdmFsZW50QmxvY2tEaXNwbGF5KHN0eWxlLCBt X2RvY3VtZW50KSk7CiAKICAgICAgICAgLy8gRklYTUU6IERvbid0IHN1cHBvcnQgdGhpcyBtdXRh dGlvbiBmb3IgcHNldWRvIHN0eWxlcyBsaWtlIGZpcnN0LWxldHRlciBvciBmaXJzdC1saW5lLCBz aW5jZSBpdCdzIG5vdCBjb21wbGV0ZWx5CiAgICAgICAgIC8vIGNsZWFyIGhvdyB0aGF0IHNob3Vs ZCB3b3JrLgogICAgICAgICBpZiAoc3R5bGUuZGlzcGxheSgpID09IERpc3BsYXlUeXBlOjpJbmxp bmUgJiYgc3R5bGUuc3R5bGVUeXBlKCkgPT0gUHNldWRvSWQ6Ok5vbmUgJiYgc3R5bGUud3JpdGlu Z01vZGUoKSAhPSBtX3BhcmVudFN0eWxlLndyaXRpbmdNb2RlKCkpCi0gICAgICAgICAgICBzdHls ZS5zZXREaXNwbGF5KERpc3BsYXlUeXBlOjpJbmxpbmVCbG9jayk7CisgICAgICAgICAgICBzdHls ZS5zZXRFZmZlY3RpdmVEaXNwbGF5KERpc3BsYXlUeXBlOjpJbmxpbmVCbG9jayk7CiAKICAgICAg ICAgLy8gQWZ0ZXIgcGVyZm9ybWluZyB0aGUgZGlzcGxheSBtdXRhdGlvbiwgY2hlY2sgdGFibGUg cm93cy4gV2UgZG8gbm90IGhvbm9yIHBvc2l0aW9uOnJlbGF0aXZlIG9yIHBvc2l0aW9uOnN0aWNr eSBvbgogICAgICAgICAvLyB0YWJsZSByb3dzIG9yIGNlbGxzLiBUaGlzIGhhcyBiZWVuIGVzdGFi bGlzaGVkIGZvciBwb3NpdGlvbjpyZWxhdGl2ZSBpbiBDU1MyLjEgKGFuZCBjYXVzZWQgYSBjcmFz aCBpbiBjb250YWluaW5nQmxvY2soKQpAQCAtMzM3LDcgKzMzNCw3IEBAIHZvaWQgQWRqdXN0ZXI6 OmFkanVzdChSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlKiB1c2VyQWdlbnRB cHBlYXJhbmNlCiAgICAgICAgIC8vICJBIHBhcmVudCB3aXRoIGEgZ3JpZCBvciBmbGV4IGRpc3Bs YXkgdmFsdWUgYmxvY2tpZmllcyB0aGUgYm944oCZcyBkaXNwbGF5IHR5cGUuIgogICAgICAgICBp ZiAobV9wYXJlbnRCb3hTdHlsZS5pc0Rpc3BsYXlGbGV4aWJsZU9yR3JpZEJveCgpKSB7CiAgICAg ICAgICAgICBzdHlsZS5zZXRGbG9hdGluZyhGbG9hdDo6Tm8pOwotICAgICAgICAgICAgc3R5bGUu c2V0RGlzcGxheShlcXVpdmFsZW50QmxvY2tEaXNwbGF5KHN0eWxlLCBtX2RvY3VtZW50KSk7Cisg ICAgICAgICAgICBzdHlsZS5zZXRFZmZlY3RpdmVEaXNwbGF5KGVxdWl2YWxlbnRCbG9ja0Rpc3Bs YXkoc3R5bGUsIG1fZG9jdW1lbnQpKTsKICAgICAgICAgfQogICAgIH0KIApAQCAtNTQ0LDE3ICs1 NDEsMTcgQEAgdm9pZCBBZGp1c3Rlcjo6YWRqdXN0RGlzcGxheUNvbnRlbnRzU3R5bGUoUmVuZGVy U3R5bGUmIHN0eWxlKSBjb25zdAogewogICAgIGlmICghbV9lbGVtZW50KSB7CiAgICAgICAgIGlm IChzdHlsZS5zdHlsZVR5cGUoKSAhPSBQc2V1ZG9JZDo6QmVmb3JlICYmIHN0eWxlLnN0eWxlVHlw ZSgpICE9IFBzZXVkb0lkOjpBZnRlcikKLSAgICAgICAgICAgIHN0eWxlLnNldERpc3BsYXkoRGlz cGxheVR5cGU6Ok5vbmUpOworICAgICAgICAgICAgc3R5bGUuc2V0RWZmZWN0aXZlRGlzcGxheShE aXNwbGF5VHlwZTo6Tm9uZSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBpZiAobV9k b2N1bWVudC5kb2N1bWVudEVsZW1lbnQoKSA9PSBtX2VsZW1lbnQpIHsKLSAgICAgICAgc3R5bGUu c2V0RGlzcGxheShEaXNwbGF5VHlwZTo6QmxvY2spOworICAgICAgICBzdHlsZS5zZXRFZmZlY3Rp dmVEaXNwbGF5KERpc3BsYXlUeXBlOjpCbG9jayk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAK ICAgICBpZiAoaGFzRWZmZWN0aXZlRGlzcGxheU5vbmVGb3JEaXNwbGF5Q29udGVudHMoKm1fZWxl bWVudCkpCi0gICAgICAgIHN0eWxlLnNldERpc3BsYXkoRGlzcGxheVR5cGU6Ok5vbmUpOworICAg ICAgICBzdHlsZS5zZXRFZmZlY3RpdmVEaXNwbGF5KERpc3BsYXlUeXBlOjpOb25lKTsKIH0KIAog dm9pZCBBZGp1c3Rlcjo6YWRqdXN0U1ZHRWxlbWVudFN0eWxlKFJlbmRlclN0eWxlJiBzdHlsZSwg Y29uc3QgU1ZHRWxlbWVudCYgc3ZnRWxlbWVudCkKQEAgLTU3MSw3ICs1NjgsNyBAQCB2b2lkIEFk anVzdGVyOjphZGp1c3RTVkdFbGVtZW50U3R5bGUoUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBT VkdFbGVtZW50JiBzdmdFbAogCiAgICAgLy8gU1ZHIHRleHQgbGF5b3V0IGNvZGUgZXhwZWN0cyB1 cyB0byBiZSBhIGJsb2NrLWxldmVsIHN0eWxlIGVsZW1lbnQuCiAgICAgaWYgKChzdmdFbGVtZW50 Lmhhc1RhZ05hbWUoU1ZHTmFtZXM6OmZvcmVpZ25PYmplY3RUYWcpIHx8IHN2Z0VsZW1lbnQuaGFz VGFnTmFtZShTVkdOYW1lczo6dGV4dFRhZykpICYmIHN0eWxlLmlzRGlzcGxheUlubGluZVR5cGUo KSkKLSAgICAgICAgc3R5bGUuc2V0RGlzcGxheShEaXNwbGF5VHlwZTo6QmxvY2spOworICAgICAg ICBzdHlsZS5zZXRFZmZlY3RpdmVEaXNwbGF5KERpc3BsYXlUeXBlOjpCbG9jayk7CiB9CiAKIHZv aWQgQWRqdXN0ZXI6OmFkanVzdEFuaW1hdGVkU3R5bGUoUmVuZGVyU3R5bGUmIHN0eWxlLCBPcHRp b25TZXQ8QW5pbWF0aW9uSW1wYWN0PiBpbXBhY3QpIGNvbnN0CkBAIC02MzAsNyArNjI3LDcgQEAg dm9pZCBBZGp1c3Rlcjo6YWRqdXN0Rm9yU2l0ZVNwZWNpZmljUXVpcmtzKFJlbmRlclN0eWxlJiBz dHlsZSkgY29uc3QKICAgICAgICAgICAgIGlmIChkaXYuaGFzQ2xhc3MoKSAmJiBkaXYuY2xhc3NO YW1lcygpLmNvbnRhaW5zKGluc3RyZWFtTmF0aXZlVmlkZW9EaXZDbGFzcykpIHsKICAgICAgICAg ICAgICAgICBhdXRvKiB2aWRlbyA9IGRpdi50cmVlU2NvcGUoKS5nZXRFbGVtZW50QnlJZCh2aWRl b0VsZW1lbnRJRCk7CiAgICAgICAgICAgICAgICAgaWYgKGlzPEhUTUxWaWRlb0VsZW1lbnQ+KHZp ZGVvKSAmJiBkb3duY2FzdDxIVE1MVmlkZW9FbGVtZW50PigqdmlkZW8pLmlzRnVsbHNjcmVlbigp KQotICAgICAgICAgICAgICAgICAgICBzdHlsZS5zZXREaXNwbGF5KERpc3BsYXlUeXBlOjpCbG9j ayk7CisgICAgICAgICAgICAgICAgICAgIHN0eWxlLnNldEVmZmVjdGl2ZURpc3BsYXkoRGlzcGxh eVR5cGU6OkJsb2NrKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0K