191759 2018-11-16 11:06:30 -0800 [MSE][GStreamer] Refactor AppendPipeline deinitialization 2018-11-21 00:49:47 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aboya aboya bugs-noreply calvaris commit-queue eocanha oldest_to_newest 1479505 0 aboya 2018-11-16 11:06:30 -0800 AppendPipeline currently has a method, clearPlayerPrivate(), that the client code uses to deinitialize most of the AppendPipeline... just before actually destructing it in the next line of code. Since at that point there should not be alive RefPtr's pointing to the AppendPipeline there is no need for this kind of pre-deinitialization in this usage pattern. Instead, we can just rely on C++ destructors, cleaning the code a bit and removing the potential for the question "what if `clearPlayerPrivate() has been called before?`": it has not. Assertions have been added to ensure that there is only one alive RefPtr pointing to AppendPipeline, therefore guaranteeing its immediate destruction. 1479508 1 355078 aboya 2018-11-16 11:09:19 -0800 Created attachment 355078 Patch 1480142 2 calvaris 2018-11-18 22:33:17 -0800 Patch looks ok to me. Anyway, I'd like Enrique to have a quick look at this as well. 1480688 3 eocanha 2018-11-21 00:12:48 -0800 The patch looks good, but I suspected about problems coming from other threads still processing appends (it happened in the past). Alicia's explanations about how the new AbortableTaskQueue would prevent non-main threads from accessing the append pipeline when it's being destroyed convinced me. She also tested player destruction in a 100 iterations loop while appends are still ongoing and didn't detect any problem related to the pipeline destruction. I think the patch is good to be committed. 1480695 4 355078 commit-queue 2018-11-21 00:49:46 -0800 Comment on attachment 355078 Patch Clearing flags on attachment: 355078 Committed r238412: <https://trac.webkit.org/changeset/238412> 1480696 5 commit-queue 2018-11-21 00:49:47 -0800 All reviewed patches have been landed. Closing bug. 355078 2018-11-16 11:09:19 -0800 2018-11-21 00:49:46 -0800 Patch bug-191759-20181116200917.patch text/plain 8171 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4Mjc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTM1MTljOGVhYzlmN2Q4 ZmVhMjQ3Y2VmMDU2MDgyY2E3ZWE4Yzc5My4uZTZkYWZmMGQxZTgzYjczZGUyYWNhM2QzMWRiZWUz ZjM2ZmY0MWJhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE4LTExLTE2ICBBbGlj aWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbTVNFXVtHU3Ry ZWFtZXJdIFJlZmFjdG9yIEFwcGVuZFBpcGVsaW5lIGRlaW5pdGlhbGl6YXRpb24KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MTc1OQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFwcGVuZFBpcGVsaW5lIGN1 cnJlbnRseSBoYXMgYSBtZXRob2QsIGNsZWFyUGxheWVyUHJpdmF0ZSgpLCB0aGF0IHRoZQorICAg ICAgICBjbGllbnQgY29kZSB1c2VzIHRvIGRlaW5pdGlhbGl6ZSBtb3N0IG9mIHRoZSBBcHBlbmRQ aXBlbGluZS4uLiBqdXN0CisgICAgICAgIGJlZm9yZSBhY3R1YWxseSBkZXN0cnVjdGluZyBpdCBp biB0aGUgbmV4dCBsaW5lIG9mIGNvZGUuCisKKyAgICAgICAgU2luY2UgYXQgdGhhdCBwb2ludCB0 aGVyZSBzaG91bGQgbm90IGJlIGFsaXZlIFJlZlB0cidzIHBvaW50aW5nIHRvIHRoZQorICAgICAg ICBBcHBlbmRQaXBlbGluZSB0aGVyZSBpcyBubyBuZWVkIGZvciB0aGlzIGtpbmQgb2YgcHJlLWRl aW5pdGlhbGl6YXRpb24KKyAgICAgICAgaW4gdGhpcyB1c2FnZSBwYXR0ZXJuLiBJbnN0ZWFkLCB3 ZSBjYW4ganVzdCByZWx5IG9uIEMrKyBkZXN0cnVjdG9ycywKKyAgICAgICAgY2xlYW5pbmcgdGhl IGNvZGUgYSBiaXQgYW5kIHJlbW92aW5nIHRoZSBwb3RlbnRpYWwgZm9yIHRoZSBxdWVzdGlvbgor ICAgICAgICAid2hhdCBpZiBgY2xlYXJQbGF5ZXJQcml2YXRlKCkgaGFzIGJlZW4gY2FsbGVkIGJl Zm9yZT9gIjogaXQgaGFzIG5vdC4KKworICAgICAgICBBc3NlcnRpb25zIGhhdmUgYmVlbiBhZGRl ZCB0byBlbnN1cmUgdGhhdCB0aGVyZSBpcyBvbmx5IG9uZSBhbGl2ZQorICAgICAgICBSZWZQdHIg cG9pbnRpbmcgdG8gQXBwZW5kUGlwZWxpbmUsIHRoZXJlZm9yZSBndWFyYW50ZWVpbmcgaXRzIGlt bWVkaWF0ZQorICAgICAgICBkZXN0cnVjdGlvbi4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9tc2UvQXBwZW5kUGlwZWxpbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 QXBwZW5kUGlwZWxpbmU6On5BcHBlbmRQaXBlbGluZSk6CisgICAgICAgIChXZWJDb3JlOjpBcHBl bmRQaXBlbGluZTo6ZGVpbml0aWFsaXplKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGVuZFBpcGVs aW5lOjpjbGVhclBsYXllclByaXZhdGUpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9tc2UvQXBwZW5kUGlwZWxpbmUuaDoKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvbXNlL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck1TRS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJNU0U6On5N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJNU0UpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9tc2UvTWVkaWFTb3VyY2VDbGllbnRHU3RyZWFtZXJNU0UuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFTb3VyY2VDbGllbnRHU3RyZWFtZXJNU0U6OnJlbW92ZWRGcm9t TWVkaWFTb3VyY2UpOgorCiAyMDE4LTExLTE2ICBBbGljaWEgQm95YSBHYXJjw61hICA8YWJveWFA aWdhbGlhLmNvbT4KIAogICAgICAgICBbTVNFXVtHU3RyZWFtZXJdIElnbm9yZSBjYXBzIG5vdGlm aWNhdGlvbnMgd2hlbiB0ZWFyaW5nIGRvd24gdGhlIHBpcGVsaW5lCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvbXNlL0FwcGVuZFBpcGVsaW5l LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9tc2UvQXBw ZW5kUGlwZWxpbmUuY3BwCmluZGV4IGY1NWUwMGU4YTY1OGFlY2VjOWNjZGEyYzY4YmQwZjQxZDVl NzVjZmIuLmIxZmJhYzZjNzBiZTY3NzhkODUzMDExNWYwMDU1YjE4MzliNTc4NGUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9tc2UvQXBwZW5k UGlwZWxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9tc2UvQXBwZW5kUGlwZWxpbmUuY3BwCkBAIC0yMjUsMjkgKzIyNSwyNSBAQCBBcHBlbmRQ aXBlbGluZTo6QXBwZW5kUGlwZWxpbmUoUmVmPE1lZGlhU291cmNlQ2xpZW50R1N0cmVhbWVyTVNF PiBtZWRpYVNvdXJjZUNsaQogCiBBcHBlbmRQaXBlbGluZTo6fkFwcGVuZFBpcGVsaW5lKCkKIHsK KyAgICBHU1RfVFJBQ0UoIkRlc3RydWN0aW5nIEFwcGVuZFBpcGVsaW5lICglcCkiLCB0aGlzKTsK ICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogCiAgICAgc2V0QXBwZW5kU3RhdGUoQXBwZW5k U3RhdGU6OkludmFsaWQpOwogICAgIC8vIEZvcmdldCBhbGwgcGVuZGluZyB0YXNrcyBhbmQgdW5i bG9jayB0aGUgc3RyZWFtaW5nIHRocmVhZCBpZiBpdCB3YXMgYmxvY2tlZC4KICAgICBtX3Rhc2tR dWV1ZS5zdGFydEFib3J0aW5nKCk7CiAKLSAgICBHU1RfVFJBQ0UoIkRlc3Ryb3lpbmcgQXBwZW5k UGlwZWxpbmUgKCVwKSIsIHRoaXMpOwotCi0gICAgLy8gRklYTUU6IE1heWJlIG5vdGlmeSBhcHBl bmRDb21wbGV0ZSBoZXJlPworICAgIC8vIERpc2Nvbm5lY3QgYWxsIHN5bmNocm9ub3VzIGV2ZW50 IGhhbmRsZXJzIGFuZCBwcm9iZXMgc3VzY2VwdGlibGUgb2YgZmlyaW5nIGZyb20gdGhlIG1haW4g dGhyZWFkCisgICAgLy8gd2hlbiBjaGFuZ2luZyB0aGUgcGlwZWxpbmUgc3RhdGUuCiAKICAgICBp ZiAobV9waXBlbGluZSkgewogICAgICAgICBBU1NFUlQobV9idXMpOwogICAgICAgICBnX3NpZ25h bF9oYW5kbGVyc19kaXNjb25uZWN0X2J5X2RhdGEobV9idXMuZ2V0KCksIHRoaXMpOwogICAgICAg ICBnc3RfYnVzX2Rpc2FibGVfc3luY19tZXNzYWdlX2VtaXNzaW9uKG1fYnVzLmdldCgpKTsKICAg ICAgICAgZ3N0X2J1c19yZW1vdmVfc2lnbmFsX3dhdGNoKG1fYnVzLmdldCgpKTsKLSAgICAgICAg Z3N0X2VsZW1lbnRfc2V0X3N0YXRlKG1fcGlwZWxpbmUuZ2V0KCksIEdTVF9TVEFURV9OVUxMKTsK LSAgICAgICAgbV9waXBlbGluZSA9IG51bGxwdHI7CiAgICAgfQogCi0gICAgaWYgKG1fYXBwc3Jj KSB7CisgICAgaWYgKG1fYXBwc3JjKQogICAgICAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25u ZWN0X2J5X2RhdGEobV9hcHBzcmMuZ2V0KCksIHRoaXMpOwotICAgICAgICBtX2FwcHNyYyA9IG51 bGxwdHI7Ci0gICAgfQogCiAgICAgaWYgKG1fZGVtdXgpIHsKICNpZiAhTE9HX0RJU0FCTEVECkBA IC0yNTYsNyArMjUyLDYgQEAgQXBwZW5kUGlwZWxpbmU6On5BcHBlbmRQaXBlbGluZSgpCiAjZW5k aWYKIAogICAgICAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X2J5X2RhdGEobV9kZW11 eC5nZXQoKSwgdGhpcyk7Ci0gICAgICAgIG1fZGVtdXggPSBudWxscHRyOwogICAgIH0KIAogICAg IGlmIChtX2FwcHNpbmspIHsKQEAgLTI3MSwxMiArMjY2LDEyIEBAIEFwcGVuZFBpcGVsaW5lOjp+ QXBwZW5kUGlwZWxpbmUoKQogI2lmIEVOQUJMRShFTkNSWVBURURfTUVESUEpCiAgICAgICAgIGdz dF9wYWRfcmVtb3ZlX3Byb2JlKGFwcHNpbmtQYWQuZ2V0KCksIG1fYXBwc2lua1BhZEV2ZW50UHJv YmVJbmZvcm1hdGlvbi5wcm9iZUlkKTsKICNlbmRpZgotICAgICAgICBtX2FwcHNpbmsgPSBudWxs cHRyOwogICAgIH0KIAotICAgIG1fYXBwc2lua0NhcHMgPSBudWxscHRyOwotICAgIG1fZGVtdXhl clNyY1BhZENhcHMgPSBudWxscHRyOwotfTsKKyAgICAvLyBXZSBjYW4gdGVhciBkb3duIHRoZSBw aXBlbGluZSBzYWZlbHkgbm93LgorICAgIGlmIChtX3BpcGVsaW5lKQorICAgICAgICBnc3RfZWxl bWVudF9zZXRfc3RhdGUobV9waXBlbGluZS5nZXQoKSwgR1NUX1NUQVRFX05VTEwpOworfQogCiBH c3RQYWRQcm9iZVJldHVybiBBcHBlbmRQaXBlbGluZTo6YXBwc3JjRW5kT2ZBcHBlbmRDaGVja2Vy UHJvYmUoR3N0UGFkUHJvYmVJbmZvKiBwYWRQcm9iZUluZm8pCiB7CkBAIC0yOTksMjIgKzI5NCw2 IEBAIEdzdFBhZFByb2JlUmV0dXJuIEFwcGVuZFBpcGVsaW5lOjphcHBzcmNFbmRPZkFwcGVuZENo ZWNrZXJQcm9iZShHc3RQYWRQcm9iZUluZm8qCiAgICAgcmV0dXJuIEdTVF9QQURfUFJPQkVfRFJP UDsKIH0KIAotdm9pZCBBcHBlbmRQaXBlbGluZTo6Y2xlYXJQbGF5ZXJQcml2YXRlKCkKLXsKLSAg ICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwotICAgIEdTVF9ERUJVRygiY2xlYW5pbmcgcHJpdmF0 ZSBwbGF5ZXIiKTsKLQotICAgIC8vIE1ha2Ugc3VyZSB0aGF0IEFwcGVuZFBpcGVsaW5lIHdvbid0 IHByb2Nlc3MgbW9yZSBkYXRhIGZyb20gbm93IG9uIGFuZAotICAgIC8vIGluc3RydWN0IGhhbmRs ZU5ld1NhbXBsZSB0byBhYm9ydCBpdHNlbGYgZnJvbSBub3cgb24gYXMgd2VsbC4KLSAgICBzZXRB cHBlbmRTdGF0ZShBcHBlbmRTdGF0ZTo6SW52YWxpZCk7Ci0gICAgbV90YXNrUXVldWUuc3RhcnRB Ym9ydGluZygpOwotCi0gICAgLy8gQW5kIG5vdyB0aGF0IG5vIGhhbmRsZU5ld1NhbXBsZSBvcGVy YXRpb25zIHdpbGwgcmVtYWluIHN0YWxsZWQgd2FpdGluZwotICAgIC8vIGZvciB0aGUgbWFpbiB0 aHJlYWQsIHN0b3AgdGhlIHBpcGVsaW5lLgotICAgIGlmIChtX3BpcGVsaW5lKQotICAgICAgICBn c3RfZWxlbWVudF9zZXRfc3RhdGUobV9waXBlbGluZS5nZXQoKSwgR1NUX1NUQVRFX05VTEwpOwot fQotCiB2b2lkIEFwcGVuZFBpcGVsaW5lOjpoYW5kbGVOZWVkQ29udGV4dFN5bmNNZXNzYWdlKEdz dE1lc3NhZ2UqIG1lc3NhZ2UpCiB7CiAgICAgY29uc3QgZ2NoYXIqIGNvbnRleHRUeXBlID0gbnVs bHB0cjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9tc2UvQXBwZW5kUGlwZWxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9tc2UvQXBwZW5kUGlwZWxpbmUuaAppbmRleCAzYWQ0ZDM0NDU4OWJmOGI3 OTRlNGE0YTljNmM1ZDBlNTZhZjNiOGYxLi44NzFiNDM2ZWEwMDFkNGE0NmY0YTZjMmE1YjkxYzBm MTc2MDE4ZjczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvbXNlL0FwcGVuZFBpcGVsaW5lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL21zZS9BcHBlbmRQaXBlbGluZS5oCkBAIC01MCw3ICs1MCw2 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5BcHBlbmRQaXBlbGluZSgpOwogCiAgICAgR3N0Rmxv d1JldHVybiBwdXNoTmV3QnVmZmVyKEdzdEJ1ZmZlciopOwotICAgIHZvaWQgY2xlYXJQbGF5ZXJQ cml2YXRlKCk7CiAgICAgdm9pZCBhYm9ydCgpOwogICAgIFJlZjxTb3VyY2VCdWZmZXJQcml2YXRl R1N0cmVhbWVyPiBzb3VyY2VCdWZmZXJQcml2YXRlKCkgeyByZXR1cm4gbV9zb3VyY2VCdWZmZXJQ cml2YXRlLmdldCgpOyB9CiAgICAgR3N0Q2FwcyogYXBwc2lua0NhcHMoKSB7IHJldHVybiBtX2Fw cHNpbmtDYXBzLmdldCgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvbXNlL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck1TRS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvbXNlL01lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lck1TRS5jcHAKaW5kZXggODAzODFmMzUxNDllYWFjYTM5YjVhMjIw NjkyOTczNmM2MzIzZTkwNC4uYjg2YjQ2ODM2NzU5NTUyNTI1ZmM5YWFiOGRkNjNhOTc1OGFkNDYw ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L21zZS9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJNU0UuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9tc2UvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyTVNFLmNwcApAQCAtOTcsOCArOTcsMTMgQEAgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyTVNFOjp+TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFKCkKIHsKICAgICBHU1RfVFJB Q0UoImRlc3Ryb3lpbmcgdGhlIHBsYXllciAoJXApIiwgdGhpcyk7CiAKKyAgICAvLyBDbGVhciB0 aGUgQXBwZW5kUGlwZWxpbmUgbWFwLiBUaGlzIHNob3VsZCBjYXVzZSB0aGUgZGVzdHJ1Y3Rpb24g b2YgYWxsIHRoZSBBcHBlbmRQaXBlbGluZSdzIHNpbmNlIHRoZXJlIHNob3VsZAorICAgIC8vIGJl IG5vIGFsaXZlIHJlZmVyZW5jZXMgYXQgdGhpcyBwb2ludC4KKyNpZm5kZWYgTkRFQlVHCiAgICAg Zm9yIChhdXRvIGl0ZXJhdG9yIDogbV9hcHBlbmRQaXBlbGluZXNNYXApCi0gICAgICAgIGl0ZXJh dG9yLnZhbHVlLT5jbGVhclBsYXllclByaXZhdGUoKTsKKyAgICAgICAgQVNTRVJUKGl0ZXJhdG9y LnZhbHVlLT5oYXNPbmVSZWYoKSk7CisjZW5kaWYKKyAgICBtX2FwcGVuZFBpcGVsaW5lc01hcC5j bGVhcigpOwogCiAgICAgaWYgKG1fc291cmNlKSB7CiAgICAgICAgIHdlYktpdE1lZGlhU3JjU2V0 TWVkaWFQbGF5ZXJQcml2YXRlKFdFQktJVF9NRURJQV9TUkMobV9zb3VyY2UuZ2V0KCkpLCBudWxs cHRyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9tc2UvTWVkaWFTb3VyY2VDbGllbnRHU3RyZWFtZXJNU0UuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL21zZS9NZWRpYVNvdXJjZUNsaWVudEdTdHJl YW1lck1TRS5jcHAKaW5kZXggYTNiN2JmZGVlYWQyMTZkYzAwMDA3N2Q2MjE0MTAxZjQ2NjY0ZjRj Ni4uMzhiZGQ2YzI0MTM4YzkzNDRhYzc4NTU3OWEwMjI0YWNmZmE1YTlmYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL21zZS9NZWRpYVNvdXJj ZUNsaWVudEdTdHJlYW1lck1TRS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL21zZS9NZWRpYVNvdXJjZUNsaWVudEdTdHJlYW1lck1TRS5jcHAKQEAg LTE2OSwxMyArMTY5LDEwIEBAIHZvaWQgTWVkaWFTb3VyY2VDbGllbnRHU3RyZWFtZXJNU0U6OnJl bW92ZWRGcm9tTWVkaWFTb3VyY2UoUmVmUHRyPFNvdXJjZUJ1ZmZlclByCiAKICAgICBBU1NFUlQo bV9wbGF5ZXJQcml2YXRlLT5tX3BsYXliYWNrUGlwZWxpbmUpOwogCi0gICAgUmVmUHRyPEFwcGVu ZFBpcGVsaW5lPiBhcHBlbmRQaXBlbGluZSA9IG1fcGxheWVyUHJpdmF0ZS0+bV9hcHBlbmRQaXBl bGluZXNNYXAuZ2V0KHNvdXJjZUJ1ZmZlclByaXZhdGUpOwotCi0gICAgQVNTRVJUKGFwcGVuZFBp cGVsaW5lKTsKLQotICAgIGFwcGVuZFBpcGVsaW5lLT5jbGVhclBsYXllclByaXZhdGUoKTsKKyAg ICAvLyBSZW1vdmUgdGhlIEFwcGVuZFBpcGVsaW5lIGZyb20gdGhlIG1hcC4gVGhpcyBzaG91bGQg Y2F1c2UgaXRzIGRlc3RydWN0aW9uIHNpbmNlIHRoZXJlIHNob3VsZCBiZSBubyBhbGl2ZQorICAg IC8vIHJlZmVyZW5jZXMgYXQgdGhpcyBwb2ludC4KKyAgICBBU1NFUlQobV9wbGF5ZXJQcml2YXRl LT5tX2FwcGVuZFBpcGVsaW5lc01hcC5nZXQoc291cmNlQnVmZmVyUHJpdmF0ZSktPmhhc09uZVJl ZigpKTsKICAgICBtX3BsYXllclByaXZhdGUtPm1fYXBwZW5kUGlwZWxpbmVzTWFwLnJlbW92ZShz b3VyY2VCdWZmZXJQcml2YXRlKTsKLSAgICAvLyBBcHBlbmRQaXBlbGluZSBkZXN0cnVjdG9yIHdp bGwgdGFrZSBjYXJlIG9mIGNsZWFuaW5nIHVwIHdoZW4gYXBwcm9wcmlhdGUuCiAKICAgICBtX3Bs YXllclByaXZhdGUtPm1fcGxheWJhY2tQaXBlbGluZS0+cmVtb3ZlU291cmNlQnVmZmVyKHNvdXJj ZUJ1ZmZlclByaXZhdGUpOwogfQo=