154582 2016-02-23 04:31:33 -0800 [Gstreamer] Mediaplayer should observe the tracks and not the source 2016-02-24 02:12:52 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 143211 1 alex alex adam.bergkvist commit-queue pnormand oldest_to_newest 1167368 0 alex 2016-02-23 04:31:33 -0800 The tracks are the classes we have to use to make sure we are getting all the events that affect the media showed because they represent the situation of the media source in the mediastream, and they have states. 1167372 1 272009 alex 2016-02-23 04:50:30 -0800 Created attachment 272009 Patch 1167455 2 alex 2016-02-23 10:23:36 -0800 *** Bug 153865 has been marked as a duplicate of this bug. *** 1167739 3 272009 pnormand 2016-02-24 00:49:43 -0800 Comment on attachment 272009 Patch Looks good, thanks! 1167749 4 272009 commit-queue 2016-02-24 02:12:49 -0800 Comment on attachment 272009 Patch Clearing flags on attachment: 272009 Committed r197023: <http://trac.webkit.org/changeset/197023> 1167750 5 commit-queue 2016-02-24 02:12:52 -0800 All reviewed patches have been landed. Closing bug. 272009 2016-02-23 04:50:30 -0800 2016-02-24 02:12:49 -0800 Patch bug-154582-20160223135011.patch text/plain 11110 alex U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2OTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzZhNjM2OTJmNjhjZDJh NmI0ZWI3MTY2YWNkNDIzNjNmMjM4MzQ0OC4uNTgwNjNmMTVlOTJlMDRmM2JlN2VlOGJlZTFjODA0 M2NmZjA0MzU4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE2LTAyLTIzICBBbGVq YW5kcm8gRy4gQ2FzdHJvICA8YWxleEBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHc3RyZWFtZXJd IE1lZGlhcGxheWVyIHNob3VsZCBvYnNlcnZlIHRoZSB0cmFja3MgYW5kIG5vdCB0aGUgc291cmNl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTQ1ODIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBoYXZl IHRvIG9ic2VydmUgdGhlIHRyYWNrIG9iamVjdHMgdGhhdCBkZWZpbmUgdGhlCisgICAgICAgIG1l ZGlhc3RyZWFtLiBSZXBsYWNlIHRoZSBzb3VyY2UgYXR0cmlidXRlcyB3aXRoIHRoZSBuZXcgdHJh Y2tzIGFuZAorICAgICAgICB1c2UgdGhlbSBwcm9wZXJseSBpbiB0aGUgY2xhc3MuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyT3dyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ck93cjo6fk1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck93cik6CisgICAgICAgIE1ha2Ugc3Vy ZSB3ZSBhcmUgbm90IG9ic2VydmluZyBhbnltb3JlIHRoZSB0cmFja3MgYWZ0ZXIKKyAgICAgICAg ZGVzdHJ1Y3Rpb24uCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXJPd3I6Omhhc1ZpZGVvKTogVXNlZCB0aGUgdHJhY2sKKyAgICAgICAgaW5zdGVhZCBvZiB0aGUg c291cmNlLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyT3dy OjpoYXNBdWRpbyk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyT3dyOjpjdXJyZW50VGltZSk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6TWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyT3dyOjppbnRlcm5hbExvYWQpOiBEaXR0by4KKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck93cjo6c3RvcCk6IERpdHRv LgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyT3dyOjp0cmFj a0VuZGVkKTogQWRkZWQsIG5ldworICAgICAgICB0cmFjayBvYnNlcnZlciBBUEksIG1ha2Ugc3Vy ZSB3ZSBkaXNhYmxlIHRoZSBlbmRlZCB0cmFja3MuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXJPd3I6OnRyYWNrTXV0ZWRDaGFuZ2VkKToKKyAgICAgICAgQWRk ZWQsIG5ldyB0cmFjayBvYnNlcnZlciBBUEkuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXJPd3I6OnRyYWNrU2V0dGluZ3NDaGFuZ2VkKToKKyAgICAgICAgQWRk ZWQsIG5ldyB0cmFjayBvYnNlcnZlciBBUEkuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXJPd3I6OnRyYWNrRW5hYmxlZENoYW5nZWQpOgorICAgICAgICBBZGRl ZCwgbmV3IHRyYWNrIG9ic2VydmVyIEFQSS4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lck93cjo6c291cmNlU3RvcHBlZCk6IERlbGV0ZWQsCisgICAgICAgIHNv dXJjZSBvYnNlcnZlciBBUEkuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXJPd3I6OnNvdXJjZU11dGVkQ2hhbmdlZCk6CisgICAgICAgIERlbGV0ZWQsIHNvdXJj ZSBvYnNlcnZlciBBUEkuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXJPd3I6OnNvdXJjZVNldHRpbmdzQ2hhbmdlZCk6CisgICAgICAgIERlbGV0ZWQsIHNvdXJj ZSBvYnNlcnZlciBBUEkuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXJPd3I6OnByZXZlbnRTb3VyY2VGcm9tU3RvcHBpbmcpOgorICAgICAgICBEZWxldGVkLCBz b3VyY2Ugb2JzZXJ2ZXIgQVBJLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJPd3IuaDoKKyAgICAgICAgUmVwbGFjZWQgdGhl IGF0dHJpYnV0ZXMgcmVwcmVzZW50aW5nIHRoZSBzb3VyY2Ugd2l0aCB0aGUgdHJhY2tzCisgICAg ICAgIGFuZCBhZGRlZCB0aGUgbmV3IHRyYWNrIG9ic2VydmVyIGZ1bmN0aW9ucy4KKwogMjAxNi0w Mi0yMiAgTWFudWVsIFJlZ28gQ2FzYXNub3ZhcyAgPHJlZ29AaWdhbGlhLmNvbT4KIAogICAgICAg ICBbY3NzLWdyaWRdIFN3YXAgY29sdW1ucyBhbmQgcm93cyBpbiBncmlkIHNob3J0aGFuZApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lck93ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyT3dyLmNwcAppbmRl eCBiNjM5NTE4ODdhNzQzNDhiZjU3MGI5ZGI1OTg5N2NlN2EzZmFmNzFkLi43NjRmYjNmZWRlMzlj MGMzMjcwYzYzNjc0ZmQ5ZjRkYWRmODdmMTYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyT3dy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyT3dyLmNwcApAQCAtNTYsNiArNTYsMTEgQEAgTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyT3dyOjp+TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyT3dy KCkKIHsKICAgICBMT0dfTUVESUFfTUVTU0FHRSgiRGVzdHJveWluZyIpOwogCisgICAgaWYgKGhh c0F1ZGlvKCkpCisgICAgICAgIG1fYXVkaW9UcmFjay0+cmVtb3ZlT2JzZXJ2ZXIoKnRoaXMpOwor ICAgIGlmIChoYXNWaWRlbygpKQorICAgICAgICBtX3ZpZGVvVHJhY2stPnJlbW92ZU9ic2VydmVy KCp0aGlzKTsKKwogICAgIHN0b3AoKTsKIH0KIApAQCAtODIsMTIgKzg3LDEyIEBAIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyT3dyOjpwYXVzZSgpCiAKIGJvb2wgTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyT3dyOjpoYXNWaWRlbygpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fdmlk ZW9Tb3VyY2U7CisgICAgcmV0dXJuIG1fdmlkZW9UcmFjazsKIH0KIAogYm9vbCBNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXJPd3I6Omhhc0F1ZGlvKCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9h dWRpb1NvdXJjZTsKKyAgICByZXR1cm4gbV9hdWRpb1RyYWNrOwogfQogCiBmbG9hdCBNZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXJPd3I6OmN1cnJlbnRUaW1lKCkgY29uc3QKQEAgLTk1LDkgKzEw MCw5IEBAIGZsb2F0IE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck93cjo6Y3VycmVudFRpbWUo KSBjb25zdAogICAgIGdpbnQ2NCBwb3NpdGlvbiA9IEdTVF9DTE9DS19USU1FX05PTkU7CiAgICAg R3N0UXVlcnkqIHF1ZXJ5ID0gZ3N0X3F1ZXJ5X25ld19wb3NpdGlvbihHU1RfRk9STUFUX1RJTUUp OwogCi0gICAgaWYgKG1fdmlkZW9Tb3VyY2UgJiYgZ3N0X2VsZW1lbnRfcXVlcnkobV92aWRlb1Np bmsuZ2V0KCksIHF1ZXJ5KSkKKyAgICBpZiAobV92aWRlb1RyYWNrICYmIGdzdF9lbGVtZW50X3F1 ZXJ5KG1fdmlkZW9TaW5rLmdldCgpLCBxdWVyeSkpCiAgICAgICAgIGdzdF9xdWVyeV9wYXJzZV9w b3NpdGlvbihxdWVyeSwgMCwgJnBvc2l0aW9uKTsKLSAgICBlbHNlIGlmIChtX2F1ZGlvU291cmNl ICYmIGdzdF9lbGVtZW50X3F1ZXJ5KG1fYXVkaW9TaW5rLmdldCgpLCBxdWVyeSkpCisgICAgZWxz ZSBpZiAobV9hdWRpb1RyYWNrICYmIGdzdF9lbGVtZW50X3F1ZXJ5KG1fYXVkaW9TaW5rLmdldCgp LCBxdWVyeSkpCiAgICAgICAgIGdzdF9xdWVyeV9wYXJzZV9wb3NpdGlvbihxdWVyeSwgMCwgJnBv c2l0aW9uKTsKIAogICAgIGZsb2F0IHJlc3VsdCA9IDA7CkBAIC0xODEsMjggKzE4NiwyNyBAQCBi b29sIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck93cjo6aW50ZXJuYWxMb2FkKCkKICAgICAg ICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAKLSAgICAgICAgUmVhbHRpbWVNZWRpYVNvdXJj ZU93ciogc291cmNlID0gcmVpbnRlcnByZXRfY2FzdDxSZWFsdGltZU1lZGlhU291cmNlT3dyKj4o JnRyYWNrLT5zb3VyY2UoKSk7Ci0gICAgICAgIE93ck1lZGlhU291cmNlKiBtZWRpYVNvdXJjZSA9 IE9XUl9NRURJQV9TT1VSQ0Uoc291cmNlLT5tZWRpYVNvdXJjZSgpKTsKKyAgICAgICAgT3dyTWVk aWFTb3VyY2UqIG1lZGlhU291cmNlID0gT1dSX01FRElBX1NPVVJDRShyZWludGVycHJldF9jYXN0 PFJlYWx0aW1lTWVkaWFTb3VyY2VPd3IqPigmdHJhY2stPnNvdXJjZSgpKS0+bWVkaWFTb3VyY2Uo KSk7CiAKICAgICAgICAgc3dpdGNoICh0cmFjay0+dHlwZSgpKSB7CiAgICAgICAgIGNhc2UgUmVh bHRpbWVNZWRpYVNvdXJjZTo6QXVkaW86Ci0gICAgICAgICAgICBpZiAobV9hdWRpb1NvdXJjZSAm JiAobV9hdWRpb1NvdXJjZS5nZXQoKSA9PSBzb3VyY2UpKQorICAgICAgICAgICAgaWYgKG1fYXVk aW9UcmFjayAmJiAobV9hdWRpb1RyYWNrLmdldCgpID09IHRyYWNrKSkKICAgICAgICAgICAgICAg ICBnX29iamVjdF9zZXQobV9hdWRpb1JlbmRlcmVyLmdldCgpLCAiZGlzYWJsZWQiLCBGQUxTRSwg bnVsbHB0cik7CiAKICAgICAgICAgICAgIG93cl9tZWRpYV9yZW5kZXJlcl9zZXRfc291cmNlKE9X Ul9NRURJQV9SRU5ERVJFUihtX2F1ZGlvUmVuZGVyZXIuZ2V0KCkpLCBtZWRpYVNvdXJjZSk7Ci0g ICAgICAgICAgICBtX2F1ZGlvU291cmNlID0gc291cmNlOwotICAgICAgICAgICAgc291cmNlLT5h ZGRPYnNlcnZlcih0aGlzKTsKKyAgICAgICAgICAgIG1fYXVkaW9UcmFjayA9IHRyYWNrOworICAg ICAgICAgICAgdHJhY2stPmFkZE9ic2VydmVyKCp0aGlzKTsKICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICBjYXNlIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlZpZGVvOgotICAgICAgICAgICAgaWYg KG1fdmlkZW9Tb3VyY2UgJiYgKG1fdmlkZW9Tb3VyY2UuZ2V0KCkgPT0gc291cmNlKSkKKyAgICAg ICAgICAgIGlmIChtX3ZpZGVvVHJhY2sgJiYgKG1fdmlkZW9UcmFjay5nZXQoKSA9PSB0cmFjaykp CiAgICAgICAgICAgICAgICAgZ19vYmplY3Rfc2V0KG1fdmlkZW9SZW5kZXJlci5nZXQoKSwgImRp c2FibGVkIiwgRkFMU0UsIG51bGxwdHIpOwogCiAgICAgICAgICAgICAvLyBGSVhNRTogUmVtb3Zl IGhhcmRjb2RlZCB2aWRlbyBkaW1lbnNpb25zIHdoZW4gdGhlIHJlbmRlcmluZyBwZXJmb3JtYW5j ZToKICAgICAgICAgICAgIC8vIGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE1MzgyNi4KICAgICAgICAg ICAgIGdfb2JqZWN0X3NldChtX3ZpZGVvUmVuZGVyZXIuZ2V0KCksICJ3aWR0aCIsIDY0MCwgImhl aWdodCIsIDQ4MCwgbnVsbHB0cik7CiAgICAgICAgICAgICBvd3JfbWVkaWFfcmVuZGVyZXJfc2V0 X3NvdXJjZShPV1JfTUVESUFfUkVOREVSRVIobV92aWRlb1JlbmRlcmVyLmdldCgpKSwgbWVkaWFT b3VyY2UpOwotICAgICAgICAgICAgbV92aWRlb1NvdXJjZSA9IHNvdXJjZTsKLSAgICAgICAgICAg IHNvdXJjZS0+YWRkT2JzZXJ2ZXIodGhpcyk7CisgICAgICAgICAgICBtX3ZpZGVvVHJhY2sgPSB0 cmFjazsKKyAgICAgICAgICAgIHRyYWNrLT5hZGRPYnNlcnZlcigqdGhpcyk7CiAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgY2FzZSBSZWFsdGltZU1lZGlhU291cmNlOjpOb25lOgogICAgICAg ICAgICAgV0FSTl9NRURJQV9NRVNTQUdFKCJMb2FkaW5nIGEgdHJhY2sgd2l0aCBOb25lIHR5cGUi KTsKQEAgLTIyMCwxMSArMjI0LDExIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy T3dyOjpzdG9wKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9zdG9wcGVkID0gdHJ1ZTsKLSAg ICBpZiAobV9hdWRpb1NvdXJjZSkgeworICAgIGlmIChtX2F1ZGlvVHJhY2spIHsKICAgICAgICAg TE9HX01FRElBX01FU1NBR0UoIlN0b3A6IGRpc2Nvbm5lY3RpbmcgYXVkaW8iKTsKICAgICAgICAg Z19vYmplY3Rfc2V0KG1fYXVkaW9SZW5kZXJlci5nZXQoKSwgImRpc2FibGVkIiwgVFJVRSwgbnVs bHB0cik7CiAgICAgfQotICAgIGlmIChtX3ZpZGVvU291cmNlKSB7CisgICAgaWYgKG1fdmlkZW9U cmFjaykgewogICAgICAgICBMT0dfTUVESUFfTUVTU0FHRSgiU3RvcDogZGlzY29ubmVjdGluZyB2 aWRlbyIpOwogICAgICAgICBnX29iamVjdF9zZXQobV92aWRlb1JlbmRlcmVyLmdldCgpLCAiZGlz YWJsZWQiLCBUUlVFLCBudWxscHRyKTsKICAgICB9CkBAIC0yNzYsNDAgKzI4MCwzNCBAQCB2b2lk IE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck93cjo6Y3JlYXRlR1NUQXVkaW9TaW5rQmluKCkK ICAgICBtX2F1ZGlvUmVuZGVyZXIgPSBhZG9wdEdSZWYob3dyX2dzdF9hdWRpb19yZW5kZXJlcl9u ZXcobV9hdWRpb1NpbmsuZ2V0KCkpKTsKIH0KIAotdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXJPd3I6OnNvdXJjZVN0b3BwZWQoKQordm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXJPd3I6OnRyYWNrRW5kZWQoTWVkaWFTdHJlYW1UcmFja1ByaXZhdGUmIHRyYWNrKQogewotICAg IExPR19NRURJQV9NRVNTQUdFKCJTb3VyY2Ugc3RvcHBlZCIpOworICAgIExPR19NRURJQV9NRVNT QUdFKCJUcmFjayBlbmRlZCIpOwogCiAgICAgaWYgKCFtX3N0cmVhbVByaXZhdGUgfHwgIW1fc3Ry ZWFtUHJpdmF0ZS0+YWN0aXZlKCkpIHsKICAgICAgICAgc3RvcCgpOwogICAgICAgICByZXR1cm47 CiAgICAgfQogCi0gICAgZm9yIChhdXRvJiB0cmFjayA6IG1fc3RyZWFtUHJpdmF0ZS0+dHJhY2tz KCkpIHsKLSAgICAgICAgYXV0byogc291cmNlID0gcmVpbnRlcnByZXRfY2FzdDxSZWFsdGltZU1l ZGlhU291cmNlT3dyKj4oJnRyYWNrLT5zb3VyY2UoKSk7Ci0gICAgICAgIGlmICh0cmFjay0+ZW5h YmxlZCgpKQotICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIGlmIChzb3VyY2UgPT0gbV9h dWRpb1NvdXJjZSkKLSAgICAgICAgICAgIGdfb2JqZWN0X3NldChtX2F1ZGlvUmVuZGVyZXIuZ2V0 KCksICJkaXNhYmxlZCIsIFRSVUUsIG51bGxwdHIpOwotICAgICAgICBlbHNlIGlmIChzb3VyY2Ug PT0gbV92aWRlb1NvdXJjZSkKLSAgICAgICAgICAgIGdfb2JqZWN0X3NldChtX3ZpZGVvUmVuZGVy ZXIuZ2V0KCksICJkaXNhYmxlZCIsIFRSVUUsIG51bGxwdHIpOwotICAgIH0KKyAgICBpZiAoJnRy YWNrID09IG1fYXVkaW9UcmFjaykKKyAgICAgICAgZ19vYmplY3Rfc2V0KG1fYXVkaW9SZW5kZXJl ci5nZXQoKSwgImRpc2FibGVkIiwgVFJVRSwgbnVsbHB0cik7CisgICAgZWxzZSBpZiAoJnRyYWNr ID09IG1fdmlkZW9UcmFjaykKKyAgICAgICAgZ19vYmplY3Rfc2V0KG1fdmlkZW9SZW5kZXJlci5n ZXQoKSwgImRpc2FibGVkIiwgVFJVRSwgbnVsbHB0cik7CiB9CiAKLXZvaWQgTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyT3dyOjpzb3VyY2VNdXRlZENoYW5nZWQoKQordm9pZCBNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXJPd3I6OnRyYWNrTXV0ZWRDaGFuZ2VkKE1lZGlhU3RyZWFtVHJhY2tQ cml2YXRlJikKIHsKLSAgICBMT0dfTUVESUFfTUVTU0FHRSgiU291cmNlIG11dGVkIHN0YXRlIGNo YW5nZWQiKTsKKyAgICBMT0dfTUVESUFfTUVTU0FHRSgiVHJhY2sgbXV0ZWQgc3RhdGUgY2hhbmdl ZCIpOwogfQogCi12b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck93cjo6c291cmNlU2V0 dGluZ3NDaGFuZ2VkKCkKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyT3dyOjp0cmFj a1NldHRpbmdzQ2hhbmdlZChNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZSYpCiB7Ci0gICAgTE9HX01F RElBX01FU1NBR0UoIlNvdXJjZSBzZXR0aW5ncyBjaGFuZ2VkIik7CisgICAgTE9HX01FRElBX01F U1NBR0UoIlRyYWNrIHNldHRpbmdzIGNoYW5nZWQiKTsKIH0KIAotYm9vbCBNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXJPd3I6OnByZXZlbnRTb3VyY2VGcm9tU3RvcHBpbmcoKQordm9pZCBNZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXJPd3I6OnRyYWNrRW5hYmxlZENoYW5nZWQoTWVkaWFTdHJl YW1UcmFja1ByaXZhdGUmKQogewotICAgIExPR19NRURJQV9NRVNTQUdFKCJQcmV2ZW50IHNvdXJj ZSBmcm9tIHN0b3BwaW5nIik7Ci0gICAgcmV0dXJuIGZhbHNlOworICAgIExPR19NRURJQV9NRVNT QUdFKCJUcmFjayBlbmFibGVkIGNoYW5nZWQiKTsKIH0KIAogR3N0RWxlbWVudCogTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyT3dyOjpjcmVhdGVWaWRlb1NpbmsoKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lck93ci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck93ci5oCmluZGV4IDZjNTQ4ZTUxYzk3MDNj NjQ3NDM1ZTVlMzM1YTJhNTEwNjY4ZTZjZDIuLjkyZDRlYjRiODBkM2ZhYWYyZGQ1YjcwNTZjZDg2 ZDYzYTY5NDIwODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJPd3IuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyT3dyLmgKQEAgLTIzLDcgKzIzLDcgQEAKICNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKSAm JiBVU0UoR1NUUkVBTUVSKSAmJiBVU0UoT1BFTldFQlJUQykKIAogI2luY2x1ZGUgIk1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuaCIKLSNpbmNsdWRlICJSZWFsdGltZU1lZGlhU291cmNl LmgiCisjaW5jbHVkZSAiTWVkaWFTdHJlYW1UcmFja1ByaXZhdGUuaCIKIAogdHlwZWRlZiBzdHJ1 Y3QgX093ckdzdFZpZGVvUmVuZGVyZXIgT3dyR3N0VmlkZW9SZW5kZXJlcjsKIHR5cGVkZWYgc3Ry dWN0IF9Pd3JHc3RBdWRpb1JlbmRlcmVyIE93ckdzdEF1ZGlvUmVuZGVyZXI7CkBAIC0zMyw3ICsz Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIE1lZGlhU3RyZWFtUHJpdmF0ZTsKIGNs YXNzIFJlYWx0aW1lTWVkaWFTb3VyY2VPd3I7CiAKLWNsYXNzIE1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lck93ciA6IHB1YmxpYyBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLCBwcml2 YXRlIFJlYWx0aW1lTWVkaWFTb3VyY2U6Ok9ic2VydmVyIHsKK2NsYXNzIE1lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lck93ciA6IHB1YmxpYyBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNl LCBwcml2YXRlIE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlOjpPYnNlcnZlciB7CiBwdWJsaWM6CiAg ICAgZXhwbGljaXQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyT3dyKE1lZGlhUGxheWVyKik7 CiAgICAgfk1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck93cigpOwpAQCAtODMsMTEgKzgzLDEx IEBAIHByaXZhdGU6CiAgICAgYm9vbCBjYW5Mb2FkUG9zdGVyKCkgY29uc3Qgb3ZlcnJpZGUgeyBy ZXR1cm4gZmFsc2U7IH0KICAgICB2b2lkIHNldFBvc3Rlcihjb25zdCBTdHJpbmcmKSBvdmVycmlk ZSB7IH0KIAotICAgIC8vIFJlYWx0aW1lTWVkaWFTb3VyY2U6Ok9ic2VydmVyIGltcGxlbWVudGF0 aW9uLgotICAgIHZvaWQgc291cmNlU3RvcHBlZCgpIG92ZXJyaWRlIGZpbmFsOwotICAgIHZvaWQg c291cmNlTXV0ZWRDaGFuZ2VkKCkgb3ZlcnJpZGUgZmluYWw7Ci0gICAgdm9pZCBzb3VyY2VTZXR0 aW5nc0NoYW5nZWQoKSBvdmVycmlkZSBmaW5hbDsKLSAgICBib29sIHByZXZlbnRTb3VyY2VGcm9t U3RvcHBpbmcoKSBvdmVycmlkZSBmaW5hbDsKKyAgICAvLyBNZWRpYVN0cmVhbVRyYWNrUHJpdmF0 ZTo6T2JzZXJ2ZXIgaW1wbGVtZW50YXRpb24uCisgICAgdm9pZCB0cmFja0VuZGVkKE1lZGlhU3Ry ZWFtVHJhY2tQcml2YXRlJikgb3ZlcnJpZGUgZmluYWw7CisgICAgdm9pZCB0cmFja011dGVkQ2hh bmdlZChNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZSYpIG92ZXJyaWRlIGZpbmFsOworICAgIHZvaWQg dHJhY2tTZXR0aW5nc0NoYW5nZWQoTWVkaWFTdHJlYW1UcmFja1ByaXZhdGUmKSBvdmVycmlkZSBm aW5hbDsKKyAgICB2b2lkIHRyYWNrRW5hYmxlZENoYW5nZWQoTWVkaWFTdHJlYW1UcmFja1ByaXZh dGUmKSBvdmVycmlkZSBmaW5hbDsKIAogICAgIHN0YXRpYyB2b2lkIGdldFN1cHBvcnRlZFR5cGVz KEhhc2hTZXQ8U3RyaW5nLCBBU0NJSUNhc2VJbnNlbnNpdGl2ZUhhc2g+Jik7CiAgICAgc3RhdGlj IE1lZGlhUGxheWVyOjpTdXBwb3J0c1R5cGUgc3VwcG9ydHNUeXBlKGNvbnN0IE1lZGlhRW5naW5l U3VwcG9ydFBhcmFtZXRlcnMmKTsKQEAgLTk5LDggKzk5LDggQEAgcHJpdmF0ZToKIAogICAgIGJv b2wgbV9wYXVzZWQgeyB0cnVlIH07CiAgICAgYm9vbCBtX3N0b3BwZWQgeyB0cnVlIH07Ci0gICAg UmVmUHRyPFJlYWx0aW1lTWVkaWFTb3VyY2VPd3I+IG1fdmlkZW9Tb3VyY2U7Ci0gICAgUmVmUHRy PFJlYWx0aW1lTWVkaWFTb3VyY2VPd3I+IG1fYXVkaW9Tb3VyY2U7CisgICAgUmVmUHRyPE1lZGlh U3RyZWFtVHJhY2tQcml2YXRlPiBtX3ZpZGVvVHJhY2s7CisgICAgUmVmUHRyPE1lZGlhU3RyZWFt VHJhY2tQcml2YXRlPiBtX2F1ZGlvVHJhY2s7CiAgICAgR1JlZlB0cjxHc3RFbGVtZW50PiBtX2F1 ZGlvU2luazsKICAgICBSZWZQdHI8TWVkaWFTdHJlYW1Qcml2YXRlPiBtX3N0cmVhbVByaXZhdGU7 CiAgICAgR1JlZlB0cjxPd3JHc3RWaWRlb1JlbmRlcmVyPiBtX3ZpZGVvUmVuZGVyZXI7Cg==