176993 2017-09-15 04:33:40 -0700 AnimationBase should ref the element 2017-09-27 12:27:19 -0700 1 1 1 Unclassified WebKit Animations WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned buildbot commit-queue dino dstockwell koivisto simon.fraser webkit-bug-importer oldest_to_newest 1349256 0 koivisto 2017-09-15 04:33:40 -0700 We now longer have renderer pointer. Element can be reffed for safety. 1349260 1 320889 koivisto 2017-09-15 05:02:52 -0700 Created attachment 320889 patch 1349392 2 320889 commit-queue 2017-09-15 10:44:52 -0700 Comment on attachment 320889 patch Clearing flags on attachment: 320889 Committed r222098: <http://trac.webkit.org/changeset/222098> 1349393 3 commit-queue 2017-09-15 10:44:54 -0700 All reviewed patches have been landed. Closing bug. 1353394 4 webkit-bug-importer 2017-09-27 12:27:19 -0700 <rdar://problem/34693309> 320889 2017-09-15 05:02:52 -0700 2017-09-15 10:44:52 -0700 patch animationbase-element-refptr.patch text/plain 8549 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMjA4MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE3LTA5LTE1ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBBbmltYXRpb25CYXNlIHNob3Vs ZCByZWYgdGhlIGVsZW1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE3Njk5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFdlIG5vdyBsb25nZXIgaGF2ZSByZW5kZXJlciBwb2ludGVyLiBFbGVtZW50IGNh biBiZSByZWZmZWQgZm9yIHNhZmV0eS4KKworICAgICAgICBUaGlzIGRvZXNuJ3QgY3JlYXRlIHJl ZmVyZW5jZSBjeWNsZSBhcyB0aGUgZWxlbWVudCBwb2ludGVyIGlzIGNsZWFyZWQgd2hlbiByZW5k ZXIgdHJlZSBpcworICAgICAgICB0b3JuIGRvd24uIFRoaXMgaGFwcGVucyBhdCB0aGUgbGF0ZXN0 IHdoZW4gdGhlIGVsZW1lbnQgaXMgcmVtb3ZlZCBmcm9tIHRoZSB0cmVlLgorCisgICAgICAgICog cGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBbmlt YXRpb25CYXNlOjp+QW5pbWF0aW9uQmFzZSk6CisgICAgICAgIChXZWJDb3JlOjpBbmltYXRpb25C YXNlOjpjbGVhcik6CisgICAgICAgICogcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQmFzZS5oOgor ICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uQmFzZTo6fkFuaW1hdGlvbkJhc2UpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uQmFzZTo6Y2xlYXIpOiBEZWxldGVkLgorICAg ICAgICAqIHBhZ2UvYW5pbWF0aW9uL0ltcGxpY2l0QW5pbWF0aW9uLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkltcGxpY2l0QW5pbWF0aW9uOjpwYXVzZUFuaW1hdGlvbik6CisgICAgICAgIChXZWJD b3JlOjpJbXBsaWNpdEFuaW1hdGlvbjo6c2VuZFRyYW5zaXRpb25FdmVudCk6CisgICAgICAgIChX ZWJDb3JlOjpJbXBsaWNpdEFuaW1hdGlvbjo6cmVzZXQpOgorICAgICAgICAqIHBhZ2UvYW5pbWF0 aW9uL0tleWZyYW1lQW5pbWF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lQW5p bWF0aW9uOjpwYXVzZUFuaW1hdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpLZXlmcmFtZUFuaW1h dGlvbjo6ZW5kQW5pbWF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lQW5pbWF0aW9u OjpzZW5kQW5pbWF0aW9uRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6S2V5ZnJhbWVBbmltYXRp b246OnJlc29sdmVLZXlmcmFtZVN0eWxlcyk6CisKIDIwMTctMDktMTQgIENhcmxvcyBHYXJjaWEg Q2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtGcmVlVHlwZV0gQ29tcGxl eCB0ZXh0IGlzIGVuYWJsZWQgdG9vIG9mdGVuIGFmdGVyIHIyMjE5MDkKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuY3BwCShyZXZpc2lvbiAy MjIwNzkpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtODYsNiArODYsMTAgQEAgQW5pbWF0aW9uQmFzZTo6QW5pbWF0 aW9uQmFzZShjb25zdCBBbmltYQogICAgICAgICBtX3RvdGFsRHVyYXRpb24gPSBtX2FuaW1hdGlv bi0+ZHVyYXRpb24oKSAqIG1fYW5pbWF0aW9uLT5pdGVyYXRpb25Db3VudCgpOwogfQogCitBbmlt YXRpb25CYXNlOjp+QW5pbWF0aW9uQmFzZSgpCit7Cit9CisKIFJlbmRlckVsZW1lbnQqIEFuaW1h dGlvbkJhc2U6OnJlbmRlcmVyKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9lbGVtZW50ID8gbV9l bGVtZW50LT5yZW5kZXJlcigpIDogbnVsbHB0cjsKQEAgLTk5LDYgKzEwMywxMyBAQCBSZW5kZXJC b3hNb2RlbE9iamVjdCogQW5pbWF0aW9uQmFzZTo6Y29tCiAgICAgcmV0dXJuIGRvd25jYXN0PFJl bmRlckJveE1vZGVsT2JqZWN0PihyZW5kZXJlcik7CiB9CiAKK3ZvaWQgQW5pbWF0aW9uQmFzZTo6 Y2xlYXIoKQoreworICAgIGVuZEFuaW1hdGlvbigpOworICAgIG1fZWxlbWVudCA9IG51bGxwdHI7 CisgICAgbV9jb21wb3NpdGVBbmltYXRpb24gPSBudWxscHRyOworfQorCiB2b2lkIEFuaW1hdGlv bkJhc2U6OnNldE5lZWRzU3R5bGVSZWNhbGMoRWxlbWVudCogZWxlbWVudCkKIHsKICAgICBpZiAo IWVsZW1lbnQgfHwgZWxlbWVudC0+ZG9jdW1lbnQoKS5yZW5kZXJUcmVlQmVpbmdEZXN0cm95ZWQo KSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNl LmgJKHJldmlzaW9uIDIyMjA3OSkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0Fu aW1hdGlvbkJhc2UuaAkod29ya2luZyBjb3B5KQpAQCAtNDksMTYgKzQ5LDEyIEBAIGNsYXNzIEFu aW1hdGlvbkJhc2UgOiBwdWJsaWMgUmVmQ291bnRlZDwKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9D QVRFRDsKIHB1YmxpYzoKICAgICBBbmltYXRpb25CYXNlKGNvbnN0IEFuaW1hdGlvbiYgdHJhbnNp dGlvbiwgRWxlbWVudCYsIENvbXBvc2l0ZUFuaW1hdGlvbiYpOwotICAgIHZpcnR1YWwgfkFuaW1h dGlvbkJhc2UoKSB7IH0KKyAgICB2aXJ0dWFsIH5BbmltYXRpb25CYXNlKCk7CiAKKyAgICBFbGVt ZW50KiBlbGVtZW50KCkgY29uc3QgeyByZXR1cm4gbV9lbGVtZW50LmdldCgpOyB9CiAgICAgUmVu ZGVyRWxlbWVudCogcmVuZGVyZXIoKSBjb25zdDsKICAgICBSZW5kZXJCb3hNb2RlbE9iamVjdCog Y29tcG9zaXRlZFJlbmRlcmVyKCkgY29uc3Q7Ci0gICAgdm9pZCBjbGVhcigpCi0gICAgewotICAg ICAgICBlbmRBbmltYXRpb24oKTsKLSAgICAgICAgbV9lbGVtZW50ID0gbnVsbHB0cjsKLSAgICAg ICAgbV9jb21wb3NpdGVBbmltYXRpb24gPSBudWxscHRyOwotICAgIH0KKyAgICB2b2lkIGNsZWFy KCk7CiAKICAgICBkb3VibGUgZHVyYXRpb24oKSBjb25zdDsKIApAQCAtMjM5LDcgKzIzNSwxMCBA QCBwcm90ZWN0ZWQ6CiAgICAgYm9vbCBjb21wdXRlVHJhbnNmb3JtZWRFeHRlbnRWaWFUcmFuc2Zv cm1MaXN0KGNvbnN0IEZsb2F0UmVjdCYgcmVuZGVyZXJCb3gsIGNvbnN0IFJlbmRlclN0eWxlJiwg TGF5b3V0UmVjdCYgYm91bmRzKSBjb25zdDsKICAgICBib29sIGNvbXB1dGVUcmFuc2Zvcm1lZEV4 dGVudFZpYU1hdHJpeChjb25zdCBGbG9hdFJlY3QmIHJlbmRlcmVyQm94LCBjb25zdCBSZW5kZXJT dHlsZSYsIExheW91dFJlY3QmIGJvdW5kcykgY29uc3Q7CiAKLSAgICBFbGVtZW50KiBtX2VsZW1l bnQ7Citwcml2YXRlOgorICAgIFJlZlB0cjxFbGVtZW50PiBtX2VsZW1lbnQ7CisKK3Byb3RlY3Rl ZDoKICAgICBDb21wb3NpdGVBbmltYXRpb24qIG1fY29tcG9zaXRlQW5pbWF0aW9uOyAvLyBJZGVh bGx5IHRoaXMgd291bGQgYmUgYSByZWZlcmVuY2UsIGJ1dCBpdCBoYXMgdG8gYmUgY2xlYXJlZCBp ZiBhbiBhbmltYXRpb24gaXMgZGVzdHJveWVkIGluc2lkZSBhbiBldmVudCBjYWxsYmFjay4KICAg ICBSZWY8QW5pbWF0aW9uPiBtX2FuaW1hdGlvbjsKIApJbmRleDogU291cmNlL1dlYkNvcmUvcGFn ZS9hbmltYXRpb24vSW1wbGljaXRBbmltYXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0ltcGxpY2l0QW5pbWF0aW9uLmNwcAkocmV2aXNpb24gMjIy MDc5KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vSW1wbGljaXRBbmltYXRpb24u Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OCw3ICs1OCw3IEBAIEltcGxpY2l0QW5pbWF0aW9uOjp+ SW1wbGljaXRBbmltYXRpb24oKQogCiBib29sIEltcGxpY2l0QW5pbWF0aW9uOjpzaG91bGRTZW5k RXZlbnRGb3JMaXN0ZW5lcihEb2N1bWVudDo6TGlzdGVuZXJUeXBlIGluTGlzdGVuZXJUeXBlKSBj b25zdAogewotICAgIHJldHVybiBtX2VsZW1lbnQtPmRvY3VtZW50KCkuaGFzTGlzdGVuZXJUeXBl KGluTGlzdGVuZXJUeXBlKTsKKyAgICByZXR1cm4gZWxlbWVudCgpLT5kb2N1bWVudCgpLmhhc0xp c3RlbmVyVHlwZShpbkxpc3RlbmVyVHlwZSk7CiB9CiAKIGJvb2wgSW1wbGljaXRBbmltYXRpb246 OmFuaW1hdGUoQ29tcG9zaXRlQW5pbWF0aW9uJiBjb21wb3NpdGVBbmltYXRpb24sIGNvbnN0IFJl bmRlclN0eWxlJiB0YXJnZXRTdHlsZSwgc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0eWxlPiYgYW5p bWF0ZWRTdHlsZSwgYm9vbCYgZGlkQmxlbmRTdHlsZSkKQEAgLTE0NCw3ICsxNDQsNyBAQCB2b2lk IEltcGxpY2l0QW5pbWF0aW9uOjpwYXVzZUFuaW1hdGlvbihkCiAgICAgICAgIHJlbmRlcmVyLT50 cmFuc2l0aW9uUGF1c2VkKHRpbWVPZmZzZXQsIG1fYW5pbWF0aW5nUHJvcGVydHkpOwogICAgIC8v IFJlc3RvcmUgdGhlIG9yaWdpbmFsICh1bmFuaW1hdGVkKSBzdHlsZQogICAgIGlmICghcGF1c2Vk KCkpCi0gICAgICAgIHNldE5lZWRzU3R5bGVSZWNhbGMobV9lbGVtZW50KTsKKyAgICAgICAgc2V0 TmVlZHNTdHlsZVJlY2FsYyhlbGVtZW50KCkpOwogfQogCiB2b2lkIEltcGxpY2l0QW5pbWF0aW9u OjplbmRBbmltYXRpb24oKQpAQCAtMTc2LDcgKzE3Niw3IEBAIGJvb2wgSW1wbGljaXRBbmltYXRp b246OnNlbmRUcmFuc2l0aW9uRXYKICAgICAgICAgICAgIFN0cmluZyBwcm9wZXJ0eU5hbWUgPSBn ZXRQcm9wZXJ0eU5hbWVTdHJpbmcobV9hbmltYXRpbmdQcm9wZXJ0eSk7CiAgICAgICAgICAgICAg ICAgCiAgICAgICAgICAgICAvLyBEaXNwYXRjaCB0aGUgZXZlbnQKLSAgICAgICAgICAgIGF1dG8g ZWxlbWVudCA9IG1ha2VSZWZQdHIobV9lbGVtZW50KTsKKyAgICAgICAgICAgIGF1dG8gZWxlbWVu dCA9IG1ha2VSZWZQdHIodGhpcy0+ZWxlbWVudCgpKTsKIAogICAgICAgICAgICAgQVNTRVJUKCFl bGVtZW50IHx8IGVsZW1lbnQtPmRvY3VtZW50KCkucGFnZUNhY2hlU3RhdGUoKSA9PSBEb2N1bWVu dDo6Tm90SW5QYWdlQ2FjaGUpOwogICAgICAgICAgICAgaWYgKCFlbGVtZW50KQpAQCAtMjAyLDgg KzIwMiw4IEBAIHZvaWQgSW1wbGljaXRBbmltYXRpb246OnJlc2V0KGNvbnN0IFJlbmQKIAogICAg IG1fdG9TdHlsZSA9IFJlbmRlclN0eWxlOjpjbG9uZVB0cih0byk7CiAKLSAgICBpZiAobV9lbGVt ZW50KQotICAgICAgICBTdHlsZTo6bG9hZFBlbmRpbmdSZXNvdXJjZXMoKm1fdG9TdHlsZSwgbV9l bGVtZW50LT5kb2N1bWVudCgpLCBtX2VsZW1lbnQpOworICAgIGlmIChlbGVtZW50KCkpCisgICAg ICAgIFN0eWxlOjpsb2FkUGVuZGluZ1Jlc291cmNlcygqbV90b1N0eWxlLCBlbGVtZW50KCktPmRv Y3VtZW50KCksIGVsZW1lbnQoKSk7CiAKICAgICAvLyBSZXN0YXJ0IHRoZSB0cmFuc2l0aW9uLgog ICAgIGlmIChtX2Zyb21TdHlsZSAmJiBtX3RvU3R5bGUgJiYgIWNvbXBvc2l0ZUFuaW1hdGlvbi5p c1N1c3BlbmRlZCgpKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vS2V5ZnJh bWVBbmltYXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0 aW9uL0tleWZyYW1lQW5pbWF0aW9uLmNwcAkocmV2aXNpb24gMjIyMDc5KQorKysgU291cmNlL1dl YkNvcmUvcGFnZS9hbmltYXRpb24vS2V5ZnJhbWVBbmltYXRpb24uY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yODQsNyArMjg0LDcgQEAgYm9vbCBLZXlmcmFtZUFuaW1hdGlvbjo6c3RhcnRBbmltYXRp b24oZAogCiB2b2lkIEtleWZyYW1lQW5pbWF0aW9uOjpwYXVzZUFuaW1hdGlvbihkb3VibGUgdGlt ZU9mZnNldCkKIHsKLSAgICBpZiAoIW1fZWxlbWVudCkKKyAgICBpZiAoIWVsZW1lbnQoKSkKICAg ICAgICAgcmV0dXJuOwogCiAgICAgaWYgKGF1dG8qIHJlbmRlcmVyID0gY29tcG9zaXRlZFJlbmRl cmVyKCkpCkBAIC0yOTIsMTIgKzI5MiwxMiBAQCB2b2lkIEtleWZyYW1lQW5pbWF0aW9uOjpwYXVz ZUFuaW1hdGlvbihkCiAKICAgICAvLyBSZXN0b3JlIHRoZSBvcmlnaW5hbCAodW5hbmltYXRlZCkg c3R5bGUKICAgICBpZiAoIXBhdXNlZCgpKQotICAgICAgICBzZXROZWVkc1N0eWxlUmVjYWxjKG1f ZWxlbWVudCk7CisgICAgICAgIHNldE5lZWRzU3R5bGVSZWNhbGMoZWxlbWVudCgpKTsKIH0KIAog dm9pZCBLZXlmcmFtZUFuaW1hdGlvbjo6ZW5kQW5pbWF0aW9uKCkKIHsKLSAgICBpZiAoIW1fZWxl bWVudCkKKyAgICBpZiAoIWVsZW1lbnQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKGF1 dG8qIHJlbmRlcmVyID0gY29tcG9zaXRlZFJlbmRlcmVyKCkpCkBAIC0zMDUsMTIgKzMwNSwxMiBA QCB2b2lkIEtleWZyYW1lQW5pbWF0aW9uOjplbmRBbmltYXRpb24oKQogCiAgICAgLy8gUmVzdG9y ZSB0aGUgb3JpZ2luYWwgKHVuYW5pbWF0ZWQpIHN0eWxlCiAgICAgaWYgKCFwYXVzZWQoKSkKLSAg ICAgICAgc2V0TmVlZHNTdHlsZVJlY2FsYyhtX2VsZW1lbnQpOworICAgICAgICBzZXROZWVkc1N0 eWxlUmVjYWxjKGVsZW1lbnQoKSk7CiB9CiAKIGJvb2wgS2V5ZnJhbWVBbmltYXRpb246OnNob3Vs ZFNlbmRFdmVudEZvckxpc3RlbmVyKERvY3VtZW50OjpMaXN0ZW5lclR5cGUgbGlzdGVuZXJUeXBl KSBjb25zdAogewotICAgIHJldHVybiBtX2VsZW1lbnQtPmRvY3VtZW50KCkuaGFzTGlzdGVuZXJU eXBlKGxpc3RlbmVyVHlwZSk7CisgICAgcmV0dXJuIGVsZW1lbnQoKS0+ZG9jdW1lbnQoKS5oYXNM aXN0ZW5lclR5cGUobGlzdGVuZXJUeXBlKTsKIH0KIAogdm9pZCBLZXlmcmFtZUFuaW1hdGlvbjo6 b25BbmltYXRpb25TdGFydChkb3VibGUgZWxhcHNlZFRpbWUpCkBAIC0zNDksNyArMzQ5LDcgQEAg Ym9vbCBLZXlmcmFtZUFuaW1hdGlvbjo6c2VuZEFuaW1hdGlvbkV2ZQogCiAgICAgaWYgKHNob3Vs ZFNlbmRFdmVudEZvckxpc3RlbmVyKGxpc3RlbmVyVHlwZSkpIHsKICAgICAgICAgLy8gRGlzcGF0 Y2ggdGhlIGV2ZW50Ci0gICAgICAgIGF1dG8gZWxlbWVudCA9IG1ha2VSZWZQdHIobV9lbGVtZW50 KTsKKyAgICAgICAgYXV0byBlbGVtZW50ID0gbWFrZVJlZlB0cih0aGlzLT5lbGVtZW50KCkpOwog CiAgICAgICAgIEFTU0VSVCghZWxlbWVudCB8fCBlbGVtZW50LT5kb2N1bWVudCgpLnBhZ2VDYWNo ZVN0YXRlKCkgPT0gRG9jdW1lbnQ6Ok5vdEluUGFnZUNhY2hlKTsKICAgICAgICAgaWYgKCFlbGVt ZW50KQpAQCAtMzg5LDE2ICszODksMTYgQEAgYm9vbCBLZXlmcmFtZUFuaW1hdGlvbjo6YWZmZWN0 c1Byb3BlcnR5KAogCiB2b2lkIEtleWZyYW1lQW5pbWF0aW9uOjpyZXNvbHZlS2V5ZnJhbWVTdHls ZXMoKQogewotICAgIGlmICghbV9lbGVtZW50KQorICAgIGlmICghZWxlbWVudCgpKQogICAgICAg ICByZXR1cm47CiAKLSAgICBpZiAoYXV0byogc3R5bGVTY29wZSA9IFN0eWxlOjpTY29wZTo6Zm9y T3JkaW5hbCgqbV9lbGVtZW50LCBtX2FuaW1hdGlvbi0+bmFtZVN0eWxlU2NvcGVPcmRpbmFsKCkp KQotICAgICAgICBzdHlsZVNjb3BlLT5yZXNvbHZlcigpLmtleWZyYW1lU3R5bGVzRm9yQW5pbWF0 aW9uKCptX2VsZW1lbnQsIG1fdW5hbmltYXRlZFN0eWxlLmdldCgpLCBtX2tleWZyYW1lcyk7Cisg ICAgaWYgKGF1dG8qIHN0eWxlU2NvcGUgPSBTdHlsZTo6U2NvcGU6OmZvck9yZGluYWwoKmVsZW1l bnQoKSwgbV9hbmltYXRpb24tPm5hbWVTdHlsZVNjb3BlT3JkaW5hbCgpKSkKKyAgICAgICAgc3R5 bGVTY29wZS0+cmVzb2x2ZXIoKS5rZXlmcmFtZVN0eWxlc0ZvckFuaW1hdGlvbigqZWxlbWVudCgp LCBtX3VuYW5pbWF0ZWRTdHlsZS5nZXQoKSwgbV9rZXlmcmFtZXMpOwogCiAgICAgLy8gRW5zdXJl IHJlc291cmNlIGxvYWRzIGZvciBhbGwgdGhlIGZyYW1lcy4KICAgICBmb3IgKGF1dG8mIGtleWZy YW1lIDogbV9rZXlmcmFtZXMua2V5ZnJhbWVzKCkpIHsKICAgICAgICAgaWYgKGF1dG8qIHN0eWxl ID0gY29uc3RfY2FzdDxSZW5kZXJTdHlsZSo+KGtleWZyYW1lLnN0eWxlKCkpKQotICAgICAgICAg ICAgU3R5bGU6OmxvYWRQZW5kaW5nUmVzb3VyY2VzKCpzdHlsZSwgbV9lbGVtZW50LT5kb2N1bWVu dCgpLCBtX2VsZW1lbnQpOworICAgICAgICAgICAgU3R5bGU6OmxvYWRQZW5kaW5nUmVzb3VyY2Vz KCpzdHlsZSwgZWxlbWVudCgpLT5kb2N1bWVudCgpLCBlbGVtZW50KCkpOwogICAgIH0KIH0KIAo=