125077 2013-12-02 08:56:06 -0800 simplify MediaPlayerPrivateGStreamerBase::createVideoSink() 2013-12-02 11:52:49 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 vjaquez vjaquez commit-queue eric.carlson glenn gustavo jer.noble menard mrobinson pnormand oldest_to_newest 955395 0 vjaquez 2013-12-02 08:56:06 -0800 * Remove the unused parameter * Remove the GStreamer 0.10.22 run-time validation, since we are using GStreamer 1.0 officially. * Remove the creation of a spurious Bin for the video sink, since either the fpssink or the webkitsink are valid elements. 955396 1 218176 vjaquez 2013-12-02 09:02:39 -0800 Created attachment 218176 Patch 955398 2 218176 pnormand 2013-12-02 09:06:39 -0800 Comment on attachment 218176 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=218176&action=review Noice clean-up! > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:495 > + m_videoSinkBin = m_webkitVideoSink; Perhaps this member can be renamed and/or dropped? 955437 3 218184 vjaquez 2013-12-02 10:36:41 -0800 Created attachment 218184 Patch 955500 4 218184 commit-queue 2013-12-02 11:52:47 -0800 Comment on attachment 218184 Patch Clearing flags on attachment: 218184 Committed r159945: <http://trac.webkit.org/changeset/159945> 955501 5 commit-queue 2013-12-02 11:52:49 -0800 All reviewed patches have been landed. Closing bug. 218176 2013-12-02 09:02:39 -0800 2013-12-02 10:36:36 -0800 Patch bug-125077-20131202170237.patch text/plain 6305 vjaquez U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5OTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzRjYjk4OGI3MGJhZTQ0 MjZmMjRlZDRhNjViZDAxNDFjMDE0ZGY2OS4uMWEzZDc3YTIwODM2MTM3NzI0MTAzOGUxZmM1ZTMz MTkxMWM3OTA1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTEyLTAyICBWw61j dG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2amFxdWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAg c2ltcGxpZnkgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6Y3JlYXRlVmlkZW9TaW5r KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTA3 NworCisgICAgICAgIFJlbW92ZSB0aGUgbWV0aG9kJ3MgdW51c2VkIHBhcmFtZXRlci4KKyAgICAg ICAgUmVtb3ZlIHRoZSBHU3RyZWFtZXIgMC4xMC4yMiBydW4tdGltZSB2YWxpZGF0aW9uLCBzaW5j ZSB3ZSBhcmUgdXNpbmcKKyAgICAgICAgR1N0cmVhbWVyIDEuMCBvZmZpY2lhbGx5LgorICAgICAg ICBSZW1vdmUgdGhlIGNyZWF0aW9uIG9mIGEgc3B1cmlvdXMgQmluIGZvciB0aGUgdmlkZW8gc2lu aywgc2luY2UKKyAgICAgICAgZWl0aGVyIHRoZSBmcHNzaW5rIG9yIHRoZSB3ZWJraXRzaW5rIGFy ZSB2YWxpZCBlbGVtZW50cy4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZXMuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6Y3Jl YXRlR1NUUGxheUJpbik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6Y3JlYXRlVmlkZW9TaW5rKToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy QmFzZS5oOgorCiAyMDEzLTEyLTAyICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5j b20+CiAKICAgICAgICAgQVg6IENyYXNoIGF0IFdlYkNvcmU6OmNvbW1vblRyZWVTY29wZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCBiYTMx YzYzM2ZlYTI0ZmI4M2IxNjI4Y2JlZDc5NmFhYTJjOTY0NTk0Li5hODZlOWZkMzk1MzBmYjM1ODQ2 ZDYyMjMxYTdlZmMyYTFlZDIwOTY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyLmNwcApAQCAtMTg5MCw3ICsxODkwLDcgQEAgdm9pZCBNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OmNyZWF0ZUdTVFBsYXlCaW4oKQogICAgIH0KICNlbmRpZgogCi0g ICAgY3JlYXRlVmlkZW9TaW5rKG1fcGxheUJpbi5nZXQoKSk7CisgICAgY3JlYXRlVmlkZW9TaW5r KCk7CiAKICAgICBnX29iamVjdF9zZXQobV9wbGF5QmluLmdldCgpLCAidmlkZW8tc2luayIsIG1f dmlkZW9TaW5rQmluLmdldCgpLCBudWxscHRyKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ckJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwCmluZGV4IGE5N2I0ZmI3ZmQ3ODQwNWI5 MjViODk2N2I5MTgxOTJiODdlZDYzYTYuLjllNGI4YTIwMzk3NzM2YmY2NDYzNTQwOGFiMThmZTJh NTRiODMzNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dz dHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyQmFzZS5jcHAKQEAgLTQ2Miw1NyArNDYyLDM5IEBAIEdSZWZQdHI8R3N0Q2Fwcz4gTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6Y3VycmVudFZpZGVvU2lua0NhcHMoKSBjb25z dAogICAgIHJldHVybiBjdXJyZW50Q2FwczsKIH0KIAotdm9pZCBNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXJCYXNlOjpjcmVhdGVWaWRlb1NpbmsoR3N0RWxlbWVudCogcGlwZWxpbmUpCit2b2lk IE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmNyZWF0ZVZpZGVvU2luaygpCiB7CiAg ICAgaWYgKCFpbml0aWFsaXplR1N0cmVhbWVyKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIFVO VVNFRF9QQVJBTShwaXBlbGluZSk7CiAgICAgbV93ZWJraXRWaWRlb1NpbmsgPSB3ZWJraXRWaWRl b1NpbmtOZXcoKTsKIAogICAgIG1fcmVwYWludEhhbmRsZXIgPSBnX3NpZ25hbF9jb25uZWN0KG1f d2Via2l0VmlkZW9TaW5rLmdldCgpLCAicmVwYWludC1yZXF1ZXN0ZWQiLCBHX0NBTExCQUNLKG1l ZGlhUGxheWVyUHJpdmF0ZVJlcGFpbnRDYWxsYmFjayksIHRoaXMpOwogCi0gICAgbV92aWRlb1Np bmtCaW4gPSBnc3RfYmluX25ldyhudWxscHRyKTsKLQotICAgIEdzdEVsZW1lbnQqIHZpZGVvU2lu ayA9IG51bGxwdHI7CiAgICAgbV9mcHNTaW5rID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtlKCJm cHNkaXNwbGF5c2luayIsICJzaW5rIik7CiAgICAgaWYgKG1fZnBzU2luaykgewotICAgICAgICAv LyBUaGUgdmVyYm9zZSBwcm9wZXJ0eSBoYXMgYmVlbiBhZGRlZCBpbiAtYmFkIDAuMTAuMjIuIE1h a2luZwotICAgICAgICAvLyB0aGlzIHdob2xlIGNvZGUgZGVwZW5kIG9uIGl0IGJlY2F1c2Ugd2Ug ZG9uJ3Qgd2FudAotICAgICAgICAvLyBmcHNkaXBsYXlzaW5rIHRvIHNwaXQgZGF0YSBvbiBzdGRv dXQuCi0gICAgICAgIEdzdEVsZW1lbnRGYWN0b3J5KiBmYWN0b3J5ID0gR1NUX0VMRU1FTlRfRkFD VE9SWShHU1RfRUxFTUVOVF9HRVRfQ0xBU1MobV9mcHNTaW5rKS0+ZWxlbWVudGZhY3RvcnkpOwot ICAgICAgICBpZiAoZ3N0X3BsdWdpbl9mZWF0dXJlX2NoZWNrX3ZlcnNpb24oR1NUX1BMVUdJTl9G RUFUVVJFKGZhY3RvcnkpLCAwLCAxMCwgMjIpKSB7Ci0gICAgICAgICAgICBnX29iamVjdF9zZXQo bV9mcHNTaW5rLCAic2lsZW50IiwgVFJVRSAsIG51bGxwdHIpOwotCi0gICAgICAgICAgICAvLyBU dXJuIG9mZiB0ZXh0IG92ZXJsYXkgdW5sZXNzIGxvZ2dpbmcgaXMgZW5hYmxlZC4KKyAgICAgICAg Z19vYmplY3Rfc2V0KG1fZnBzU2luaywgInNpbGVudCIsIFRSVUUgLCBudWxscHRyKTsKKworICAg ICAgICAvLyBUdXJuIG9mZiB0ZXh0IG92ZXJsYXkgdW5sZXNzIGxvZ2dpbmcgaXMgZW5hYmxlZC4K ICNpZiBMT0dfRElTQUJMRUQKLSAgICAgICAgICAgIGdfb2JqZWN0X3NldChtX2Zwc1NpbmssICJ0 ZXh0LW92ZXJsYXkiLCBGQUxTRSAsIG51bGxwdHIpOworICAgICAgICBnX29iamVjdF9zZXQobV9m cHNTaW5rLCAidGV4dC1vdmVybGF5IiwgRkFMU0UgLCBudWxscHRyKTsKICNlbHNlCi0gICAgICAg ICAgICBXVEZMb2dDaGFubmVsKiBjaGFubmVsID0gbG9nQ2hhbm5lbEJ5TmFtZSgiTWVkaWEiKTsK LSAgICAgICAgICAgIGlmIChjaGFubmVsLT5zdGF0ZSAhPSBXVEZMb2dDaGFubmVsT24pCi0gICAg ICAgICAgICAgICAgZ19vYmplY3Rfc2V0KG1fZnBzU2luaywgInRleHQtb3ZlcmxheSIsIEZBTFNF ICwgbnVsbHB0cik7CisgICAgICAgIFdURkxvZ0NoYW5uZWwqIGNoYW5uZWwgPSBsb2dDaGFubmVs QnlOYW1lKCJNZWRpYSIpOworICAgICAgICBpZiAoY2hhbm5lbC0+c3RhdGUgIT0gV1RGTG9nQ2hh bm5lbE9uKQorICAgICAgICAgICAgZ19vYmplY3Rfc2V0KG1fZnBzU2luaywgInRleHQtb3Zlcmxh eSIsIEZBTFNFICwgbnVsbHB0cik7CiAjZW5kaWYgLy8gTE9HX0RJU0FCTEVECiAKLSAgICAgICAg ICAgIGlmIChnX29iamVjdF9jbGFzc19maW5kX3Byb3BlcnR5KEdfT0JKRUNUX0dFVF9DTEFTUyht X2Zwc1NpbmspLCAidmlkZW8tc2luayIpKSB7Ci0gICAgICAgICAgICAgICAgZ19vYmplY3Rfc2V0 KG1fZnBzU2luaywgInZpZGVvLXNpbmsiLCBtX3dlYmtpdFZpZGVvU2luay5nZXQoKSwgbnVsbHB0 cik7Ci0gICAgICAgICAgICAgICAgZ3N0X2Jpbl9hZGQoR1NUX0JJTihtX3ZpZGVvU2lua0Jpbi5n ZXQoKSksIG1fZnBzU2luayk7Ci0gICAgICAgICAgICAgICAgdmlkZW9TaW5rID0gbV9mcHNTaW5r OwotICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgICAgbV9mcHNTaW5rID0gbnVsbHB0 cjsKKyAgICAgICAgaWYgKGdfb2JqZWN0X2NsYXNzX2ZpbmRfcHJvcGVydHkoR19PQkpFQ1RfR0VU X0NMQVNTKG1fZnBzU2luayksICJ2aWRlby1zaW5rIikpIHsKKyAgICAgICAgICAgIGdfb2JqZWN0 X3NldChtX2Zwc1NpbmssICJ2aWRlby1zaW5rIiwgbV93ZWJraXRWaWRlb1NpbmsuZ2V0KCksIG51 bGxwdHIpOworICAgICAgICAgICAgbV92aWRlb1NpbmtCaW4gPSBtX2Zwc1Npbms7CiAgICAgICAg IH0gZWxzZQogICAgICAgICAgICAgbV9mcHNTaW5rID0gbnVsbHB0cjsKICAgICB9CiAKLSAgICBp ZiAoIW1fZnBzU2luaykgewotICAgICAgICBnc3RfYmluX2FkZChHU1RfQklOKG1fdmlkZW9TaW5r QmluLmdldCgpKSwgbV93ZWJraXRWaWRlb1NpbmsuZ2V0KCkpOwotICAgICAgICB2aWRlb1Npbmsg PSBtX3dlYmtpdFZpZGVvU2luay5nZXQoKTsKLSAgICB9Ci0KLSAgICBBU1NFUlQodmlkZW9TaW5r KTsKKyAgICBpZiAoIW1fZnBzU2luaykKKyAgICAgICAgbV92aWRlb1NpbmtCaW4gPSBtX3dlYmtp dFZpZGVvU2luazsKIAotICAgIEdzdEVsZW1lbnQqIGZpcnN0Q2hpbGQgPSB2aWRlb1Npbms7Ci0g ICAgR1JlZlB0cjxHc3RQYWQ+IHBhZCA9IGFkb3B0R1JlZihnc3RfZWxlbWVudF9nZXRfc3RhdGlj X3BhZChmaXJzdENoaWxkLCAic2luayIpKTsKLSAgICBnc3RfZWxlbWVudF9hZGRfcGFkKG1fdmlk ZW9TaW5rQmluLmdldCgpLCBnc3RfZ2hvc3RfcGFkX25ldygic2luayIsIHBhZC5nZXQoKSkpOwor ICAgIEFTU0VSVChtX3ZpZGVvU2lua0Jpbi5nZXQoKSk7CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyQmFzZTo6c2V0U3RyZWFtVm9sdW1lRWxlbWVudChHc3RTdHJlYW1Wb2x1 bWUqIHZvbHVtZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyQmFzZS5oCmluZGV4IDZmMDA4MjExYmY1ZjFkMWJmOTExNGY3MzliMDdmYzkxMGIzYTkwOGUu LjFiNmE3MjlhYzdlMzc1MTllYzY5ZGQyNThkYzU4NzZhODZhOTdkOGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXJCYXNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuaApAQCAtMTAzLDcgKzEw Myw3IEBAIHB1YmxpYzoKIAogcHJvdGVjdGVkOgogICAgIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lckJhc2UoTWVkaWFQbGF5ZXIqKTsKLSAgICB2b2lkIGNyZWF0ZVZpZGVvU2luayhHc3RFbGVt ZW50KiBwaXBlbGluZSk7CisgICAgdm9pZCBjcmVhdGVWaWRlb1NpbmsoKTsKICAgICB2b2lkIHNl dFN0cmVhbVZvbHVtZUVsZW1lbnQoR3N0U3RyZWFtVm9sdW1lKik7CiAgICAgdmlydHVhbCBHc3RF bGVtZW50KiBhdWRpb1NpbmsoKSBjb25zdCB7IHJldHVybiAwOyB9CiAgICAgR1JlZlB0cjxHc3RD YXBzPiBjdXJyZW50VmlkZW9TaW5rQ2FwcygpIGNvbnN0Owo= 218184 2013-12-02 10:36:41 -0800 2013-12-02 11:52:47 -0800 Patch bug-125077-20131202183639.patch text/plain 7907 vjaquez U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5OTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzRjYjk4OGI3MGJhZTQ0 MjZmMjRlZDRhNjViZDAxNDFjMDE0ZGY2OS4uNThlM2QwMGJiNjI5MGFlNThhYzdlYzAwYzYwMTI4 ZmFlMmE0ZWI1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTEyLTAyICBWw61j dG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2amFxdWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAg U2ltcGxpZnkgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6Y3JlYXRlVmlkZW9TaW5r KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTA3 NworCisgICAgICAgIFJlbW92ZSB0aGUgbWV0aG9kJ3MgdW51c2VkIHBhcmFtZXRlci4KKyAgICAg ICAgUmVtb3ZlIHRoZSBHU3RyZWFtZXIgMC4xMC4yMiBydW4tdGltZSB2YWxpZGF0aW9uLCBzaW5j ZSB3ZSBhcmUgdXNpbmcKKyAgICAgICAgR1N0cmVhbWVyIDEuMCBvZmZpY2lhbGx5LgorICAgICAg ICBSZW1vdmUgdGhlIGNyZWF0aW9uIG9mIGEgc3B1cmlvdXMgQmluIGZvciB0aGUgdmlkZW8gc2lu aywgc2luY2UKKyAgICAgICAgZWl0aGVyIHRoZSBmcHNzaW5rIG9yIHRoZSB3ZWJraXRzaW5rIGFy ZSB2YWxpZCBzaW5rIGVsZW1lbnRzLgorICAgICAgICBDaGFuZ2UgZnBzaW5rIHRvIGEgR1JlZlB0 ci4KKworICAgICAgICBOb3csIGNyZWF0ZVZpZGVvU2luaygpIHJldHVybnMgYSBzaW1wbGUgcG9p bnRlciB0byB0aGUgY3JlYXRlZCBzaW5rCisgICAgICAgIGVsZW1lbnQuCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhh dmlvciBjaGFuZ2VzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXI6OmNyZWF0ZUdTVFBsYXlCaW4pOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmNy ZWF0ZVZpZGVvU2luayk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXJCYXNlOjpkZWNvZGVkRnJhbWVDb3VudCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpkcm9wcGVkRnJhbWVDb3VudCk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJh c2UuaDoKKwogMjAxMy0xMi0wMiAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29t PgogCiAgICAgICAgIEFYOiBDcmFzaCBhdCBXZWJDb3JlOjpjb21tb25UcmVlU2NvcGUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKaW5kZXggYmEzMWM2 MzNmZWEyNGZiODNiMTYyOGNiZWQ3OTZhYWEyYzk2NDU5NC4uMDlkOTNiNjIxZGUxNmYyMmRjNmJi OGMxOTJjM2U1MjE4ZjIxMTM1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lci5jcHAKQEAgLTE4OTAsOSArMTg5MCw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyOjpjcmVhdGVHU1RQbGF5QmluKCkKICAgICB9CiAjZW5kaWYKIAotICAg IGNyZWF0ZVZpZGVvU2luayhtX3BsYXlCaW4uZ2V0KCkpOwotCi0gICAgZ19vYmplY3Rfc2V0KG1f cGxheUJpbi5nZXQoKSwgInZpZGVvLXNpbmsiLCBtX3ZpZGVvU2lua0Jpbi5nZXQoKSwgbnVsbHB0 cik7CisgICAgZ19vYmplY3Rfc2V0KG1fcGxheUJpbi5nZXQoKSwgInZpZGVvLXNpbmsiLCBjcmVh dGVWaWRlb1NpbmsoKSwgbnVsbHB0cik7CiAKICAgICBHUmVmUHRyPEdzdFBhZD4gdmlkZW9TaW5r UGFkID0gYWRvcHRHUmVmKGdzdF9lbGVtZW50X2dldF9zdGF0aWNfcGFkKG1fd2Via2l0VmlkZW9T aW5rLmdldCgpLCAic2luayIpKTsKICAgICBpZiAodmlkZW9TaW5rUGFkKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lckJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwCmluZGV4IGE5N2I0 ZmI3ZmQ3ODQwNWI5MjViODk2N2I5MTgxOTJiODdlZDYzYTYuLjk2ZjExZTY2ZDFkYTU4NWFjYjBk YWJlNjFiZGQ5MWU0ZWI5YTFiODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHAKQEAgLTQ2Miw1NyArNDYyLDQxIEBAIEdSZWZQdHI8 R3N0Q2Fwcz4gTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6Y3VycmVudFZpZGVvU2lu a0NhcHMoKSBjb25zdAogICAgIHJldHVybiBjdXJyZW50Q2FwczsKIH0KIAotdm9pZCBNZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpjcmVhdGVWaWRlb1NpbmsoR3N0RWxlbWVudCogcGlw ZWxpbmUpCitHc3RFbGVtZW50KiBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpjcmVh dGVWaWRlb1NpbmsoKQogewotICAgIGlmICghaW5pdGlhbGl6ZUdTdHJlYW1lcigpKQotICAgICAg ICByZXR1cm47CisgICAgQVNTRVJUKGluaXRpYWxpemVHU3RyZWFtZXIoKSk7CiAKLSAgICBVTlVT RURfUEFSQU0ocGlwZWxpbmUpOworICAgIEdzdEVsZW1lbnQqIHZpZGVvU2luayA9IG51bGxwdHI7 CiAgICAgbV93ZWJraXRWaWRlb1NpbmsgPSB3ZWJraXRWaWRlb1NpbmtOZXcoKTsKIAogICAgIG1f cmVwYWludEhhbmRsZXIgPSBnX3NpZ25hbF9jb25uZWN0KG1fd2Via2l0VmlkZW9TaW5rLmdldCgp LCAicmVwYWludC1yZXF1ZXN0ZWQiLCBHX0NBTExCQUNLKG1lZGlhUGxheWVyUHJpdmF0ZVJlcGFp bnRDYWxsYmFjayksIHRoaXMpOwogCi0gICAgbV92aWRlb1NpbmtCaW4gPSBnc3RfYmluX25ldyhu dWxscHRyKTsKLQotICAgIEdzdEVsZW1lbnQqIHZpZGVvU2luayA9IG51bGxwdHI7CiAgICAgbV9m cHNTaW5rID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtlKCJmcHNkaXNwbGF5c2luayIsICJzaW5r Iik7CiAgICAgaWYgKG1fZnBzU2luaykgewotICAgICAgICAvLyBUaGUgdmVyYm9zZSBwcm9wZXJ0 eSBoYXMgYmVlbiBhZGRlZCBpbiAtYmFkIDAuMTAuMjIuIE1ha2luZwotICAgICAgICAvLyB0aGlz IHdob2xlIGNvZGUgZGVwZW5kIG9uIGl0IGJlY2F1c2Ugd2UgZG9uJ3Qgd2FudAotICAgICAgICAv LyBmcHNkaXBsYXlzaW5rIHRvIHNwaXQgZGF0YSBvbiBzdGRvdXQuCi0gICAgICAgIEdzdEVsZW1l bnRGYWN0b3J5KiBmYWN0b3J5ID0gR1NUX0VMRU1FTlRfRkFDVE9SWShHU1RfRUxFTUVOVF9HRVRf Q0xBU1MobV9mcHNTaW5rKS0+ZWxlbWVudGZhY3RvcnkpOwotICAgICAgICBpZiAoZ3N0X3BsdWdp bl9mZWF0dXJlX2NoZWNrX3ZlcnNpb24oR1NUX1BMVUdJTl9GRUFUVVJFKGZhY3RvcnkpLCAwLCAx MCwgMjIpKSB7Ci0gICAgICAgICAgICBnX29iamVjdF9zZXQobV9mcHNTaW5rLCAic2lsZW50Iiwg VFJVRSAsIG51bGxwdHIpOwotCi0gICAgICAgICAgICAvLyBUdXJuIG9mZiB0ZXh0IG92ZXJsYXkg dW5sZXNzIGxvZ2dpbmcgaXMgZW5hYmxlZC4KKyAgICAgICAgZ19vYmplY3Rfc2V0KG1fZnBzU2lu ay5nZXQoKSwgInNpbGVudCIsIFRSVUUgLCBudWxscHRyKTsKKworICAgICAgICAvLyBUdXJuIG9m ZiB0ZXh0IG92ZXJsYXkgdW5sZXNzIGxvZ2dpbmcgaXMgZW5hYmxlZC4KICNpZiBMT0dfRElTQUJM RUQKLSAgICAgICAgICAgIGdfb2JqZWN0X3NldChtX2Zwc1NpbmssICJ0ZXh0LW92ZXJsYXkiLCBG QUxTRSAsIG51bGxwdHIpOworICAgICAgICBnX29iamVjdF9zZXQobV9mcHNTaW5rLmdldCgpLCAi dGV4dC1vdmVybGF5IiwgRkFMU0UgLCBudWxscHRyKTsKICNlbHNlCi0gICAgICAgICAgICBXVEZM b2dDaGFubmVsKiBjaGFubmVsID0gbG9nQ2hhbm5lbEJ5TmFtZSgiTWVkaWEiKTsKLSAgICAgICAg ICAgIGlmIChjaGFubmVsLT5zdGF0ZSAhPSBXVEZMb2dDaGFubmVsT24pCi0gICAgICAgICAgICAg ICAgZ19vYmplY3Rfc2V0KG1fZnBzU2luaywgInRleHQtb3ZlcmxheSIsIEZBTFNFICwgbnVsbHB0 cik7CisgICAgICAgIFdURkxvZ0NoYW5uZWwqIGNoYW5uZWwgPSBsb2dDaGFubmVsQnlOYW1lKCJN ZWRpYSIpOworICAgICAgICBpZiAoY2hhbm5lbC0+c3RhdGUgIT0gV1RGTG9nQ2hhbm5lbE9uKQor ICAgICAgICAgICAgZ19vYmplY3Rfc2V0KG1fZnBzU2luay5nZXQoKSwgInRleHQtb3ZlcmxheSIs IEZBTFNFICwgbnVsbHB0cik7CiAjZW5kaWYgLy8gTE9HX0RJU0FCTEVECiAKLSAgICAgICAgICAg IGlmIChnX29iamVjdF9jbGFzc19maW5kX3Byb3BlcnR5KEdfT0JKRUNUX0dFVF9DTEFTUyhtX2Zw c1NpbmspLCAidmlkZW8tc2luayIpKSB7Ci0gICAgICAgICAgICAgICAgZ19vYmplY3Rfc2V0KG1f ZnBzU2luaywgInZpZGVvLXNpbmsiLCBtX3dlYmtpdFZpZGVvU2luay5nZXQoKSwgbnVsbHB0cik7 Ci0gICAgICAgICAgICAgICAgZ3N0X2Jpbl9hZGQoR1NUX0JJTihtX3ZpZGVvU2lua0Jpbi5nZXQo KSksIG1fZnBzU2luayk7Ci0gICAgICAgICAgICAgICAgdmlkZW9TaW5rID0gbV9mcHNTaW5rOwot ICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgICAgbV9mcHNTaW5rID0gbnVsbHB0cjsK KyAgICAgICAgaWYgKGdfb2JqZWN0X2NsYXNzX2ZpbmRfcHJvcGVydHkoR19PQkpFQ1RfR0VUX0NM QVNTKG1fZnBzU2luay5nZXQoKSksICJ2aWRlby1zaW5rIikpIHsKKyAgICAgICAgICAgIGdfb2Jq ZWN0X3NldChtX2Zwc1NpbmsuZ2V0KCksICJ2aWRlby1zaW5rIiwgbV93ZWJraXRWaWRlb1Npbmsu Z2V0KCksIG51bGxwdHIpOworICAgICAgICAgICAgdmlkZW9TaW5rID0gbV9mcHNTaW5rLmdldCgp OwogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIG1fZnBzU2luayA9IG51bGxwdHI7CiAgICAg fQogCi0gICAgaWYgKCFtX2Zwc1NpbmspIHsKLSAgICAgICAgZ3N0X2Jpbl9hZGQoR1NUX0JJTiht X3ZpZGVvU2lua0Jpbi5nZXQoKSksIG1fd2Via2l0VmlkZW9TaW5rLmdldCgpKTsKKyAgICBpZiAo IW1fZnBzU2luaykKICAgICAgICAgdmlkZW9TaW5rID0gbV93ZWJraXRWaWRlb1NpbmsuZ2V0KCk7 Ci0gICAgfQogCiAgICAgQVNTRVJUKHZpZGVvU2luayk7CiAKLSAgICBHc3RFbGVtZW50KiBmaXJz dENoaWxkID0gdmlkZW9TaW5rOwotICAgIEdSZWZQdHI8R3N0UGFkPiBwYWQgPSBhZG9wdEdSZWYo Z3N0X2VsZW1lbnRfZ2V0X3N0YXRpY19wYWQoZmlyc3RDaGlsZCwgInNpbmsiKSk7Ci0gICAgZ3N0 X2VsZW1lbnRfYWRkX3BhZChtX3ZpZGVvU2lua0Jpbi5nZXQoKSwgZ3N0X2dob3N0X3BhZF9uZXco InNpbmsiLCBwYWQuZ2V0KCkpKTsKKyAgICByZXR1cm4gdmlkZW9TaW5rOwogfQogCiB2b2lkIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OnNldFN0cmVhbVZvbHVtZUVsZW1lbnQoR3N0 U3RyZWFtVm9sdW1lKiB2b2x1bWUpCkBAIC01MzksNyArNTIzLDcgQEAgdW5zaWduZWQgTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6ZGVjb2RlZEZyYW1lQ291bnQoKSBjb25zdAogewog ICAgIGd1aW50NjQgZGVjb2RlZEZyYW1lcyA9IDA7CiAgICAgaWYgKG1fZnBzU2luaykKLSAgICAg ICAgZ19vYmplY3RfZ2V0KG1fZnBzU2luaywgImZyYW1lcy1yZW5kZXJlZCIsICZkZWNvZGVkRnJh bWVzLCBOVUxMKTsKKyAgICAgICAgZ19vYmplY3RfZ2V0KG1fZnBzU2luay5nZXQoKSwgImZyYW1l cy1yZW5kZXJlZCIsICZkZWNvZGVkRnJhbWVzLCBOVUxMKTsKICAgICByZXR1cm4gc3RhdGljX2Nh c3Q8dW5zaWduZWQ+KGRlY29kZWRGcmFtZXMpOwogfQogCkBAIC01NDcsNyArNTMxLDcgQEAgdW5z aWduZWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6ZHJvcHBlZEZyYW1lQ291bnQo KSBjb25zdAogewogICAgIGd1aW50NjQgZnJhbWVzRHJvcHBlZCA9IDA7CiAgICAgaWYgKG1fZnBz U2luaykKLSAgICAgICAgZ19vYmplY3RfZ2V0KG1fZnBzU2luaywgImZyYW1lcy1kcm9wcGVkIiwg JmZyYW1lc0Ryb3BwZWQsIE5VTEwpOworICAgICAgICBnX29iamVjdF9nZXQobV9mcHNTaW5rLmdl dCgpLCAiZnJhbWVzLWRyb3BwZWQiLCAmZnJhbWVzRHJvcHBlZCwgTlVMTCk7CiAgICAgcmV0dXJu IHN0YXRpY19jYXN0PHVuc2lnbmVkPihmcmFtZXNEcm9wcGVkKTsKIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lckJhc2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dz dHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmgKaW5kZXggNmYwMDgyMTFi ZjVmMWQxYmY5MTE0ZjczOWIwN2ZjOTEwYjNhOTA4ZS4uNGUwYmNkMzIxM2RhMDMwOWU5YmJjNTg5 YmQ4ZmExMDZlOWI0ZTllMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyQmFzZS5oCkBAIC0xMDMsNyArMTAzLDcgQEAgcHVibGljOgogCiBwcm90ZWN0 ZWQ6CiAgICAgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZShNZWRpYVBsYXllciopOwot ICAgIHZvaWQgY3JlYXRlVmlkZW9TaW5rKEdzdEVsZW1lbnQqIHBpcGVsaW5lKTsKKyAgICBHc3RF bGVtZW50KiBjcmVhdGVWaWRlb1NpbmsoKTsKICAgICB2b2lkIHNldFN0cmVhbVZvbHVtZUVsZW1l bnQoR3N0U3RyZWFtVm9sdW1lKik7CiAgICAgdmlydHVhbCBHc3RFbGVtZW50KiBhdWRpb1Npbmso KSBjb25zdCB7IHJldHVybiAwOyB9CiAgICAgR1JlZlB0cjxHc3RDYXBzPiBjdXJyZW50VmlkZW9T aW5rQ2FwcygpIGNvbnN0OwpAQCAtMTExLDggKzExMSw3IEBAIHByb3RlY3RlZDoKICAgICBNZWRp YVBsYXllciogbV9wbGF5ZXI7CiAgICAgR1JlZlB0cjxHc3RTdHJlYW1Wb2x1bWU+IG1fdm9sdW1l RWxlbWVudDsKICAgICBHUmVmUHRyPEdzdEVsZW1lbnQ+IG1fd2Via2l0VmlkZW9TaW5rOwotICAg IEdSZWZQdHI8R3N0RWxlbWVudD4gbV92aWRlb1NpbmtCaW47Ci0gICAgR3N0RWxlbWVudCogbV9m cHNTaW5rOworICAgIEdSZWZQdHI8R3N0RWxlbWVudD4gbV9mcHNTaW5rOwogICAgIE1lZGlhUGxh eWVyOjpSZWFkeVN0YXRlIG1fcmVhZHlTdGF0ZTsKICAgICBNZWRpYVBsYXllcjo6TmV0d29ya1N0 YXRlIG1fbmV0d29ya1N0YXRlOwogICAgIEludFNpemUgbV9zaXplOwo=