206664 2020-01-23 08:25:33 -0800 [Web Animations] Make AnimationList ref-counted 2020-01-23 11:25:19 -0800 1 1 1 Unclassified WebKit Animations WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 graouts graouts dino esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan pdr simon.fraser webkit-bug-importer oldest_to_newest 1610111 0 graouts 2020-01-23 08:25:33 -0800 [Web Animations] Make AnimationList ref-counted 1610112 1 388549 graouts 2020-01-23 08:26:13 -0800 Created attachment 388549 Patch 1610143 2 388549 simon.fraser 2020-01-23 09:43:32 -0800 Comment on attachment 388549 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=388549&action=review > Source/WebCore/platform/animation/AnimationList.cpp:36 > +AnimationList::AnimationList() You can say = default > Source/WebCore/platform/animation/AnimationList.h:34 > +class AnimationList : public RefCounted<AnimationList> { You still want WTF_MAKE_FAST_ALLOCATED or one of its variants. > Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp:152 > - , animations(o.animations ? makeUnique<AnimationList>(*o.animations) : nullptr) > - , transitions(o.transitions ? makeUnique<AnimationList>(*o.transitions) : nullptr) > + , animations(o.animations) > + , transitions(o.transitions) This no longer copies 1610161 3 388558 graouts 2020-01-23 10:02:01 -0800 Created attachment 388558 Patch 1610192 4 koivisto 2020-01-23 10:42:22 -0800 > > Source/WebCore/platform/animation/AnimationList.h:34 > > +class AnimationList : public RefCounted<AnimationList> { > > You still want WTF_MAKE_FAST_ALLOCATED or one of its variants. No need, RefCounted is WTF_MAKE_FAST_ALLOCATED. 1610198 5 388558 koivisto 2020-01-23 10:46:31 -0800 Comment on attachment 388558 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=388558&action=review > Source/WebCore/platform/animation/AnimationList.h:38 > + static Ref<AnimationList> create(const AnimationList& other) { return adoptRef(*new AnimationList(other)); } copy() member function would be nicer. 1610212 6 graouts 2020-01-23 11:16:13 -0800 (In reply to Antti Koivisto from comment #5) > Comment on attachment 388558 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=388558&action=review > > > Source/WebCore/platform/animation/AnimationList.h:38 > > + static Ref<AnimationList> create(const AnimationList& other) { return adoptRef(*new AnimationList(other)); } > > copy() member function would be nicer. Will fix in commit, thanks. 1610218 7 graouts 2020-01-23 11:24:29 -0800 https://trac.webkit.org/changeset/254991 1610219 8 webkit-bug-importer 2020-01-23 11:25:19 -0800 <rdar://problem/58841851> 388549 2020-01-23 08:26:13 -0800 2020-01-23 10:01:58 -0800 Patch bug-206664-20200123172612.patch text/plain 5773 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0OTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTczMjMzNWVjZjIwODQ5 Y2MyZWIxYjNkNmQwMDdhNWQ2ZGM5ZjBiYi4uODdkYzNmMDI4ZWQyY2QyZjY2NjEyZWMzMmEwYWFk NTZmOTVkMTViMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTAxLTIzICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYiBBbmltYXRpb25z XSBNYWtlIEFuaW1hdGlvbkxpc3QgcmVmLWNvdW50ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNjY2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vYW5pbWF0aW9uL0FuaW1hdGlvbkxp c3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uTGlzdDo6QW5pbWF0aW9uTGlzdCk6 CisgICAgICAgICogcGxhdGZvcm0vYW5pbWF0aW9uL0FuaW1hdGlvbkxpc3QuaDoKKyAgICAgICAg KFdlYkNvcmU6OkFuaW1hdGlvbkxpc3Q6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpBbmlt YXRpb25MaXN0OjpBbmltYXRpb25MaXN0KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcv c3R5bGUvUmVuZGVyU3R5bGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OmVu c3VyZUFuaW1hdGlvbnMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OmVuc3VyZVRy YW5zaXRpb25zKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlTm9uSW5oZXJp dGVkRGF0YS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRh OjpTdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUv U3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YS5oOgorCiAyMDIwLTAxLTIyICBGdWppaSBIaXJvbm9y aSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFtXaW5DYWlyb10gU29tZSBv ZiBjb21iaW5pbmcgZmFtaWx5IGdseXBocyBhcmUgcmVwbGFjZWQgYnkgc3BhY2UgZ2x5cGhzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hbmltYXRpb24vQW5pbWF0aW9uTGlz dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hbmltYXRpb24vQW5pbWF0aW9uTGlzdC5j cHAKaW5kZXggYWYzYjUxOTUxNjI2MGM1N2NhNTI1NmQ2NThlZjk0MWQxMzE1MzI2YS4uYjdhOWVl OGE0ZDZkNmUyM2QwZTAxNGQ0ZDY0NGU4M2Q0MzI4YzE4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vYW5pbWF0aW9uL0FuaW1hdGlvbkxpc3QuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2FuaW1hdGlvbi9BbmltYXRpb25MaXN0LmNwcApAQCAtMzMsNiArMzMs MTAgQEAgaWYgKGkpIHsgXAogICAgICAgICBhbmltYXRpb24oaSkucHJvcFNldChhbmltYXRpb24o aikucHJvcEdldCgpKTsgXAogfQogCitBbmltYXRpb25MaXN0OjpBbmltYXRpb25MaXN0KCkKK3sK K30KKwogQW5pbWF0aW9uTGlzdDo6QW5pbWF0aW9uTGlzdChjb25zdCBBbmltYXRpb25MaXN0JiBv dGhlcikKIHsKICAgICBtX2FuaW1hdGlvbnMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShvdGhlci5z aXplKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYW5pbWF0aW9uL0Fu aW1hdGlvbkxpc3QuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2FuaW1hdGlvbi9BbmltYXRp b25MaXN0LmgKaW5kZXggYzkzYWY4ZDEzZGIwOWQ2YjU0NTczZmRiMWJjNGU0MGIwZjZhM2ZjOC4u YzVjMzZkNTRjZjlmYzk4ZWJjNzFlYWI2ZjJiNzlkYWUwYzU0OGY5NCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vYW5pbWF0aW9uL0FuaW1hdGlvbkxpc3QuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9hbmltYXRpb24vQW5pbWF0aW9uTGlzdC5oCkBAIC0yNSwxNiAr MjUsMTYgQEAKICNwcmFnbWEgb25jZQogCiAjaW5jbHVkZSAiQW5pbWF0aW9uLmgiCisjaW5jbHVk ZSA8d3RmL1JlZi5oPgorI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CiAjaW5jbHVkZSA8d3Rm L1ZlY3Rvci5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNzIEFuaW1hdGlvbkxpc3Qg ewotICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOworY2xhc3MgQW5pbWF0aW9uTGlzdCA6IHB1 YmxpYyBSZWZDb3VudGVkPEFuaW1hdGlvbkxpc3Q+IHsKIHB1YmxpYzoKLSAgICBBbmltYXRpb25M aXN0KCkgeyB9Ci0gICAgQW5pbWF0aW9uTGlzdChjb25zdCBBbmltYXRpb25MaXN0Jik7Ci0gICAg QW5pbWF0aW9uTGlzdChBbmltYXRpb25MaXN0JiYpID0gZGVmYXVsdDsKKyAgICBzdGF0aWMgUmVm PEFuaW1hdGlvbkxpc3Q+IGNyZWF0ZSgpIHsgcmV0dXJuIGFkb3B0UmVmKCpuZXcgQW5pbWF0aW9u TGlzdCk7IH0KKyAgICBzdGF0aWMgUmVmPEFuaW1hdGlvbkxpc3Q+IGNyZWF0ZShjb25zdCBBbmlt YXRpb25MaXN0JiBvdGhlcikgeyByZXR1cm4gYWRvcHRSZWYoKm5ldyBBbmltYXRpb25MaXN0KG90 aGVyKSk7IH0KIAogICAgIHZvaWQgZmlsbFVuc2V0UHJvcGVydGllcygpOwogICAgIGJvb2wgb3Bl cmF0b3I9PShjb25zdCBBbmltYXRpb25MaXN0JikgY29uc3Q7CkBAIC01NCw4ICs1NCwxMCBAQCBw dWJsaWM6CiAgICAgY29uc3QgQW5pbWF0aW9uJiBhbmltYXRpb24oc2l6ZV90IGkpIGNvbnN0IHsg cmV0dXJuIG1fYW5pbWF0aW9uc1tpXS5nZXQoKTsgfQogICAgIAogcHJpdmF0ZToKKyAgICBBbmlt YXRpb25MaXN0KCk7CisgICAgQW5pbWF0aW9uTGlzdChjb25zdCBBbmltYXRpb25MaXN0Jik7CisK ICAgICBBbmltYXRpb25MaXN0JiBvcGVyYXRvcj0oY29uc3QgQW5pbWF0aW9uTGlzdCYpOwotICAg IEFuaW1hdGlvbkxpc3QmIG9wZXJhdG9yPShBbmltYXRpb25MaXN0JiYpID0gZGVmYXVsdDsKIAog ICAgIFZlY3RvcjxSZWY8QW5pbWF0aW9uPiwgMCwgQ3Jhc2hPbk92ZXJmbG93LCAwPiBtX2FuaW1h dGlvbnM7CiB9OyAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVy U3R5bGUuY3BwCmluZGV4IGQwYmZkOWNmNTExMDgzNTg0MTM4NTc0Y2IzYTZjZDE0YjE5YmZkMDku LjlmYTY1ZmI2OGZkODJmZTA1MmE3ZGI0NDgxNzM3OWIwNDllMGU2MzkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcApAQCAtMTY2MSwxNCArMTY2 MSwxNCBAQCB2b2lkIFJlbmRlclN0eWxlOjphZGp1c3RUcmFuc2l0aW9ucygpCiBBbmltYXRpb25M aXN0JiBSZW5kZXJTdHlsZTo6ZW5zdXJlQW5pbWF0aW9ucygpCiB7CiAgICAgaWYgKCFtX3JhcmVO b25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLmFuaW1hdGlvbnMpCi0gICAgICAgIG1fcmFyZU5vbklu aGVyaXRlZERhdGEuYWNjZXNzKCkuYW5pbWF0aW9ucyA9IG1ha2VVbmlxdWU8QW5pbWF0aW9uTGlz dD4oKTsKKyAgICAgICAgbV9yYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS5hbmltYXRpb25z ID0gQW5pbWF0aW9uTGlzdDo6Y3JlYXRlKCk7CiAgICAgcmV0dXJuICptX3JhcmVOb25Jbmhlcml0 ZWREYXRhLT5hbmltYXRpb25zOwogfQogCiBBbmltYXRpb25MaXN0JiBSZW5kZXJTdHlsZTo6ZW5z dXJlVHJhbnNpdGlvbnMoKQogewogICAgIGlmICghbV9yYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nl c3MoKS50cmFuc2l0aW9ucykKLSAgICAgICAgbV9yYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3Mo KS50cmFuc2l0aW9ucyA9IG1ha2VVbmlxdWU8QW5pbWF0aW9uTGlzdD4oKTsKKyAgICAgICAgbV9y YXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS50cmFuc2l0aW9ucyA9IEFuaW1hdGlvbkxpc3Q6 OmNyZWF0ZSgpOwogICAgIHJldHVybiAqbV9yYXJlTm9uSW5oZXJpdGVkRGF0YS0+dHJhbnNpdGlv bnM7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHls ZVJhcmVOb25Jbmhlcml0ZWREYXRhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9TdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhLmNwcAppbmRleCA2OTAzNTgxYjAxYzU3YjBjMmE4 Y2FjMmMwODc5NGZhMzJkMzhiNGFjLi5lZjdjYjJhNmMyMjlkZDhhZDUwMTk0NDI5ZjNiOTNkZGRh ZTdhYTUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVS YXJlTm9uSW5oZXJpdGVkRGF0YS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0 eWxlL1N0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEuY3BwCkBAIC0xNDgsOCArMTQ4LDggQEAgaW5s aW5lIFN0eWxlUmFyZU5vbkluaGVyaXRlZERhdGE6OlN0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEo Y29uc3QgU3R5bGVSYXJlTm9uSW4KICAgICAsIGJveFNoYWRvdyhvLmJveFNoYWRvdyA/IG1ha2VV bmlxdWU8U2hhZG93RGF0YT4oKm8uYm94U2hhZG93KSA6IG51bGxwdHIpCiAgICAgLCB3aWxsQ2hh bmdlKG8ud2lsbENoYW5nZSkKICAgICAsIGJveFJlZmxlY3Qoby5ib3hSZWZsZWN0KQotICAgICwg YW5pbWF0aW9ucyhvLmFuaW1hdGlvbnMgPyBtYWtlVW5pcXVlPEFuaW1hdGlvbkxpc3Q+KCpvLmFu aW1hdGlvbnMpIDogbnVsbHB0cikKLSAgICAsIHRyYW5zaXRpb25zKG8udHJhbnNpdGlvbnMgPyBt YWtlVW5pcXVlPEFuaW1hdGlvbkxpc3Q+KCpvLnRyYW5zaXRpb25zKSA6IG51bGxwdHIpCisgICAg LCBhbmltYXRpb25zKG8uYW5pbWF0aW9ucykKKyAgICAsIHRyYW5zaXRpb25zKG8udHJhbnNpdGlv bnMpCiAgICAgLCBtYXNrKG8ubWFzaykKICAgICAsIG1hc2tCb3hJbWFnZShvLm1hc2tCb3hJbWFn ZSkKICAgICAsIHBhZ2VTaXplKG8ucGFnZVNpemUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YS5oIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEuaAppbmRleCBi Y2M0ZTE1ZTNkYTI4MDY1MzdmYzVlN2E0ZDI4Zjk3MjI3MGI5ZjVmLi44ZjdkMmJiZDY5Zjk2MzJh Yjg1NWE1ZGVmMDZkNDE0NzQ3N2IzMmZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc3R5bGUvU3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhLmgKQEAgLTEzNyw4 ICsxMzcsOCBAQCBwdWJsaWM6CiAgICAgCiAgICAgUmVmUHRyPFN0eWxlUmVmbGVjdGlvbj4gYm94 UmVmbGVjdDsKIAotICAgIHN0ZDo6dW5pcXVlX3B0cjxBbmltYXRpb25MaXN0PiBhbmltYXRpb25z OwotICAgIHN0ZDo6dW5pcXVlX3B0cjxBbmltYXRpb25MaXN0PiB0cmFuc2l0aW9uczsKKyAgICBS ZWZQdHI8QW5pbWF0aW9uTGlzdD4gYW5pbWF0aW9uczsKKyAgICBSZWZQdHI8QW5pbWF0aW9uTGlz dD4gdHJhbnNpdGlvbnM7CiAKICAgICBGaWxsTGF5ZXIgbWFzazsKICAgICBOaW5lUGllY2VJbWFn ZSBtYXNrQm94SW1hZ2U7Cg== 388558 2020-01-23 10:02:01 -0800 2020-01-23 10:46:31 -0800 Patch bug-206664-20200123190200.patch text/plain 5887 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0OTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTczMjMzNWVjZjIwODQ5 Y2MyZWIxYjNkNmQwMDdhNWQ2ZGM5ZjBiYi4uODdkYzNmMDI4ZWQyY2QyZjY2NjEyZWMzMmEwYWFk NTZmOTVkMTViMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTAxLTIzICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYiBBbmltYXRpb25z XSBNYWtlIEFuaW1hdGlvbkxpc3QgcmVmLWNvdW50ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNjY2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vYW5pbWF0aW9uL0FuaW1hdGlvbkxp c3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uTGlzdDo6QW5pbWF0aW9uTGlzdCk6 CisgICAgICAgICogcGxhdGZvcm0vYW5pbWF0aW9uL0FuaW1hdGlvbkxpc3QuaDoKKyAgICAgICAg KFdlYkNvcmU6OkFuaW1hdGlvbkxpc3Q6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpBbmlt YXRpb25MaXN0OjpBbmltYXRpb25MaXN0KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcv c3R5bGUvUmVuZGVyU3R5bGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OmVu c3VyZUFuaW1hdGlvbnMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OmVuc3VyZVRy YW5zaXRpb25zKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlTm9uSW5oZXJp dGVkRGF0YS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRh OjpTdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUv U3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YS5oOgorCiAyMDIwLTAxLTIyICBGdWppaSBIaXJvbm9y aSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFtXaW5DYWlyb10gU29tZSBv ZiBjb21iaW5pbmcgZmFtaWx5IGdseXBocyBhcmUgcmVwbGFjZWQgYnkgc3BhY2UgZ2x5cGhzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hbmltYXRpb24vQW5pbWF0aW9uTGlz dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hbmltYXRpb24vQW5pbWF0aW9uTGlzdC5j cHAKaW5kZXggYWYzYjUxOTUxNjI2MGM1N2NhNTI1NmQ2NThlZjk0MWQxMzE1MzI2YS4uYjdmMjQx MDgwOWU5Njg1MGNiZGQ1NGRhYTg0NTdlNTliYjAwZWVhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vYW5pbWF0aW9uL0FuaW1hdGlvbkxpc3QuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2FuaW1hdGlvbi9BbmltYXRpb25MaXN0LmNwcApAQCAtMzMsNiArMzMs OCBAQCBpZiAoaSkgeyBcCiAgICAgICAgIGFuaW1hdGlvbihpKS5wcm9wU2V0KGFuaW1hdGlvbihq KS5wcm9wR2V0KCkpOyBcCiB9CiAKK0FuaW1hdGlvbkxpc3Q6OkFuaW1hdGlvbkxpc3QoKSA9IGRl ZmF1bHQ7CisKIEFuaW1hdGlvbkxpc3Q6OkFuaW1hdGlvbkxpc3QoY29uc3QgQW5pbWF0aW9uTGlz dCYgb3RoZXIpCiB7CiAgICAgbV9hbmltYXRpb25zLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkob3Ro ZXIuc2l6ZSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2FuaW1hdGlv bi9BbmltYXRpb25MaXN0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hbmltYXRpb24vQW5p bWF0aW9uTGlzdC5oCmluZGV4IGM5M2FmOGQxM2RiMDlkNmI1NDU3M2ZkYjFiYzRlNDBiMGY2YTNm YzguLmU4NGI2YTI5YmYwMWRjMzQ1YTQ1YzJlZmUzNDY2Mjc5YjI4YzhlMDUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2FuaW1hdGlvbi9BbmltYXRpb25MaXN0LmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYW5pbWF0aW9uL0FuaW1hdGlvbkxpc3QuaApAQCAtMjUs MTYgKzI1LDE3IEBACiAjcHJhZ21hIG9uY2UKIAogI2luY2x1ZGUgIkFuaW1hdGlvbi5oIgorI2lu Y2x1ZGUgPHd0Zi9SZWYuaD4KKyNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgogI2luY2x1ZGUg PHd0Zi9WZWN0b3IuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1jbGFzcyBBbmltYXRpb25M aXN0IHsKK2NsYXNzIEFuaW1hdGlvbkxpc3QgOiBwdWJsaWMgUmVmQ291bnRlZDxBbmltYXRpb25M aXN0PiB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAgQW5pbWF0 aW9uTGlzdCgpIHsgfQotICAgIEFuaW1hdGlvbkxpc3QoY29uc3QgQW5pbWF0aW9uTGlzdCYpOwot ICAgIEFuaW1hdGlvbkxpc3QoQW5pbWF0aW9uTGlzdCYmKSA9IGRlZmF1bHQ7CisgICAgc3RhdGlj IFJlZjxBbmltYXRpb25MaXN0PiBjcmVhdGUoKSB7IHJldHVybiBhZG9wdFJlZigqbmV3IEFuaW1h dGlvbkxpc3QpOyB9CisgICAgc3RhdGljIFJlZjxBbmltYXRpb25MaXN0PiBjcmVhdGUoY29uc3Qg QW5pbWF0aW9uTGlzdCYgb3RoZXIpIHsgcmV0dXJuIGFkb3B0UmVmKCpuZXcgQW5pbWF0aW9uTGlz dChvdGhlcikpOyB9CiAKICAgICB2b2lkIGZpbGxVbnNldFByb3BlcnRpZXMoKTsKICAgICBib29s IG9wZXJhdG9yPT0oY29uc3QgQW5pbWF0aW9uTGlzdCYpIGNvbnN0OwpAQCAtNTQsOCArNTUsMTAg QEAgcHVibGljOgogICAgIGNvbnN0IEFuaW1hdGlvbiYgYW5pbWF0aW9uKHNpemVfdCBpKSBjb25z dCB7IHJldHVybiBtX2FuaW1hdGlvbnNbaV0uZ2V0KCk7IH0KICAgICAKIHByaXZhdGU6CisgICAg QW5pbWF0aW9uTGlzdCgpOworICAgIEFuaW1hdGlvbkxpc3QoY29uc3QgQW5pbWF0aW9uTGlzdCYp OworCiAgICAgQW5pbWF0aW9uTGlzdCYgb3BlcmF0b3I9KGNvbnN0IEFuaW1hdGlvbkxpc3QmKTsK LSAgICBBbmltYXRpb25MaXN0JiBvcGVyYXRvcj0oQW5pbWF0aW9uTGlzdCYmKSA9IGRlZmF1bHQ7 CiAKICAgICBWZWN0b3I8UmVmPEFuaW1hdGlvbj4sIDAsIENyYXNoT25PdmVyZmxvdywgMD4gbV9h bmltYXRpb25zOwogfTsgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvUmVuZGVyU3R5bGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1Jl bmRlclN0eWxlLmNwcAppbmRleCBkMGJmZDljZjUxMTA4MzU4NDEzODU3NGNiM2E2Y2QxNGIxOWJm ZDA5Li45ZmE2NWZiNjhmZDgyZmUwNTJhN2RiNDQ4MTczNzliMDQ5ZTBlNjM5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAKQEAgLTE2NjEsMTQg KzE2NjEsMTQgQEAgdm9pZCBSZW5kZXJTdHlsZTo6YWRqdXN0VHJhbnNpdGlvbnMoKQogQW5pbWF0 aW9uTGlzdCYgUmVuZGVyU3R5bGU6OmVuc3VyZUFuaW1hdGlvbnMoKQogewogICAgIGlmICghbV9y YXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS5hbmltYXRpb25zKQotICAgICAgICBtX3JhcmVO b25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLmFuaW1hdGlvbnMgPSBtYWtlVW5pcXVlPEFuaW1hdGlv bkxpc3Q+KCk7CisgICAgICAgIG1fcmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCkuYW5pbWF0 aW9ucyA9IEFuaW1hdGlvbkxpc3Q6OmNyZWF0ZSgpOwogICAgIHJldHVybiAqbV9yYXJlTm9uSW5o ZXJpdGVkRGF0YS0+YW5pbWF0aW9uczsKIH0KIAogQW5pbWF0aW9uTGlzdCYgUmVuZGVyU3R5bGU6 OmVuc3VyZVRyYW5zaXRpb25zKCkKIHsKICAgICBpZiAoIW1fcmFyZU5vbkluaGVyaXRlZERhdGEu YWNjZXNzKCkudHJhbnNpdGlvbnMpCi0gICAgICAgIG1fcmFyZU5vbkluaGVyaXRlZERhdGEuYWNj ZXNzKCkudHJhbnNpdGlvbnMgPSBtYWtlVW5pcXVlPEFuaW1hdGlvbkxpc3Q+KCk7CisgICAgICAg IG1fcmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCkudHJhbnNpdGlvbnMgPSBBbmltYXRpb25M aXN0OjpjcmVhdGUoKTsKICAgICByZXR1cm4gKm1fcmFyZU5vbkluaGVyaXRlZERhdGEtPnRyYW5z aXRpb25zOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv U3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvU3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YS5jcHAKaW5kZXggNjkwMzU4MWIwMWM1N2Iw YzJhOGNhYzJjMDg3OTRmYTMyZDM4YjRhYy4uNDUyNmNiMjU4MDllY2EyMDU4NzA2N2JkODE0ZDA3 NTNjMjAzZDY1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0 eWxlUmFyZU5vbkluaGVyaXRlZERhdGEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zdHlsZS9TdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhLmNwcApAQCAtMTQ4LDggKzE0OCw4IEBA IGlubGluZSBTdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhOjpTdHlsZVJhcmVOb25Jbmhlcml0ZWRE YXRhKGNvbnN0IFN0eWxlUmFyZU5vbkluCiAgICAgLCBib3hTaGFkb3coby5ib3hTaGFkb3cgPyBt YWtlVW5pcXVlPFNoYWRvd0RhdGE+KCpvLmJveFNoYWRvdykgOiBudWxscHRyKQogICAgICwgd2ls bENoYW5nZShvLndpbGxDaGFuZ2UpCiAgICAgLCBib3hSZWZsZWN0KG8uYm94UmVmbGVjdCkKLSAg ICAsIGFuaW1hdGlvbnMoby5hbmltYXRpb25zID8gbWFrZVVuaXF1ZTxBbmltYXRpb25MaXN0Pigq by5hbmltYXRpb25zKSA6IG51bGxwdHIpCi0gICAgLCB0cmFuc2l0aW9ucyhvLnRyYW5zaXRpb25z ID8gbWFrZVVuaXF1ZTxBbmltYXRpb25MaXN0Pigqby50cmFuc2l0aW9ucykgOiBudWxscHRyKQor ICAgICwgYW5pbWF0aW9ucyhvLmFuaW1hdGlvbnMgPyBBbmltYXRpb25MaXN0OjpjcmVhdGUoKm8u YW5pbWF0aW9ucykgOiBvLmFuaW1hdGlvbnMpCisgICAgLCB0cmFuc2l0aW9ucyhvLnRyYW5zaXRp b25zID8gQW5pbWF0aW9uTGlzdDo6Y3JlYXRlKCpvLnRyYW5zaXRpb25zKSA6IG8udHJhbnNpdGlv bnMpCiAgICAgLCBtYXNrKG8ubWFzaykKICAgICAsIG1hc2tCb3hJbWFnZShvLm1hc2tCb3hJbWFn ZSkKICAgICAsIHBhZ2VTaXplKG8ucGFnZVNpemUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YS5oIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEuaAppbmRleCBi Y2M0ZTE1ZTNkYTI4MDY1MzdmYzVlN2E0ZDI4Zjk3MjI3MGI5ZjVmLi44ZjdkMmJiZDY5Zjk2MzJh Yjg1NWE1ZGVmMDZkNDE0NzQ3N2IzMmZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc3R5bGUvU3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhLmgKQEAgLTEzNyw4 ICsxMzcsOCBAQCBwdWJsaWM6CiAgICAgCiAgICAgUmVmUHRyPFN0eWxlUmVmbGVjdGlvbj4gYm94 UmVmbGVjdDsKIAotICAgIHN0ZDo6dW5pcXVlX3B0cjxBbmltYXRpb25MaXN0PiBhbmltYXRpb25z OwotICAgIHN0ZDo6dW5pcXVlX3B0cjxBbmltYXRpb25MaXN0PiB0cmFuc2l0aW9uczsKKyAgICBS ZWZQdHI8QW5pbWF0aW9uTGlzdD4gYW5pbWF0aW9uczsKKyAgICBSZWZQdHI8QW5pbWF0aW9uTGlz dD4gdHJhbnNpdGlvbnM7CiAKICAgICBGaWxsTGF5ZXIgbWFzazsKICAgICBOaW5lUGllY2VJbWFn ZSBtYXNrQm94SW1hZ2U7Cg==