218014 2020-10-21 05:19:57 -0700 Rename hasRunningTransitionsForProperty() and hasCompletedTransitionsForProperty() to be singular 2020-10-21 11:10:19 -0700 1 1 1 Unclassified WebKit Animations WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 graouts graouts cdumez cmarcelo dino esprehn+autocc ews-watchlist ggaren graouts kangil.han webkit-bug-importer oldest_to_newest 1700144 0 graouts 2020-10-21 05:19:57 -0700 Rename hasRunningTransitionsForProperty() and hasCompletedTransitionsForProperty() to be singular 1700145 1 411974 graouts 2020-10-21 05:21:14 -0700 Created attachment 411974 Patch 1700251 2 411974 ggaren 2020-10-21 10:04:08 -0700 Comment on attachment 411974 Patch r=me 1700280 3 graouts 2020-10-21 11:09:10 -0700 Committed r268808: <https://trac.webkit.org/changeset/268808> 1700283 4 webkit-bug-importer 2020-10-21 11:10:19 -0700 <rdar://problem/70536965> 411974 2020-10-21 05:21:14 -0700 2020-10-21 10:04:08 -0700 Patch bug-218014-20201021142113.patch text/plain 9316 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4Nzg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjY1YzJmNTY3YjllOWVm ZjY3YjUwYjZmYzk0MDUwYzQ5OGIzZmJkNC4uMWNiYTY1MWRjYWUzZGNkN2E5MTNjZWM1YjU1MzNk NmQ1ZjYwMWRkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTEwLTIxICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgorCisgICAgICAgIFJlbmFtZSBoYXNSdW5u aW5nVHJhbnNpdGlvbnNGb3JQcm9wZXJ0eSgpIGFuZCBoYXNDb21wbGV0ZWRUcmFuc2l0aW9uc0Zv clByb3BlcnR5KCkgdG8gYmUgc2luZ3VsYXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxODAxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFNpbmNlIHRoZXJlIGlzIG9ubHkgcnVubmluZyBvciBjb21wbGV0 ZWQgdHJhbnNpdGlvbiBwZXIgcHJvcGVydHksIHRoZSBuYW1lIG9mIHRoZXNlIG1ldGhvZHMgd2Fz IG1pc2xlYWRpbmcuCisKKyAgICAgICAgKiBhbmltYXRpb24vQW5pbWF0aW9uVGltZWxpbmUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uVGltZWxpbmU6OnVwZGF0ZUNTU1RyYW5zaXRp b25zRm9yU3R5bGVhYmxlQW5kUHJvcGVydHkpOgorICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6Omhhc0NvbXBsZXRlZFRyYW5zaXRpb25Gb3JQcm9w ZXJ0eSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpoYXNSdW5uaW5nVHJhbnNp dGlvbkZvclByb3BlcnR5IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6Omhhc0Nv bXBsZXRlZFRyYW5zaXRpb25zRm9yUHJvcGVydHkgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6RWxlbWVudDo6aGFzUnVubmluZ1RyYW5zaXRpb25zRm9yUHJvcGVydHkgY29uc3Qp OiBEZWxldGVkLgorICAgICAgICAqIGRvbS9FbGVtZW50Lmg6CisgICAgICAgICogc3R5bGUvU3R5 bGVhYmxlLmg6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZWFibGU6Omhhc0NvbXBsZXRlZFRyYW5z aXRpb25Gb3JQcm9wZXJ0eSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZWFibGU6Omhh c1J1bm5pbmdUcmFuc2l0aW9uRm9yUHJvcGVydHkgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 U3R5bGVhYmxlOjpoYXNDb21wbGV0ZWRUcmFuc2l0aW9uc0ZvclByb3BlcnR5IGNvbnN0KTogRGVs ZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlYWJsZTo6aGFzUnVubmluZ1RyYW5zaXRpb25z Rm9yUHJvcGVydHkgY29uc3QpOiBEZWxldGVkLgorCiAyMDIwLTEwLTIwICBKdWxpYW4gR29uemFs ZXogIDxqdWxpYW5fYV9nb256YWxlekBhcHBsZS5jb20+CiAKICAgICAgICAgUmVsZWFzZSBhc3Nl cnQgaW4gfk5vZGUgZHVlIHRvIHJlbmRlciBlbGVtZW50IG9mIHBzZXVkbyBlbGVtZW50IG5vdCBn ZXR0aW5nIHJlbW92ZWQgaW4gdGltZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYW5pbWF0 aW9uL0FuaW1hdGlvblRpbWVsaW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9Bbmlt YXRpb25UaW1lbGluZS5jcHAKaW5kZXggNzBkNWY3YTE4MzFhMzcwODYyNWUwNWFiNWNmN2VhZWM2 M2JmMWM3Ny4uMjdkZWIwNWUyMjU4N2U1NzRmYTgzYzhmNTExZDI0MWEzYWZiMjA4MyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0FuaW1hdGlvblRpbWVsaW5lLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQW5pbWF0aW9uVGltZWxpbmUuY3BwCkBAIC0zNjMs NyArMzYzLDcgQEAgdm9pZCBBbmltYXRpb25UaW1lbGluZTo6dXBkYXRlQ1NTVHJhbnNpdGlvbnNG b3JTdHlsZWFibGVBbmRQcm9wZXJ0eShjb25zdCBTdHlsZWEKIAogICAgIC8vIEEgQ1NTIFRyYW5z aXRpb24gbWlnaHQgaGF2ZSBjb21wbGV0ZWQgc2luY2UgdGhlIGxhc3QgdGltZSBhbmltYXRpb25z IHdlcmUgdXBkYXRlZCBzbyB3ZSBtdXN0CiAgICAgLy8gdXBkYXRlIHRoZSBydW5uaW5nIGFuZCBj b21wbGV0ZWQgdHJhbnNpdGlvbnMgbWVtYmVyc2hpcCBpbiB0aGF0IGNhc2UuCi0gICAgaWYgKGlz PENTU1RyYW5zaXRpb24+KGFuaW1hdGlvbikgJiYgbWF0Y2hpbmdCYWNraW5nQW5pbWF0aW9uICYm IHN0eWxlYWJsZS5oYXNSdW5uaW5nVHJhbnNpdGlvbnNGb3JQcm9wZXJ0eShwcm9wZXJ0eSkgJiYg YW5pbWF0aW9uLT5wbGF5U3RhdGUoKSA9PSBXZWJBbmltYXRpb246OlBsYXlTdGF0ZTo6RmluaXNo ZWQpIHsKKyAgICBpZiAoaXM8Q1NTVHJhbnNpdGlvbj4oYW5pbWF0aW9uKSAmJiBtYXRjaGluZ0Jh Y2tpbmdBbmltYXRpb24gJiYgc3R5bGVhYmxlLmhhc1J1bm5pbmdUcmFuc2l0aW9uRm9yUHJvcGVy dHkocHJvcGVydHkpICYmIGFuaW1hdGlvbi0+cGxheVN0YXRlKCkgPT0gV2ViQW5pbWF0aW9uOjpQ bGF5U3RhdGU6OkZpbmlzaGVkKSB7CiAgICAgICAgIHN0eWxlYWJsZS5lbnN1cmVDb21wbGV0ZWRU cmFuc2l0aW9uc0J5UHJvcGVydHkoKS5zZXQocHJvcGVydHksIHN0eWxlYWJsZS5lbnN1cmVSdW5u aW5nVHJhbnNpdGlvbnNCeVByb3BlcnR5KCkudGFrZShwcm9wZXJ0eSkpOwogICAgICAgICBhbmlt YXRpb24gPSBudWxscHRyOwogICAgIH0KQEAgLTQwNCw3ICs0MDQsNyBAQCB2b2lkIEFuaW1hdGlv blRpbWVsaW5lOjp1cGRhdGVDU1NUcmFuc2l0aW9uc0ZvclN0eWxlYWJsZUFuZFByb3BlcnR5KGNv bnN0IFN0eWxlYQogICAgICAgICByZXR1cm4gUmVuZGVyU3R5bGU6OmNsb25lKG5ld1N0eWxlKTsK ICAgICB9KCk7CiAKLSAgICBpZiAoIXN0eWxlYWJsZS5oYXNSdW5uaW5nVHJhbnNpdGlvbnNGb3JQ cm9wZXJ0eShwcm9wZXJ0eSkKKyAgICBpZiAoIXN0eWxlYWJsZS5oYXNSdW5uaW5nVHJhbnNpdGlv bkZvclByb3BlcnR5KHByb3BlcnR5KQogICAgICAgICAmJiAhQ1NTUHJvcGVydHlBbmltYXRpb246 OnByb3BlcnRpZXNFcXVhbChwcm9wZXJ0eSwgJmJlZm9yZUNoYW5nZVN0eWxlLCAmYWZ0ZXJDaGFu Z2VTdHlsZSkKICAgICAgICAgJiYgQ1NTUHJvcGVydHlBbmltYXRpb246OmNhblByb3BlcnR5QmVJ bnRlcnBvbGF0ZWQocHJvcGVydHksICZiZWZvcmVDaGFuZ2VTdHlsZSwgJmFmdGVyQ2hhbmdlU3R5 bGUpCiAgICAgICAgICYmICFwcm9wZXJ0eUluU3R5bGVNYXRjaGVzVmFsdWVGb3JUcmFuc2l0aW9u SW5NYXAocHJvcGVydHksIGFmdGVyQ2hhbmdlU3R5bGUsIHN0eWxlYWJsZS5lbnN1cmVDb21wbGV0 ZWRUcmFuc2l0aW9uc0J5UHJvcGVydHkoKSkKQEAgLTQzMSwxNCArNDMxLDE0IEBAIHZvaWQgQW5p bWF0aW9uVGltZWxpbmU6OnVwZGF0ZUNTU1RyYW5zaXRpb25zRm9yU3R5bGVhYmxlQW5kUHJvcGVy dHkoY29uc3QgU3R5bGVhCiAgICAgICAgIGF1dG8mIHJldmVyc2luZ0FkanVzdGVkU3RhcnRTdHls ZSA9IGJlZm9yZUNoYW5nZVN0eWxlOwogICAgICAgICBhdXRvIHJldmVyc2luZ1Nob3J0ZW5pbmdG YWN0b3IgPSAxOwogICAgICAgICBzdHlsZWFibGUuZW5zdXJlUnVubmluZ1RyYW5zaXRpb25zQnlQ cm9wZXJ0eSgpLnNldChwcm9wZXJ0eSwgQ1NTVHJhbnNpdGlvbjo6Y3JlYXRlKHN0eWxlYWJsZSwg cHJvcGVydHksIGdlbmVyYXRpb25UaW1lLCAqbWF0Y2hpbmdCYWNraW5nQW5pbWF0aW9uLCAmYmVm b3JlQ2hhbmdlU3R5bGUsIGFmdGVyQ2hhbmdlU3R5bGUsIGRlbGF5LCBkdXJhdGlvbiwgcmV2ZXJz aW5nQWRqdXN0ZWRTdGFydFN0eWxlLCByZXZlcnNpbmdTaG9ydGVuaW5nRmFjdG9yKSk7Ci0gICAg fSBlbHNlIGlmIChzdHlsZWFibGUuaGFzQ29tcGxldGVkVHJhbnNpdGlvbnNGb3JQcm9wZXJ0eShw cm9wZXJ0eSkgJiYgIXByb3BlcnR5SW5TdHlsZU1hdGNoZXNWYWx1ZUZvclRyYW5zaXRpb25Jbk1h cChwcm9wZXJ0eSwgYWZ0ZXJDaGFuZ2VTdHlsZSwgc3R5bGVhYmxlLmVuc3VyZUNvbXBsZXRlZFRy YW5zaXRpb25zQnlQcm9wZXJ0eSgpKSkgeworICAgIH0gZWxzZSBpZiAoc3R5bGVhYmxlLmhhc0Nv bXBsZXRlZFRyYW5zaXRpb25Gb3JQcm9wZXJ0eShwcm9wZXJ0eSkgJiYgIXByb3BlcnR5SW5TdHls ZU1hdGNoZXNWYWx1ZUZvclRyYW5zaXRpb25Jbk1hcChwcm9wZXJ0eSwgYWZ0ZXJDaGFuZ2VTdHls ZSwgc3R5bGVhYmxlLmVuc3VyZUNvbXBsZXRlZFRyYW5zaXRpb25zQnlQcm9wZXJ0eSgpKSkgewog ICAgICAgICAvLyAyLiBPdGhlcndpc2UsIGlmIHRoZSBlbGVtZW50IGhhcyBhIGNvbXBsZXRlZCB0 cmFuc2l0aW9uIGZvciB0aGUgcHJvcGVydHkgYW5kIHRoZSBlbmQgdmFsdWUgb2YgdGhlIGNvbXBs ZXRlZCB0cmFuc2l0aW9uIGlzIGRpZmZlcmVudCBmcm9tCiAgICAgICAgIC8vICAgIHRoZSBhZnRl ci1jaGFuZ2Ugc3R5bGUgZm9yIHRoZSBwcm9wZXJ0eSwgdGhlbiBpbXBsZW1lbnRhdGlvbnMgbXVz dCByZW1vdmUgdGhlIGNvbXBsZXRlZCB0cmFuc2l0aW9uIGZyb20gdGhlIHNldCBvZiBjb21wbGV0 ZWQgdHJhbnNpdGlvbnMuCiAgICAgICAgIHN0eWxlYWJsZS5lbnN1cmVDb21wbGV0ZWRUcmFuc2l0 aW9uc0J5UHJvcGVydHkoKS5yZW1vdmUocHJvcGVydHkpOwogICAgIH0KIAotICAgIGJvb2wgaGFz UnVubmluZ1RyYW5zaXRpb24gPSBzdHlsZWFibGUuaGFzUnVubmluZ1RyYW5zaXRpb25zRm9yUHJv cGVydHkocHJvcGVydHkpOwotICAgIGlmICgoaGFzUnVubmluZ1RyYW5zaXRpb24gfHwgc3R5bGVh YmxlLmhhc0NvbXBsZXRlZFRyYW5zaXRpb25zRm9yUHJvcGVydHkocHJvcGVydHkpKSAmJiAhbWF0 Y2hpbmdCYWNraW5nQW5pbWF0aW9uKSB7CisgICAgYm9vbCBoYXNSdW5uaW5nVHJhbnNpdGlvbiA9 IHN0eWxlYWJsZS5oYXNSdW5uaW5nVHJhbnNpdGlvbkZvclByb3BlcnR5KHByb3BlcnR5KTsKKyAg ICBpZiAoKGhhc1J1bm5pbmdUcmFuc2l0aW9uIHx8IHN0eWxlYWJsZS5oYXNDb21wbGV0ZWRUcmFu c2l0aW9uRm9yUHJvcGVydHkocHJvcGVydHkpKSAmJiAhbWF0Y2hpbmdCYWNraW5nQW5pbWF0aW9u KSB7CiAgICAgICAgIC8vIDMuIElmIHRoZSBlbGVtZW50IGhhcyBhIHJ1bm5pbmcgdHJhbnNpdGlv biBvciBjb21wbGV0ZWQgdHJhbnNpdGlvbiBmb3IgdGhlIHByb3BlcnR5LCBhbmQgdGhlcmUgaXMg bm90IGEgbWF0Y2hpbmcgdHJhbnNpdGlvbi1wcm9wZXJ0eQogICAgICAgICAvLyAgICB2YWx1ZSwg dGhlbiBpbXBsZW1lbnRhdGlvbnMgbXVzdCBjYW5jZWwgdGhlIHJ1bm5pbmcgdHJhbnNpdGlvbiBv ciByZW1vdmUgdGhlIGNvbXBsZXRlZCB0cmFuc2l0aW9uIGZyb20gdGhlIHNldCBvZiBjb21wbGV0 ZWQgdHJhbnNpdGlvbnMuCiAgICAgICAgIGlmIChoYXNSdW5uaW5nVHJhbnNpdGlvbikKQEAgLTQ0 Nyw3ICs0NDcsNyBAQCB2b2lkIEFuaW1hdGlvblRpbWVsaW5lOjp1cGRhdGVDU1NUcmFuc2l0aW9u c0ZvclN0eWxlYWJsZUFuZFByb3BlcnR5KGNvbnN0IFN0eWxlYQogICAgICAgICAgICAgc3R5bGVh YmxlLmVuc3VyZUNvbXBsZXRlZFRyYW5zaXRpb25zQnlQcm9wZXJ0eSgpLnJlbW92ZShwcm9wZXJ0 eSk7CiAgICAgfQogCi0gICAgaWYgKG1hdGNoaW5nQmFja2luZ0FuaW1hdGlvbiAmJiBzdHlsZWFi bGUuaGFzUnVubmluZ1RyYW5zaXRpb25zRm9yUHJvcGVydHkocHJvcGVydHkpICYmICFwcm9wZXJ0 eUluU3R5bGVNYXRjaGVzVmFsdWVGb3JUcmFuc2l0aW9uSW5NYXAocHJvcGVydHksIGFmdGVyQ2hh bmdlU3R5bGUsIHN0eWxlYWJsZS5lbnN1cmVSdW5uaW5nVHJhbnNpdGlvbnNCeVByb3BlcnR5KCkp KSB7CisgICAgaWYgKG1hdGNoaW5nQmFja2luZ0FuaW1hdGlvbiAmJiBzdHlsZWFibGUuaGFzUnVu bmluZ1RyYW5zaXRpb25Gb3JQcm9wZXJ0eShwcm9wZXJ0eSkgJiYgIXByb3BlcnR5SW5TdHlsZU1h dGNoZXNWYWx1ZUZvclRyYW5zaXRpb25Jbk1hcChwcm9wZXJ0eSwgYWZ0ZXJDaGFuZ2VTdHlsZSwg c3R5bGVhYmxlLmVuc3VyZVJ1bm5pbmdUcmFuc2l0aW9uc0J5UHJvcGVydHkoKSkpIHsKICAgICAg ICAgYXV0byBwcmV2aW91c2x5UnVubmluZ1RyYW5zaXRpb24gPSBzdHlsZWFibGUuZW5zdXJlUnVu bmluZ1RyYW5zaXRpb25zQnlQcm9wZXJ0eSgpLnRha2UocHJvcGVydHkpOwogICAgICAgICBhdXRv JiBwcmV2aW91c2x5UnVubmluZ1RyYW5zaXRpb25DdXJyZW50U3R5bGUgPSBwcmV2aW91c2x5UnVu bmluZ1RyYW5zaXRpb24tPmN1cnJlbnRTdHlsZSgpOwogICAgICAgICAvLyA0LiBJZiB0aGUgZWxl bWVudCBoYXMgYSBydW5uaW5nIHRyYW5zaXRpb24gZm9yIHRoZSBwcm9wZXJ0eSwgdGhlcmUgaXMg YSBtYXRjaGluZyB0cmFuc2l0aW9uLXByb3BlcnR5IHZhbHVlLCBhbmQgdGhlIGVuZCB2YWx1ZSBv ZiB0aGUgcnVubmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCmluZGV4IDlhOWRmZGJlNmQ3YWY4YTk4 NGZkMzBiZjMxYzE3ZDgyODQzNGNmZDEuLjJmMGUxZGEwZmY2YmUxYzY0YzVhZDg1NWI0M2NkNGIw N2FlNzhhN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKQEAgLTM4NDcsMTQgKzM4NDcsMTQgQEAg Y29uc3QgQW5pbWF0aW9uQ29sbGVjdGlvbiogRWxlbWVudDo6YW5pbWF0aW9ucyhQc2V1ZG9JZCBw c2V1ZG9JZCkgY29uc3QKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAotYm9vbCBFbGVtZW50Ojpo YXNDb21wbGV0ZWRUcmFuc2l0aW9uc0ZvclByb3BlcnR5KFBzZXVkb0lkIHBzZXVkb0lkLCBDU1NQ cm9wZXJ0eUlEIHByb3BlcnR5KSBjb25zdAorYm9vbCBFbGVtZW50OjpoYXNDb21wbGV0ZWRUcmFu c2l0aW9uRm9yUHJvcGVydHkoUHNldWRvSWQgcHNldWRvSWQsIENTU1Byb3BlcnR5SUQgcHJvcGVy dHkpIGNvbnN0CiB7CiAgICAgaWYgKGF1dG8qIGFuaW1hdGlvbkRhdGEgPSBhbmltYXRpb25SYXJl RGF0YShwc2V1ZG9JZCkpCiAgICAgICAgIHJldHVybiBhbmltYXRpb25EYXRhLT5jb21wbGV0ZWRU cmFuc2l0aW9uc0J5UHJvcGVydHkoKS5jb250YWlucyhwcm9wZXJ0eSk7CiAgICAgcmV0dXJuIGZh bHNlOwogfQogCi1ib29sIEVsZW1lbnQ6Omhhc1J1bm5pbmdUcmFuc2l0aW9uc0ZvclByb3BlcnR5 KFBzZXVkb0lkIHBzZXVkb0lkLCBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5KSBjb25zdAorYm9vbCBF bGVtZW50OjpoYXNSdW5uaW5nVHJhbnNpdGlvbkZvclByb3BlcnR5KFBzZXVkb0lkIHBzZXVkb0lk LCBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5KSBjb25zdAogewogICAgIGlmIChhdXRvKiBhbmltYXRp b25EYXRhID0gYW5pbWF0aW9uUmFyZURhdGEocHNldWRvSWQpKQogICAgICAgICByZXR1cm4gYW5p bWF0aW9uRGF0YS0+cnVubmluZ1RyYW5zaXRpb25zQnlQcm9wZXJ0eSgpLmNvbnRhaW5zKHByb3Bl cnR5KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmggYi9Tb3VyY2Uv V2ViQ29yZS9kb20vRWxlbWVudC5oCmluZGV4IGUzNTQ4NzE5Yjg4MDc2N2FkZjVjNjc4Y2JiYjE3 OTg0Y2Y2ZDUxNGQuLjEyNGNmOWQxY2Q2ZTYxYTdiNjc4NWQxMDgxYWU5MmFkYzQzNDg5Y2QgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNv cmUvZG9tL0VsZW1lbnQuaApAQCAtNDkyLDggKzQ5Miw4IEBAIHB1YmxpYzoKICAgICBPcHRpb25T ZXQ8QW5pbWF0aW9uSW1wYWN0PiBhcHBseUtleWZyYW1lRWZmZWN0cyhQc2V1ZG9JZCwgUmVuZGVy U3R5bGUmKTsKIAogICAgIGNvbnN0IEFuaW1hdGlvbkNvbGxlY3Rpb24qIGFuaW1hdGlvbnMoUHNl dWRvSWQpIGNvbnN0OwotICAgIGJvb2wgaGFzQ29tcGxldGVkVHJhbnNpdGlvbnNGb3JQcm9wZXJ0 eShQc2V1ZG9JZCwgQ1NTUHJvcGVydHlJRCkgY29uc3Q7Ci0gICAgYm9vbCBoYXNSdW5uaW5nVHJh bnNpdGlvbnNGb3JQcm9wZXJ0eShQc2V1ZG9JZCwgQ1NTUHJvcGVydHlJRCkgY29uc3Q7CisgICAg Ym9vbCBoYXNDb21wbGV0ZWRUcmFuc2l0aW9uRm9yUHJvcGVydHkoUHNldWRvSWQsIENTU1Byb3Bl cnR5SUQpIGNvbnN0OworICAgIGJvb2wgaGFzUnVubmluZ1RyYW5zaXRpb25Gb3JQcm9wZXJ0eShQ c2V1ZG9JZCwgQ1NTUHJvcGVydHlJRCkgY29uc3Q7CiAgICAgYm9vbCBoYXNSdW5uaW5nVHJhbnNp dGlvbnMoUHNldWRvSWQpIGNvbnN0OwogICAgIEFuaW1hdGlvbkNvbGxlY3Rpb24mIGVuc3VyZUFu aW1hdGlvbnMoUHNldWRvSWQpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9T dHlsZWFibGUuaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlYWJsZS5oCmluZGV4IGJlZmJi NjRiMDQwNzRlODU1NmZhMmZlYWQzMGRjMDliNzg2YzQ0NTYuLjczNTcwMTAxNTZkNTk5ZDgxODE1 MGEyODhhZTVhZDk3YTYxMTBlOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0 eWxlYWJsZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlYWJsZS5oCkBAIC05Niwx NCArOTYsMTQgQEAgc3RydWN0IFN0eWxlYWJsZSB7CiAgICAgICAgIHJldHVybiBlbGVtZW50LmFu aW1hdGlvbnMocHNldWRvSWQpOwogICAgIH0KIAotICAgIGJvb2wgaGFzQ29tcGxldGVkVHJhbnNp dGlvbnNGb3JQcm9wZXJ0eShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5KSBjb25zdAorICAgIGJvb2wg aGFzQ29tcGxldGVkVHJhbnNpdGlvbkZvclByb3BlcnR5KENTU1Byb3BlcnR5SUQgcHJvcGVydHkp IGNvbnN0CiAgICAgewotICAgICAgICByZXR1cm4gZWxlbWVudC5oYXNDb21wbGV0ZWRUcmFuc2l0 aW9uc0ZvclByb3BlcnR5KHBzZXVkb0lkLCBwcm9wZXJ0eSk7CisgICAgICAgIHJldHVybiBlbGVt ZW50Lmhhc0NvbXBsZXRlZFRyYW5zaXRpb25Gb3JQcm9wZXJ0eShwc2V1ZG9JZCwgcHJvcGVydHkp OwogICAgIH0KIAotICAgIGJvb2wgaGFzUnVubmluZ1RyYW5zaXRpb25zRm9yUHJvcGVydHkoQ1NT UHJvcGVydHlJRCBwcm9wZXJ0eSkgY29uc3QKKyAgICBib29sIGhhc1J1bm5pbmdUcmFuc2l0aW9u Rm9yUHJvcGVydHkoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eSkgY29uc3QKICAgICB7Ci0gICAgICAg IHJldHVybiBlbGVtZW50Lmhhc1J1bm5pbmdUcmFuc2l0aW9uc0ZvclByb3BlcnR5KHBzZXVkb0lk LCBwcm9wZXJ0eSk7CisgICAgICAgIHJldHVybiBlbGVtZW50Lmhhc1J1bm5pbmdUcmFuc2l0aW9u Rm9yUHJvcGVydHkocHNldWRvSWQsIHByb3BlcnR5KTsKICAgICB9CiAKICAgICBib29sIGhhc1J1 bm5pbmdUcmFuc2l0aW9ucygpIGNvbnN0Cg==