237760 2022-03-11 01:01:45 -0800 [web-animations] refactor discrete SVG properties to use a dedicated animation wrapper 2022-03-11 01:28:16 -0800 1 1 1 Unclassified WebKit Animations WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 graouts graouts changseok dino esprehn+autocc ews-watchlist glenn graouts koivisto kondapallykalyan pdr webkit-bug-importer oldest_to_newest 1850387 0 graouts 2022-03-11 01:01:45 -0800 [web-animations] refactor discrete SVG properties to use a dedicated animation wrapper 1850389 1 454450 graouts 2022-03-11 01:04:45 -0800 Created attachment 454450 Patch 1850394 2 graouts 2022-03-11 01:27:31 -0800 Committed r291151 (248311@trunk): <https://commits.webkit.org/248311@trunk> 1850395 3 webkit-bug-importer 2022-03-11 01:28:16 -0800 <rdar://problem/90150038> 454450 2022-03-11 01:04:45 -0800 2022-03-11 01:07:48 -0800 Patch bug-237760-20220311100443.patch text/plain 8170 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2VkOWZiOTA5NmFmZTRk N2IyNGJkZmI1ZDI3YWM1YTNiZTk2MmJkNC4uYjMyMDhkOGU3NDIyYzViNjIyYzliNzdlNWY5MWJi ZmJiNzhlY2Y5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIyLTAzLTExICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgorCisgICAgICAgIFt3ZWItYW5pbWF0aW9u c10gcmVmYWN0b3IgZGlzY3JldGUgU1ZHIHByb3BlcnRpZXMgdG8gdXNlIGEgZGVkaWNhdGVkIGFu aW1hdGlvbiB3cmFwcGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMzc3NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBXZSBhZGRlZCBnZXR0ZXJzIGFuZCBzZXR0ZXJzIG9uIFJlbmRlclN0eWxlIGZvciBw cm9wZXJ0aWVzIGV4cG9zZWQgb24gU1ZHUmVuZGVyU3R5bGUKKyAgICAgICAgc29sZWx5IGZvciB0 aGUgcHVycG9zZSBvZiBhbmltYXRpb24gc3VwcG9ydC4gSW5zdGVhZCwgd2UgYWRkIGEgZGVkaWNh dGVkIGFuaW1hdGlvbgorICAgICAgICB3cmFwcGVyIHRoYXQgcmVtb3ZlcyB0aGUgbWV0aG9kcyBm cm9tIFJlbmRlclN0eWxlIGFuZCBkbyBhbGwgdGhlIHdvcmsgaW4KKyAgICAgICAgQ1NTUHJvcGVy dHlBbmltYXRpb24uY3BwLiBUaGlzIHdpbGwgYmUgYmVuZWZpY2lhbCBmb3IgZnV0dXJlIFNWRyBw cm9wZXJ0aWVzCisgICAgICAgIHdpdGggZGlzY3JldGUgYW5pbWF0aW9uIHN1cHBvcnQgdGhhdCBh cmUgeWV0IHRvIGJlIGFkZGVkLgorCisgICAgICAgICogYW5pbWF0aW9uL0NTU1Byb3BlcnR5QW5p bWF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5QW5pbWF0aW9uV3JhcHBl ck1hcDo6Q1NTUHJvcGVydHlBbmltYXRpb25XcmFwcGVyTWFwKToKKyAgICAgICAgKiByZW5kZXJp bmcvc3R5bGUvUmVuZGVyU3R5bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpj bGlwUnVsZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6 c2V0Q2xpcFJ1bGUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OmNv bG9ySW50ZXJwb2xhdGlvbiBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJTdHlsZTo6c2V0Q29sb3JJbnRlcnBvbGF0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclN0eWxlOjpjb2xvckludGVycG9sYXRpb25GaWx0ZXJzIGNvbnN0KTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpzZXRDb2xvckludGVycG9sYXRpb25G aWx0ZXJzKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpkb21pbmFu dEJhc2VsaW5lIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxl OjpzZXREb21pbmFudEJhc2VsaW5lKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clN0eWxlOjpmaWxsUnVsZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJTdHlsZTo6c2V0RmlsbFJ1bGUpOiBEZWxldGVkLgorCiAyMDIyLTAzLTEwICBBbnRvaW5lIFF1 aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFt3ZWItYW5pbWF0aW9uc10gbWFz ay1vcmlnaW4gc2hvdWxkIHN1cHBvcnQgZGlzY3JldGUgYW5pbWF0aW9uCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQ1NTUHJvcGVydHlBbmltYXRpb24uY3BwIGIvU291cmNl L1dlYkNvcmUvYW5pbWF0aW9uL0NTU1Byb3BlcnR5QW5pbWF0aW9uLmNwcAppbmRleCAyODk0YjYy ODU0NjU4NjBhZjk5OGE4YzdmYzU4OTEyZGMxOTcwZmVlLi4zZGE4YTgxZDg5ZTg5OWRiNjQxMmMx ZTM3ZjE5ZjFkOTVjY2ZmZDQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24v Q1NTUHJvcGVydHlBbmltYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9D U1NQcm9wZXJ0eUFuaW1hdGlvbi5jcHAKQEAgLTI4MzIsNiArMjgzMiw0NiBAQCBwcml2YXRlOgog I2VuZGlmCiB9OwogCit0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4KK2NsYXNzIERpc2NyZXRlU1ZHUHJv cGVydHlXcmFwcGVyIGZpbmFsIDogcHVibGljIEFuaW1hdGlvblByb3BlcnR5V3JhcHBlckJhc2Ug eworICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOworcHVibGljOgorICAgIERpc2NyZXRlU1ZH UHJvcGVydHlXcmFwcGVyKENTU1Byb3BlcnR5SUQgcHJvcGVydHksIFQgKFNWR1JlbmRlclN0eWxl OjoqZ2V0dGVyKSgpIGNvbnN0LCB2b2lkIChTVkdSZW5kZXJTdHlsZTo6KnNldHRlcikoVCkpCisg ICAgICAgIDogQW5pbWF0aW9uUHJvcGVydHlXcmFwcGVyQmFzZShwcm9wZXJ0eSkKKyAgICAgICAg LCBtX2dldHRlcihnZXR0ZXIpCisgICAgICAgICwgbV9zZXR0ZXIoc2V0dGVyKQorICAgIHsKKyAg ICB9CisKK3ByaXZhdGU6CisgICAgYm9vbCBjYW5JbnRlcnBvbGF0ZShjb25zdCBSZW5kZXJTdHls ZSYsIGNvbnN0IFJlbmRlclN0eWxlJiwgQ29tcG9zaXRlT3BlcmF0aW9uKSBjb25zdCBmaW5hbCB7 IHJldHVybiBmYWxzZTsgfQorCisgICAgYm9vbCBlcXVhbHMoY29uc3QgUmVuZGVyU3R5bGUmIGEs IGNvbnN0IFJlbmRlclN0eWxlJiBiKSBjb25zdCBvdmVycmlkZQorICAgIHsKKyAgICAgICAgcmV0 dXJuIHRoaXMtPnZhbHVlKGEpID09IHRoaXMtPnZhbHVlKGIpOworICAgIH0KKworICAgIHZvaWQg YmxlbmQoUmVuZGVyU3R5bGUmIGRlc3RpbmF0aW9uLCBjb25zdCBSZW5kZXJTdHlsZSYgZnJvbSwg Y29uc3QgUmVuZGVyU3R5bGUmIHRvLCBjb25zdCBDU1NQcm9wZXJ0eUJsZW5kaW5nQ29udGV4dCYg Y29udGV4dCkgY29uc3Qgb3ZlcnJpZGUKKyAgICB7CisgICAgICAgIEFTU0VSVCghY29udGV4dC5w cm9ncmVzcyB8fCBjb250ZXh0LnByb2dyZXNzID09IDEuMCk7CisgICAgICAgIChkZXN0aW5hdGlv bi5hY2Nlc3NTVkdTdHlsZSgpLip0aGlzLT5tX3NldHRlcikodGhpcy0+dmFsdWUoY29udGV4dC5w cm9ncmVzcyA/IHRvIDogZnJvbSkpOworICAgIH0KKworI2lmICFMT0dfRElTQUJMRUQKKyAgICB2 b2lkIGxvZ0JsZW5kKGNvbnN0IFJlbmRlclN0eWxlJiwgY29uc3QgUmVuZGVyU3R5bGUmLCBjb25z dCBSZW5kZXJTdHlsZSYsIGRvdWJsZSkgY29uc3Qgb3ZlcnJpZGUKKyAgICB7CisgICAgfQorI2Vu ZGlmCisKKyAgICBUIHZhbHVlKGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSkgY29uc3QKKyAgICB7 CisgICAgICAgIHJldHVybiAoc3R5bGUuc3ZnU3R5bGUoKS4qdGhpcy0+bV9nZXR0ZXIpKCk7Cisg ICAgfQorCisgICAgVCAoU1ZHUmVuZGVyU3R5bGU6OiptX2dldHRlcikoKSBjb25zdDsKKyAgICB2 b2lkIChTVkdSZW5kZXJTdHlsZTo6Km1fc2V0dGVyKShUKTsKK307CisKIGNsYXNzIENTU1Byb3Bl cnR5QW5pbWF0aW9uV3JhcHBlck1hcCBmaW5hbCB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FU RUQ7CiBwdWJsaWM6CkBAIC0zMTU5LDE2ICszMTk5LDE2IEBAIENTU1Byb3BlcnR5QW5pbWF0aW9u V3JhcHBlck1hcDo6Q1NTUHJvcGVydHlBbmltYXRpb25XcmFwcGVyTWFwKCkKICAgICAgICAgbmV3 IFByb3BlcnR5V3JhcHBlckNvbnRlbnQsCiAgICAgICAgIG5ldyBPZmZzZXRSb3RhdGVQcm9wZXJ0 eVdyYXBwZXIoQ1NTUHJvcGVydHlPZmZzZXRSb3RhdGUsICZSZW5kZXJTdHlsZTo6b2Zmc2V0Um90 YXRlLCAmUmVuZGVyU3R5bGU6OnNldE9mZnNldFJvdGF0ZSksCiAgICAgICAgIG5ldyBEaXNjcmV0 ZVByb3BlcnR5V3JhcHBlcjxUZXh0RGVjb3JhdGlvblNraXBJbms+KENTU1Byb3BlcnR5VGV4dERl Y29yYXRpb25Ta2lwSW5rLCAmUmVuZGVyU3R5bGU6OnRleHREZWNvcmF0aW9uU2tpcEluaywgJlJl bmRlclN0eWxlOjpzZXRUZXh0RGVjb3JhdGlvblNraXBJbmspLAotICAgICAgICBuZXcgRGlzY3Jl dGVQcm9wZXJ0eVdyYXBwZXI8Q29sb3JJbnRlcnBvbGF0aW9uPihDU1NQcm9wZXJ0eUNvbG9ySW50 ZXJwb2xhdGlvbiwgJlJlbmRlclN0eWxlOjpjb2xvckludGVycG9sYXRpb24sICZSZW5kZXJTdHls ZTo6c2V0Q29sb3JJbnRlcnBvbGF0aW9uKSwKKyAgICAgICAgbmV3IERpc2NyZXRlU1ZHUHJvcGVy dHlXcmFwcGVyPENvbG9ySW50ZXJwb2xhdGlvbj4oQ1NTUHJvcGVydHlDb2xvckludGVycG9sYXRp b24sICZTVkdSZW5kZXJTdHlsZTo6Y29sb3JJbnRlcnBvbGF0aW9uLCAmU1ZHUmVuZGVyU3R5bGU6 OnNldENvbG9ySW50ZXJwb2xhdGlvbiksCiAgICAgICAgIG5ldyBEaXNjcmV0ZVByb3BlcnR5V3Jh cHBlcjxLZXJuaW5nPihDU1NQcm9wZXJ0eUZvbnRLZXJuaW5nLCAmUmVuZGVyU3R5bGU6OmZvbnRL ZXJuaW5nLCAmUmVuZGVyU3R5bGU6OnNldEZvbnRLZXJuaW5nKSwKICAgICAgICAgbmV3IERpc2Ny ZXRlUHJvcGVydHlXcmFwcGVyPEZvbnRGZWF0dXJlU2V0dGluZ3M+KENTU1Byb3BlcnR5Rm9udEZl YXR1cmVTZXR0aW5ncywgJlJlbmRlclN0eWxlOjpmb250RmVhdHVyZVNldHRpbmdzLCAmUmVuZGVy U3R5bGU6OnNldEZvbnRGZWF0dXJlU2V0dGluZ3MpLAogICAgICAgICBuZXcgRm9udEZhbWlseVdy YXBwZXIsCi0gICAgICAgIG5ldyBEaXNjcmV0ZVByb3BlcnR5V3JhcHBlcjxXaW5kUnVsZT4oQ1NT UHJvcGVydHlDbGlwUnVsZSwgJlJlbmRlclN0eWxlOjpjbGlwUnVsZSwgJlJlbmRlclN0eWxlOjpz ZXRDbGlwUnVsZSksCi0gICAgICAgIG5ldyBEaXNjcmV0ZVByb3BlcnR5V3JhcHBlcjxDb2xvcklu dGVycG9sYXRpb24+KENTU1Byb3BlcnR5Q29sb3JJbnRlcnBvbGF0aW9uRmlsdGVycywgJlJlbmRl clN0eWxlOjpjb2xvckludGVycG9sYXRpb25GaWx0ZXJzLCAmUmVuZGVyU3R5bGU6OnNldENvbG9y SW50ZXJwb2xhdGlvbkZpbHRlcnMpLAotICAgICAgICBuZXcgRGlzY3JldGVQcm9wZXJ0eVdyYXBw ZXI8RG9taW5hbnRCYXNlbGluZT4oQ1NTUHJvcGVydHlEb21pbmFudEJhc2VsaW5lLCAmUmVuZGVy U3R5bGU6OmRvbWluYW50QmFzZWxpbmUsICZSZW5kZXJTdHlsZTo6c2V0RG9taW5hbnRCYXNlbGlu ZSksCisgICAgICAgIG5ldyBEaXNjcmV0ZVNWR1Byb3BlcnR5V3JhcHBlcjxXaW5kUnVsZT4oQ1NT UHJvcGVydHlDbGlwUnVsZSwgJlNWR1JlbmRlclN0eWxlOjpjbGlwUnVsZSwgJlNWR1JlbmRlclN0 eWxlOjpzZXRDbGlwUnVsZSksCisgICAgICAgIG5ldyBEaXNjcmV0ZVNWR1Byb3BlcnR5V3JhcHBl cjxDb2xvckludGVycG9sYXRpb24+KENTU1Byb3BlcnR5Q29sb3JJbnRlcnBvbGF0aW9uRmlsdGVy cywgJlNWR1JlbmRlclN0eWxlOjpjb2xvckludGVycG9sYXRpb25GaWx0ZXJzLCAmU1ZHUmVuZGVy U3R5bGU6OnNldENvbG9ySW50ZXJwb2xhdGlvbkZpbHRlcnMpLAorICAgICAgICBuZXcgRGlzY3Jl dGVTVkdQcm9wZXJ0eVdyYXBwZXI8RG9taW5hbnRCYXNlbGluZT4oQ1NTUHJvcGVydHlEb21pbmFu dEJhc2VsaW5lLCAmU1ZHUmVuZGVyU3R5bGU6OmRvbWluYW50QmFzZWxpbmUsICZTVkdSZW5kZXJT dHlsZTo6c2V0RG9taW5hbnRCYXNlbGluZSksCiAgICAgICAgIG5ldyBDb3VudGVyV3JhcHBlcihD U1NQcm9wZXJ0eUNvdW50ZXJJbmNyZW1lbnQpLAogICAgICAgICBuZXcgQ291bnRlcldyYXBwZXIo Q1NTUHJvcGVydHlDb3VudGVyUmVzZXQpLAotICAgICAgICBuZXcgRGlzY3JldGVQcm9wZXJ0eVdy YXBwZXI8V2luZFJ1bGU+KENTU1Byb3BlcnR5RmlsbFJ1bGUsICZSZW5kZXJTdHlsZTo6ZmlsbFJ1 bGUsICZSZW5kZXJTdHlsZTo6c2V0RmlsbFJ1bGUpLAorICAgICAgICBuZXcgRGlzY3JldGVTVkdQ cm9wZXJ0eVdyYXBwZXI8V2luZFJ1bGU+KENTU1Byb3BlcnR5RmlsbFJ1bGUsICZTVkdSZW5kZXJT dHlsZTo6ZmlsbFJ1bGUsICZTVkdSZW5kZXJTdHlsZTo6c2V0RmlsbFJ1bGUpLAogICAgICAgICBu ZXcgRGlzY3JldGVQcm9wZXJ0eVdyYXBwZXI8Rm9udFN5bnRoZXNpcz4oQ1NTUHJvcGVydHlGb250 U3ludGhlc2lzLCAmUmVuZGVyU3R5bGU6OmZvbnRTeW50aGVzaXMsICZSZW5kZXJTdHlsZTo6c2V0 Rm9udFN5bnRoZXNpcyksCiAgICAgICAgIG5ldyBEaXNjcmV0ZVByb3BlcnR5V3JhcHBlcjxGb250 VmFyaWFudEFsdGVybmF0ZXM+KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRBbHRlcm5hdGVzLCAmUmVu ZGVyU3R5bGU6OmZvbnRWYXJpYW50QWx0ZXJuYXRlcywgJlJlbmRlclN0eWxlOjpzZXRGb250VmFy aWFudEFsdGVybmF0ZXMpLAogICAgICAgICBuZXcgRm9udFZhcmlhbnRFYXN0QXNpYW5XcmFwcGVy LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxl LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAppbmRleCBi MjBmZWE0NGFiMjdmMzEzMWE4NTFlMWY2ZDYwZjExMTRiNGViYzJmLi45ODk2YjJkYTRlN2E5N2Ew YTgzYzllMjQ5ZDhkNTdmMDJkNjNiZjcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvUmVuZGVyU3R5bGUuaApAQCAtMTQzOCwxOSArMTQzOCw2IEBAIHB1YmxpYzoKICAgICBj b25zdCBTVkdSZW5kZXJTdHlsZSYgc3ZnU3R5bGUoKSBjb25zdCB7IHJldHVybiBtX3N2Z1N0eWxl OyB9CiAgICAgU1ZHUmVuZGVyU3R5bGUmIGFjY2Vzc1NWR1N0eWxlKCkgeyByZXR1cm4gbV9zdmdT dHlsZS5hY2Nlc3MoKTsgfQogCi0gICAgV2luZFJ1bGUgY2xpcFJ1bGUoKSBjb25zdCB7IHJldHVy biBzdmdTdHlsZSgpLmNsaXBSdWxlKCk7IH0KLSAgICB2b2lkIHNldENsaXBSdWxlKFdpbmRSdWxl IGNsaXBSdWxlKSB7IGFjY2Vzc1NWR1N0eWxlKCkuc2V0Q2xpcFJ1bGUoY2xpcFJ1bGUpOyB9Ci0g ICAgQ29sb3JJbnRlcnBvbGF0aW9uIGNvbG9ySW50ZXJwb2xhdGlvbigpIGNvbnN0IHsgcmV0dXJu IHN2Z1N0eWxlKCkuY29sb3JJbnRlcnBvbGF0aW9uKCk7IH0KLSAgICB2b2lkIHNldENvbG9ySW50 ZXJwb2xhdGlvbihDb2xvckludGVycG9sYXRpb24gY29sb3JJbnRlcnBvbGF0aW9uKSB7IGFjY2Vz c1NWR1N0eWxlKCkuc2V0Q29sb3JJbnRlcnBvbGF0aW9uKGNvbG9ySW50ZXJwb2xhdGlvbik7IH0K LSAgICBDb2xvckludGVycG9sYXRpb24gY29sb3JJbnRlcnBvbGF0aW9uRmlsdGVycygpIGNvbnN0 IHsgcmV0dXJuIHN2Z1N0eWxlKCkuY29sb3JJbnRlcnBvbGF0aW9uRmlsdGVycygpOyB9Ci0gICAg dm9pZCBzZXRDb2xvckludGVycG9sYXRpb25GaWx0ZXJzKENvbG9ySW50ZXJwb2xhdGlvbiBjb2xv ckludGVycG9sYXRpb25GaWx0ZXJzKSB7IGFjY2Vzc1NWR1N0eWxlKCkuc2V0Q29sb3JJbnRlcnBv bGF0aW9uRmlsdGVycyhjb2xvckludGVycG9sYXRpb25GaWx0ZXJzKTsgfQotCi0gICAgRG9taW5h bnRCYXNlbGluZSBkb21pbmFudEJhc2VsaW5lKCkgY29uc3QgeyByZXR1cm4gc3ZnU3R5bGUoKS5k b21pbmFudEJhc2VsaW5lKCk7IH0KLSAgICB2b2lkIHNldERvbWluYW50QmFzZWxpbmUoRG9taW5h bnRCYXNlbGluZSBkb21pbmFudEJhc2VsaW5lKSB7IHJldHVybiBhY2Nlc3NTVkdTdHlsZSgpLnNl dERvbWluYW50QmFzZWxpbmUoZG9taW5hbnRCYXNlbGluZSk7IH0KLQotICAgIFdpbmRSdWxlIGZp bGxSdWxlKCkgY29uc3QgeyByZXR1cm4gc3ZnU3R5bGUoKS5maWxsUnVsZSgpOyB9Ci0gICAgdm9p ZCBzZXRGaWxsUnVsZShXaW5kUnVsZSBmaWxsUnVsZSkgeyBhY2Nlc3NTVkdTdHlsZSgpLnNldEZp bGxSdWxlKGZpbGxSdWxlKTsgfQotCiAgICAgU1ZHUGFpbnRUeXBlIGZpbGxQYWludFR5cGUoKSBj b25zdCB7IHJldHVybiBzdmdTdHlsZSgpLmZpbGxQYWludFR5cGUoKTsgfQogICAgIENvbG9yIGZp bGxQYWludENvbG9yKCkgY29uc3QgeyByZXR1cm4gc3ZnU3R5bGUoKS5maWxsUGFpbnRDb2xvcigp OyB9CiAgICAgdm9pZCBzZXRGaWxsUGFpbnRDb2xvcihjb25zdCBDb2xvciYgY29sb3IpIHsgYWNj ZXNzU1ZHU3R5bGUoKS5zZXRGaWxsUGFpbnQoU1ZHUGFpbnRUeXBlOjpSR0JDb2xvciwgY29sb3Is IGVtcHR5U3RyaW5nKCkpOyB9Cg==