35868 2010-03-08 08:07:10 -0800 [GStreamer] player code cleanups 2010-03-09 01:03:20 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 pnormand webkit-unassigned oldest_to_newest 197172 0 pnormand 2010-03-08 08:07:10 -0800 The GOwnPtrGtk.h file should be moved to gstreamer/. The SoupURI stuff inside is no longer needed either. I think we should also use "standard" types for the private variables of the player, like float instead of gfloat, wherever possible 197189 1 50228 pnormand 2010-03-08 09:06:57 -0800 Created attachment 50228 proposed patch 197291 2 50228 gustavo 2010-03-08 13:37:07 -0800 Comment on attachment 50228 proposed patch I like it, but if you can land the GOwnPtr changes separate from the member variables ones, I'd be happy. 197493 3 pnormand 2010-03-09 01:03:20 -0800 Landed in r55716 and r55717 50228 2010-03-08 09:06:57 -0800 2010-03-08 13:37:06 -0800 proposed patch proposed-patch.patch text/plain 12728 pnormand RnJvbSAwODgzZjllYTUyNzcwNTc4NDdhZDE4NWRkYWIzMDU1MTVhZGExODRmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBNb24sIDggTWFyIDIwMTAgMTc6NDM6NDIgKzAxMDAKU3ViamVjdDogW1BBVENIXSBw cm9wb3NlZCBwYXRjaAoKLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB8ICAgMjkgKysrKysrKysrKysrKysrKysrKysKIFdlYkNvcmUvR05VbWFr ZWZpbGUuYW0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAgNiArKystCiAuLi4vZ3N0 cmVhbWVyL0dPd25QdHJHU3RyZWFtZXIuY3BwfSAgICAgICAgICAgICAgICB8ICAgMTEgKy0tLS0t LS0KIC4uLi9nc3RyZWFtZXIvR093blB0ckdTdHJlYW1lci5ofSAgICAgICAgICAgICAgICAgIHwg ICAgNiArLS0tCiAuLi4vZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAg ICAgICB8ICAgMTYgKysrKystLS0tLS0KIC4uLi9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyLmggICAgICAgIHwgICAgNSArLS0KIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9z b3VwL0Nvb2tpZUphclNvdXAuY3BwICAgIHwgICAgMiArLQogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL3NvdXAvRE5TU291cC5jcHAgICAgICAgICAgfCAgICAyICstCiAuLi4vc291cC9HT3duUHRy U291cC5jcHB9ICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTMgKy0tLS0tLS0tCiAuLi4v R093blB0ckd0ay5oID0+IG5ldHdvcmsvc291cC9HT3duUHRyU291cC5ofSAgICB8ICAgIDYgKy0t LQogLi4uL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwICAgfCAg ICAyICstCiAuLi4vcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlUmVxdWVzdFNvdXAuY3Bw ICB8ICAgIDIgKy0KIDEyIGZpbGVzIGNoYW5nZWQsIDUyIGluc2VydGlvbnMoKyksIDQ4IGRlbGV0 aW9ucygtKQogY29weSBXZWJDb3JlL3BsYXRmb3JtL3tndGsvR093blB0ckd0ay5jcHAgPT4gZ3Jh cGhpY3MvZ3N0cmVhbWVyL0dPd25QdHJHU3RyZWFtZXIuY3BwfSAoODQlKQogY29weSBXZWJDb3Jl L3BsYXRmb3JtL3tndGsvR093blB0ckd0ay5oID0+IGdyYXBoaWNzL2dzdHJlYW1lci9HT3duUHRy R1N0cmVhbWVyLmh9ICg4OCUpCiByZW5hbWUgV2ViQ29yZS9wbGF0Zm9ybS97Z3RrL0dPd25QdHJH dGsuY3BwID0+IG5ldHdvcmsvc291cC9HT3duUHRyU291cC5jcHB9ICg4MiUpCiByZW5hbWUgV2Vi Q29yZS9wbGF0Zm9ybS97Z3RrL0dPd25QdHJHdGsuaCA9PiBuZXR3b3JrL3NvdXAvR093blB0clNv dXAuaH0gKDg3JSkKCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IGM5MGNjMWIuLjNlN2MyYWMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMzUgQEAKIAogICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBbR1N0cmVhbWVyXSBwbGF5ZXIg Y29kZSBjbGVhbnVwcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MzU4NjgKKworICAgICAgICBTcGxpdHRlZCBHT3duUHRyR3RrLntjcHAsaH0gdG8gR093 blB0cntTb3VwLEdTdHJlYW1lcn0ue2NwcCxofSBhbmQKKyAgICAgICAgY2xlYW5lZCB1cCB0aGUg cHJpdmF0ZSBpbnN0YW5jZSB2YXJpYWJsZXMgb2YgdGhlIHBsYXllci4KKworICAgICAgICAqIEdO VW1ha2VmaWxlLmFtOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HT3du UHRyR1N0cmVhbWVyLmNwcDogQWRkZWQuCisgICAgICAgIChXVEY6OkdzdEVsZW1lbnQpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HT3duUHRyR1N0cmVhbWVyLmg6IEFk ZGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRl OjpNZWRpYVBsYXllclByaXZhdGUpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2 YXRlOjpmaWxsVGltZXJGaXJlZCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZh dGU6Om1lZGlhTG9jYXRpb25DaGFuZ2VkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmg6CisgICAgICAgICogcGxhdGZv cm0vZ3RrL0dPd25QdHJHdGsuY3BwOiBSZW1vdmVkLgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9H T3duUHRyR3RrLmg6IFJlbW92ZWQuCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9zb3VwL0Nv b2tpZUphclNvdXAuY3BwOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvc291cC9ETlNTb3Vw LmNwcDoKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAvR093blB0clNvdXAuY3BwOiBB ZGRlZC4KKyAgICAgICAgKFdURjo6U291cFVSSSk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29y ay9zb3VwL0dPd25QdHJTb3VwLmg6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv c291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv c291cC9SZXNvdXJjZVJlcXVlc3RTb3VwLmNwcDoKKworMjAxMC0wMy0wOCAgUGhpbGlwcGUgTm9y bWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKICAgICAgICAgW0dUS10gR1RLX1dJREdFVF9OT19XSU5ET1cgZGVwcmVjYXRl ZCBpbiBHVEsrIDIuMjAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM1NzI3CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvR05VbWFrZWZpbGUuYW0gYi9XZWJD b3JlL0dOVW1ha2VmaWxlLmFtCmluZGV4IDQwYmE4MGQuLjRhZjc0ZWEgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvR05VbWFrZWZpbGUuYW0KKysrIGIvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbQpAQCAtMjAz Nyw4ICsyMDM3LDYgQEAgd2ViY29yZWd0a19zb3VyY2VzICs9IFwKIAlXZWJDb3JlL3BsYXRmb3Jt L2d0ay9GaWxlU3lzdGVtR3RrLmNwcCBcCiAJV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR1JlZlB0ckd0 ay5jcHAgXAogCVdlYkNvcmUvcGxhdGZvcm0vZ3RrL0dSZWZQdHJHdGsuaCBcCi0JV2ViQ29yZS9w bGF0Zm9ybS9ndGsvR093blB0ckd0ay5jcHAgXAotCVdlYkNvcmUvcGxhdGZvcm0vZ3RrL0dPd25Q dHJHdGsuaCBcCiAJV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrUGx1Z2luV2lkZ2V0LmNwcCBcCiAJ V2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrUGx1Z2luV2lkZ2V0LmggXAogCVdlYkNvcmUvcGxhdGZv cm0vZ3RrL0tVUkxHdGsuY3BwIFwKQEAgLTIwOTYsNiArMjA5NCw4IEBAIHdlYmNvcmVndGtfc291 cmNlcyArPSBcCiAJV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VSZXNwb25z ZVNvdXAuY3BwIFwKIAlXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZVJlcXVl c3QuaCBcCiAJV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VSZXNwb25zZS5o IFwKKwlXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9HT3duUHRyU291cC5oIFwKKwlXZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9HT3duUHRyU291cC5jcHAgXAogCVdlYkNvcmUvd29y a2Vycy9TaGFyZWRXb3JrZXJSZXBvc2l0b3J5LmgKIAogIyAtLS0tCkBAIC0yNDM3LDYgKzI0Mzcs OCBAQCB3ZWJjb3JlZ3RrX3NvdXJjZXMgKz0gXAogCVdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL1ZpZGVvU2lua0dTdHJlYW1lci5oIFwKIAlXZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9EYXRhU291cmNlR1N0cmVhbWVyLmNwcCBcCiAJV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvRGF0YVNvdXJjZUdTdHJlYW1lci5oIFwKKwlXZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HT3duUHRyR1N0cmVhbWVyLmNwcCBcCisJV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR093blB0ckdTdHJlYW1lci5oIFwKIAlXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIu Y3BwIFwKIAlXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3Vy Y2VHU3RyZWFtZXIuaAogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HT3duUHRy R3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dPd25QdHJHU3Ry ZWFtZXIuY3BwCnNpbWlsYXJpdHkgaW5kZXggODQlCmNvcHkgZnJvbSBXZWJDb3JlL3BsYXRmb3Jt L2d0ay9HT3duUHRyR3RrLmNwcApjb3B5IHRvIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL0dPd25QdHJHU3RyZWFtZXIuY3BwCmluZGV4IDg1MzgxMDUuLjFkMTRiNWEgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0dPd25QdHJHdGsuY3BwCisrKyBiL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dPd25QdHJHU3RyZWFtZXIuY3BwCkBAIC0xOCwy MiArMTgsMTMgQEAKIAogCiAjaW5jbHVkZSAiY29uZmlnLmgiCi0jaW5jbHVkZSAiR093blB0ckd0 ay5oIgorI2luY2x1ZGUgIkdPd25QdHJHU3RyZWFtZXIuaCIKIAogI2lmIEVOQUJMRShWSURFTykK ICNpbmNsdWRlIDxnc3QvZ3N0ZWxlbWVudC5oPgotI2VuZGlmCi0jaW5jbHVkZSA8bGlic291cC9z b3VwLXVyaS5oPgogCiBuYW1lc3BhY2UgV1RGIHsKIAotdGVtcGxhdGUgPD4gdm9pZCBmcmVlT3du ZWRHUHRyPFNvdXBVUkk+KFNvdXBVUkkqIHB0cikKLXsKLSAgICBpZiAocHRyKQotICAgICAgICBz b3VwX3VyaV9mcmVlKHB0cik7Ci19Ci0KLSNpZiBFTkFCTEUoVklERU8pCiB0ZW1wbGF0ZSA8PiB2 b2lkIGZyZWVPd25lZEdQdHI8R3N0RWxlbWVudD4oR3N0RWxlbWVudCogcHRyKQogewogICAgIGlm IChwdHIpCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HT3duUHRyR3RrLmggYi9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HT3duUHRyR1N0cmVhbWVyLmgKc2lt aWxhcml0eSBpbmRleCA4OCUKY29weSBmcm9tIFdlYkNvcmUvcGxhdGZvcm0vZ3RrL0dPd25QdHJH dGsuaApjb3B5IHRvIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dPd25QdHJH U3RyZWFtZXIuaAppbmRleCBjNTg1MDAyLi42NjU1ZjM4IDEwMDY0NAotLS0gYS9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9HT3duUHRyR3RrLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvR093blB0ckdTdHJlYW1lci5oCkBAIC0xNywxNyArMTcsMTUgQEAKICAqICBCb3N0 b24sIE1BIDAyMTEwLTEzMDEsIFVTQS4KICAqLwogCi0jaWZuZGVmIEdPd25QdHJHdGtfaAotI2Rl ZmluZSBHT3duUHRyR3RrX2gKKyNpZm5kZWYgR093blB0ckdTdHJlYW1lcl9oCisjZGVmaW5lIEdP d25QdHJHU3RyZWFtZXJfaAogCiAjaW5jbHVkZSAiR093blB0ci5oIgogCi10eXBlZGVmIHN0cnVj dCBfU291cFVSSSBTb3VwVVJJOwogdHlwZWRlZiBzdHJ1Y3QgX0dzdEVsZW1lbnQgR3N0RWxlbWVu dDsKIAogbmFtZXNwYWNlIFdURiB7CiAKLXRlbXBsYXRlPD4gdm9pZCBmcmVlT3duZWRHUHRyPFNv dXBVUkk+KFNvdXBVUkkqIHB0cik7CiB0ZW1wbGF0ZTw+IHZvaWQgZnJlZU93bmVkR1B0cjxHc3RF bGVtZW50PihHc3RFbGVtZW50KiBwdHIpOwogCiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwIGIv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyLmNwcAppbmRleCA4ODE0MGJkLi41OTczMWI5IDEwMDY0NAotLS0gYS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3Bw CisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lci5jcHAKQEAgLTMzLDcgKzMzLDcgQEAKICNpbmNsdWRlICJEb2N1bWVudC5o IgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCi0jaW5jbHVkZSAi R093blB0ckd0ay5oIgorI2luY2x1ZGUgIkdPd25QdHJHU3RyZWFtZXIuaCIKICNpbmNsdWRlICJH cmFwaGljc0NvbnRleHQuaCIKICNpbmNsdWRlICJJbnRSZWN0LmgiCiAjaW5jbHVkZSAiS1VSTC5o IgpAQCAtMjkxLDcgKzI5MSw2IEBAIE1lZGlhUGxheWVyUHJpdmF0ZTo6TWVkaWFQbGF5ZXJQcml2 YXRlKE1lZGlhUGxheWVyKiBwbGF5ZXIpCiAgICAgLCBtX3N0YXJ0ZWRCdWZmZXJpbmcoZmFsc2Up CiAgICAgLCBtX2ZpbGxUaW1lcih0aGlzLCAmTWVkaWFQbGF5ZXJQcml2YXRlOjpmaWxsVGltZXJG aXJlZCkKICAgICAsIG1fbWF4VGltZUxvYWRlZCgwKQotICAgICwgbV9maWxsU3RhdHVzKDApCiB7 CiAgICAgaWYgKGRvR3N0SW5pdCgpKQogICAgICAgICBjcmVhdGVHU1RQbGF5QmluKCk7CkBAIC02 NzAsMTYgKzY2OSwxNSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6ZmlsbFRpbWVyRmlyZWQo VGltZXI8TWVkaWFQbGF5ZXJQcml2YXRlPiopCiAgICAgfQogCiAgICAgZ2ludDY0IHN0YXJ0LCBz dG9wOworICAgIGdkb3VibGUgZmlsbFN0YXR1cyA9IDEwMC4wOwogCiAgICAgZ3N0X3F1ZXJ5X3Bh cnNlX2J1ZmZlcmluZ19yYW5nZShxdWVyeSwgMCwgJnN0YXJ0LCAmc3RvcCwgMCk7CiAgICAgZ3N0 X3F1ZXJ5X3VucmVmKHF1ZXJ5KTsKIAogICAgIGlmIChzdG9wICE9IC0xKQotICAgICAgICBtX2Zp bGxTdGF0dXMgPSAxMDAuMCAqIHN0b3AgLyBHU1RfRk9STUFUX1BFUkNFTlRfTUFYOwotICAgIGVs c2UKLSAgICAgICAgbV9maWxsU3RhdHVzID0gMTAwLjA7CisgICAgICAgIGZpbGxTdGF0dXMgPSAx MDAuMCAqIHN0b3AgLyBHU1RfRk9STUFUX1BFUkNFTlRfTUFYOwogCi0gICAgTE9HX1ZFUkJPU0Uo TWVkaWEsICJEb3dubG9hZCBidWZmZXIgZmlsbGVkIHVwIHRvICVmJSUiLCBtX2ZpbGxTdGF0dXMp OworICAgIExPR19WRVJCT1NFKE1lZGlhLCAiRG93bmxvYWQgYnVmZmVyIGZpbGxlZCB1cCB0byAl ZiUlIiwgZmlsbFN0YXR1cyk7CiAKICAgICBpZiAoIW1fbWVkaWFEdXJhdGlvbikKICAgICAgICAg ZHVyYXRpb25DaGFuZ2VkKCk7CkBAIC02ODcsMTEgKzY4NSwxMSBAQCB2b2lkIE1lZGlhUGxheWVy UHJpdmF0ZTo6ZmlsbFRpbWVyRmlyZWQoVGltZXI8TWVkaWFQbGF5ZXJQcml2YXRlPiopCiAgICAg Ly8gVXBkYXRlIG1heFRpbWVMb2FkZWQgb25seSBpZiB0aGUgbWVkaWEgZHVyYXRpb24gaXMKICAg ICAvLyBhdmFpbGFibGUuIE90aGVyd2lzZSB3ZSBjYW4ndCBjb21wdXRlIGl0LgogICAgIGlmICht X21lZGlhRHVyYXRpb24pIHsKLSAgICAgICAgbV9tYXhUaW1lTG9hZGVkID0gc3RhdGljX2Nhc3Q8 ZmxvYXQ+KChtX2ZpbGxTdGF0dXMgKiBtX21lZGlhRHVyYXRpb24pIC8gMTAwLjApOworICAgICAg ICBtX21heFRpbWVMb2FkZWQgPSBzdGF0aWNfY2FzdDxmbG9hdD4oKGZpbGxTdGF0dXMgKiBtX21l ZGlhRHVyYXRpb24pIC8gMTAwLjApOwogICAgICAgICBMT0dfVkVSQk9TRShNZWRpYSwgIlVwZGF0 ZWQgbWF4VGltZUxvYWRlZDogJWYiLCBtX21heFRpbWVMb2FkZWQpOwogICAgIH0KIAotICAgIGlm IChtX2ZpbGxTdGF0dXMgIT0gMTAwLjApIHsKKyAgICBpZiAoZmlsbFN0YXR1cyAhPSAxMDAuMCkg ewogICAgICAgICB1cGRhdGVTdGF0ZXMoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTkz NCw3ICs5MzIsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6bWVkaWFMb2NhdGlvbkNoYW5n ZWQoR3N0TWVzc2FnZSogbWVzc2FnZSkKICAgICAgICAgY29uc3QgR1ZhbHVlKiBsb2NhdGlvbnMg PSBnc3Rfc3RydWN0dXJlX2dldF92YWx1ZShtX21lZGlhTG9jYXRpb25zLCAibG9jYXRpb25zIik7 CiAKICAgICAgICAgaWYgKGxvY2F0aW9ucykKLSAgICAgICAgICAgIG1fbWVkaWFMb2NhdGlvbkN1 cnJlbnRJbmRleCA9IGdzdF92YWx1ZV9saXN0X2dldF9zaXplKGxvY2F0aW9ucykgLTE7CisgICAg ICAgICAgICBtX21lZGlhTG9jYXRpb25DdXJyZW50SW5kZXggPSBzdGF0aWNfY2FzdDxpbnQ+KGdz dF92YWx1ZV9saXN0X2dldF9zaXplKGxvY2F0aW9ucykpIC0xOwogCiAgICAgICAgIGxvYWROZXh0 TG9jYXRpb24oKTsKICAgICB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaCBiL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCmluZGV4 IDM5ZjZlNGMuLjA3M2E0NWQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCisrKyBiL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCkBA IC0xNTQsMTcgKzE1NCwxNiBAQCBjbGFzcyBNZWRpYVBsYXllclByaXZhdGUgOiBwdWJsaWMgTWVk aWFQbGF5ZXJQcml2YXRlSW50ZXJmYWNlIHsKICAgICAgICAgICAgIEludFNpemUgbV9zaXplOwog ICAgICAgICAgICAgR3N0QnVmZmVyKiBtX2J1ZmZlcjsKICAgICAgICAgICAgIEdzdFN0cnVjdHVy ZSogbV9tZWRpYUxvY2F0aW9uczsKLSAgICAgICAgICAgIGdpbnQgbV9tZWRpYUxvY2F0aW9uQ3Vy cmVudEluZGV4OworICAgICAgICAgICAgaW50IG1fbWVkaWFMb2NhdGlvbkN1cnJlbnRJbmRleDsK ICAgICAgICAgICAgIGJvb2wgbV9yZXNldFBpcGVsaW5lOwogICAgICAgICAgICAgYm9vbCBtX3Bh dXNlZDsKICAgICAgICAgICAgIGJvb2wgbV9zZWVraW5nOwogICAgICAgICAgICAgZmxvYXQgbV9w bGF5YmFja1JhdGU7CiAgICAgICAgICAgICBib29sIG1fZXJyb3JPY2N1cmVkOwotICAgICAgICAg ICAgZ2Zsb2F0IG1fbWVkaWFEdXJhdGlvbjsKKyAgICAgICAgICAgIGZsb2F0IG1fbWVkaWFEdXJh dGlvbjsKICAgICAgICAgICAgIGJvb2wgbV9zdGFydGVkQnVmZmVyaW5nOwogICAgICAgICAgICAg VGltZXI8TWVkaWFQbGF5ZXJQcml2YXRlPiBtX2ZpbGxUaW1lcjsKICAgICAgICAgICAgIGZsb2F0 IG1fbWF4VGltZUxvYWRlZDsKLSAgICAgICAgICAgIGdkb3VibGUgbV9maWxsU3RhdHVzOwogICAg IH07CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL0Nvb2tp ZUphclNvdXAuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvQ29va2llSmFyU291 cC5jcHAKaW5kZXggZDY0NzliMi4uZjI4ODQ4MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL3NvdXAvQ29va2llSmFyU291cC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL3NvdXAvQ29va2llSmFyU291cC5jcHAKQEAgLTI0LDcgKzI0LDcgQEAKICNpbmNsdWRl ICJDb29raWUuaCIKICNpbmNsdWRlICJDU3RyaW5nLmgiCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIK LSNpbmNsdWRlICJHT3duUHRyR3RrLmgiCisjaW5jbHVkZSAiR093blB0clNvdXAuaCIKICNpbmNs dWRlICJLVVJMLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9zb3VwL0ROU1NvdXAuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL3NvdXAvRE5TU291cC5jcHAKaW5kZXggN2Y0N2VmZC4uNmE5MjYzNSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvRE5TU291cC5jcHAKKysrIGIvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL3NvdXAvRE5TU291cC5jcHAKQEAgLTI4LDcgKzI4LDcgQEAKICNpbmNs dWRlICJETlMuaCIKIAogI2luY2x1ZGUgIkNTdHJpbmcuaCIKLSNpbmNsdWRlICJHT3duUHRyR3Rr LmgiCisjaW5jbHVkZSAiR093blB0clNvdXAuaCIKICNpbmNsdWRlICJSZXNvdXJjZUhhbmRsZS5o IgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0 ay9HT3duUHRyR3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL0dPd25QdHJT b3VwLmNwcApzaW1pbGFyaXR5IGluZGV4IDgyJQpyZW5hbWUgZnJvbSBXZWJDb3JlL3BsYXRmb3Jt L2d0ay9HT3duUHRyR3RrLmNwcApyZW5hbWUgdG8gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3Nv dXAvR093blB0clNvdXAuY3BwCmluZGV4IDg1MzgxMDUuLjU2ZmU2OTIgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvcGxhdGZvcm0vZ3RrL0dPd25QdHJHdGsuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9zb3VwL0dPd25QdHJTb3VwLmNwcApAQCAtMTgsMTEgKzE4LDggQEAKIAogCiAjaW5j bHVkZSAiY29uZmlnLmgiCi0jaW5jbHVkZSAiR093blB0ckd0ay5oIgorI2luY2x1ZGUgIkdPd25Q dHJTb3VwLmgiCiAKLSNpZiBFTkFCTEUoVklERU8pCi0jaW5jbHVkZSA8Z3N0L2dzdGVsZW1lbnQu aD4KLSNlbmRpZgogI2luY2x1ZGUgPGxpYnNvdXAvc291cC11cmkuaD4KIAogbmFtZXNwYWNlIFdU RiB7CkBAIC0zMywxMiArMzAsNCBAQCB0ZW1wbGF0ZSA8PiB2b2lkIGZyZWVPd25lZEdQdHI8U291 cFVSST4oU291cFVSSSogcHRyKQogICAgICAgICBzb3VwX3VyaV9mcmVlKHB0cik7CiB9CiAKLSNp ZiBFTkFCTEUoVklERU8pCi10ZW1wbGF0ZSA8PiB2b2lkIGZyZWVPd25lZEdQdHI8R3N0RWxlbWVu dD4oR3N0RWxlbWVudCogcHRyKQotewotICAgIGlmIChwdHIpCi0gICAgICAgIGdzdF9vYmplY3Rf dW5yZWYocHRyKTsKLX0KLSNlbmRpZgotCiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3Jt L2d0ay9HT3duUHRyR3RrLmggYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9HT3duUHRy U291cC5oCnNpbWlsYXJpdHkgaW5kZXggODclCnJlbmFtZSBmcm9tIFdlYkNvcmUvcGxhdGZvcm0v Z3RrL0dPd25QdHJHdGsuaApyZW5hbWUgdG8gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAv R093blB0clNvdXAuaAppbmRleCBjNTg1MDAyLi5jMTI5Zjg0IDEwMDY0NAotLS0gYS9XZWJDb3Jl L3BsYXRmb3JtL2d0ay9HT3duUHRyR3RrLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L3NvdXAvR093blB0clNvdXAuaApAQCAtMTcsMTggKzE3LDE2IEBACiAgKiAgQm9zdG9uLCBNQSAw MjExMC0xMzAxLCBVU0EuCiAgKi8KIAotI2lmbmRlZiBHT3duUHRyR3RrX2gKLSNkZWZpbmUgR093 blB0ckd0a19oCisjaWZuZGVmIEdPd25QdHJTb3VwX2gKKyNkZWZpbmUgR093blB0clNvdXBfaAog CiAjaW5jbHVkZSAiR093blB0ci5oIgogCiB0eXBlZGVmIHN0cnVjdCBfU291cFVSSSBTb3VwVVJJ OwotdHlwZWRlZiBzdHJ1Y3QgX0dzdEVsZW1lbnQgR3N0RWxlbWVudDsKIAogbmFtZXNwYWNlIFdU RiB7CiAKIHRlbXBsYXRlPD4gdm9pZCBmcmVlT3duZWRHUHRyPFNvdXBVUkk+KFNvdXBVUkkqIHB0 cik7Ci10ZW1wbGF0ZTw+IHZvaWQgZnJlZU93bmVkR1B0cjxHc3RFbGVtZW50PihHc3RFbGVtZW50 KiBwdHIpOwogCiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3Vw L1Jlc291cmNlSGFuZGxlU291cC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9S ZXNvdXJjZUhhbmRsZVNvdXAuY3BwCmluZGV4IDgyNWQ1ZmIuLjNjMWVlNDMgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKKysr IGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcApA QCAtMzQsNyArMzQsNyBAQAogI2luY2x1ZGUgIkRvY0xvYWRlci5oIgogI2luY2x1ZGUgIkZpbGVT eXN0ZW0uaCIKICNpbmNsdWRlICJGcmFtZS5oIgotI2luY2x1ZGUgIkdPd25QdHJHdGsuaCIKKyNp bmNsdWRlICJHT3duUHRyU291cC5oIgogI2luY2x1ZGUgIkhUVFBQYXJzZXJzLmgiCiAjaW5jbHVk ZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIk1JTUVUeXBlUmVnaXN0cnkuaCIKZGlmZiAtLWdpdCBh L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlUmVxdWVzdFNvdXAuY3BwIGIv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VSZXF1ZXN0U291cC5jcHAKaW5k ZXggODg1ZTJmMy4uOGU0NTA3YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L3NvdXAvUmVzb3VyY2VSZXF1ZXN0U291cC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL3NvdXAvUmVzb3VyY2VSZXF1ZXN0U291cC5jcHAKQEAgLTIyLDcgKzIyLDcgQEAKIAogI2lu Y2x1ZGUgIkNTdHJpbmcuaCIKICNpbmNsdWRlICJHT3duUHRyLmgiCi0jaW5jbHVkZSAiR093blB0 ckd0ay5oIgorI2luY2x1ZGUgIkdPd25QdHJTb3VwLmgiCiAjaW5jbHVkZSAiSFRUUFBhcnNlcnMu aCIKICNpbmNsdWRlICJNSU1FVHlwZVJlZ2lzdHJ5LmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1TdHJp bmcuaCIKLS0gCjEuNi4zLjM=