125899 2013-12-17 18:22:23 -0800 [MSE] Add per-track signalling between SourceBuffer and SourceBufferPrivate. 2013-12-17 22:46:36 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 125905 1 jer.noble jer.noble commit-queue eric.carlson glenn oldest_to_newest 960775 0 jer.noble 2013-12-17 18:22:23 -0800 [MSE] Add per-track signalling between SourceBuffer and SourceBufferPrivate. 960781 1 219485 jer.noble 2013-12-17 18:31:04 -0800 Created attachment 219485 Patch 960795 2 219485 eric.carlson 2013-12-17 18:56:01 -0800 Comment on attachment 219485 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=219485&action=review > Source/WebCore/Modules/mediasource/SourceBuffer.h:143 > + struct TrackBuffer; Don't we usually forward declare structs and classes above the class? 960836 3 jer.noble 2013-12-17 22:01:38 -0800 (In reply to comment #2) > (From update of attachment 219485 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=219485&action=review > > > Source/WebCore/Modules/mediasource/SourceBuffer.h:143 > > + struct TrackBuffer; > > Don't we usually forward declare structs and classes above the class? Usually, yes, but this is a nested struct. It has to be declared within the declaration of SourceBuffer. 960852 4 219485 commit-queue 2013-12-17 22:46:34 -0800 Comment on attachment 219485 Patch Clearing flags on attachment: 219485 Committed r160754: <http://trac.webkit.org/changeset/160754> 960853 5 commit-queue 2013-12-17 22:46:36 -0800 All reviewed patches have been landed. Closing bug. 219485 2013-12-17 18:31:04 -0800 2013-12-17 22:46:34 -0800 Patch bug-125899-20131217183103.patch text/plain 12928 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwNzM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmRiNjYzYTQ1ZDQ1YzM0 Y2NlZGE5NTNkZDdkM2QxNGY1NGZiY2MwZi4uYjU5OTkzYzJiNzJhYzRhNmViNDcwYWVjNjdlYTYx NzJjYjNlMTRmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQxIEBACiAyMDEzLTEyLTE3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIFtNU0VdIEFkZCBwZXItdHJh Y2sgc2lnbmFsbGluZyBiZXR3ZWVuIFNvdXJjZUJ1ZmZlciBhbmQgU291cmNlQnVmZmVyUHJpdmF0 ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTg5 OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRvIGFj Y29tbW9kYXRlIHRoZSBmdXR1cmUgYWRkaXRpb24gb2YgYXVkaW8gc3VwcG9ydCB0byBNU0UgaW4g dGhlIE1hYworICAgICAgICBwb3J0LCBhZGQgdGhlIGNvbmNlcHQgb2YgdHJhY2tJRHMgdG8gdGhl IGNvbW11bmljYXRpb24gYmV0d2VlbgorICAgICAgICBTb3VyY2VCdWZmZXIgYW5kIFNvdXJjZUJ1 ZmZlclByaXZhdGUuCisKKyAgICAgICAgVGhlIGZvbGxvd2luZyB2aXJ0dWFsIG1ldGhvZHMgIG5v dyB0YWtlIGEgdHJhY2tJRCBwYXJhbWV0ZXI6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv U291cmNlQnVmZmVyUHJpdmF0ZS5oOgorICAgICAgICAoV2ViQ29yZTo6U291cmNlQnVmZmVyUHJp dmF0ZTo6aXNSZWFkeUZvck1vcmVTYW1wbGVzKToKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1 ZmZlclByaXZhdGU6OnN0b3BBc2tpbmdGb3JNb3JlU2FtcGxlcyk6CisgICAgICAgIChXZWJDb3Jl OjpTb3VyY2VCdWZmZXJQcml2YXRlOjpub3RpZnlDbGllbnRXaGVuUmVhZHlGb3JNb3JlU2FtcGxl cyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvU291cmNlQnVmZmVyUHJpdmF0ZUNsaWVu dC5oOgorICAgICAgICAoV2ViQ29yZTo6U291cmNlQnVmZmVyUHJpdmF0ZUNsaWVudDo6c291cmNl QnVmZmVyUHJpdmF0ZURpZEJlY29tZVJlYWR5Rm9yTW9yZVNhbXBsZXMpOgorCisgICAgICAgIFVw ZGF0ZSBvdmVycmlkZGVuIG1ldGhvZHMgaW4gc3ViY2xhc3NlczoKKyAgICAgICAgKiBNb2R1bGVz L21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTb3VyY2VC dWZmZXI6OnNvdXJjZUJ1ZmZlclByaXZhdGVEaWRCZWNvbWVSZWFkeUZvck1vcmVTYW1wbGVzKToK KyAgICAgICAgKiBNb2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5oOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1NvdXJjZUJ1ZmZlclByaXZhdGVB VkZPYmpDLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMv U291cmNlQnVmZmVyUHJpdmF0ZUFWRk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpTb3VyY2VC dWZmZXJQcml2YXRlQVZGT2JqQzo6dHJhY2tEaWRDaGFuZ2VFbmFibGVkKToKKyAgICAgICAgKFdl YkNvcmU6OlNvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDOjppc1JlYWR5Rm9yTW9yZVNhbXBsZXMp OgorICAgICAgICAqIHBsYXRmb3JtL21vY2svbWVkaWFzb3VyY2UvTW9ja1NvdXJjZUJ1ZmZlclBy aXZhdGUuaDoKKworICAgICAgICBDaGFuZ2UgdGhlIGxvZ2ljIGluIHByb3ZpZGVNZWRpYURhdGEg dG8gdXBkYXRlIGEgc2luZ2xlIFRyYWNrQnVmZmVyCisgICAgICAgIHJhdGhlciB0aGFuIGl0ZXJh dGluZyBvdmVyIGFsbCBvZiB0aGVtOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzb3VyY2UvU291 cmNlQnVmZmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlcjo6c291cmNlQnVm ZmVyUHJpdmF0ZVNlZWtUb1RpbWUpOgorICAgICAgICAoV2ViQ29yZTo6U291cmNlQnVmZmVyOjph cHBlbmRCdWZmZXJUaW1lckZpcmVkKToKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlcjo6 cHJvdmlkZU1lZGlhRGF0YSk6CisKKzIwMTMtMTItMTcgIEplciBOb2JsZSAgPGplci5ub2JsZUBh cHBsZS5jb20+CisKICAgICAgICAgW01TRV0gUGVyaW9kaWNhbGx5IG1vbml0b3Igc291cmNlIGJ1 ZmZlcnMuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MjU4OTgKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9T b3VyY2VCdWZmZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3Vy Y2VCdWZmZXIuY3BwCmluZGV4IDUzMmU5YjBkMzIwMjM1NDBiMDVkZWRmYWUxYjJlODM4YTVlNzdj ZTAuLmU1MDQ5ZWQ3NGRmODBkZWRmYTU3OWMzMjkzYzJhNmQxYzZjMjVlYmYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvU291cmNlQnVmZmVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHAKQEAg LTI4Niw5ICsyODYsOSBAQCB2b2lkIFNvdXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVyUHJpdmF0ZVNl ZWtUb1RpbWUoU291cmNlQnVmZmVyUHJpdmF0ZSosIGNvbnN0IE1lZAogICAgICAgICB0cmFja0J1 ZmZlci5kZWNvZGVRdWV1ZS5jbGVhcigpOwogICAgICAgICBmb3IgKGF1dG8gaXRlciA9IGN1cnJl bnRTYW1wbGVEVFNJdGVyYXRvcjsgaXRlciAhPSB0cmFja0J1ZmZlci5zYW1wbGVzLmRlY29kZUVu ZCgpOyArK2l0ZXIpCiAgICAgICAgICAgICB0cmFja0J1ZmZlci5kZWNvZGVRdWV1ZS5pbnNlcnQo Kml0ZXIpOwotICAgIH0KIAotICAgIHByb3ZpZGVNZWRpYURhdGEoKTsgICAKKyAgICAgICAgcHJv dmlkZU1lZGlhRGF0YSh0cmFja0J1ZmZlciwgdHJhY2tJRCk7CisgICAgfQogfQogCiBNZWRpYVRp bWUgU291cmNlQnVmZmVyOjpzb3VyY2VCdWZmZXJQcml2YXRlRmFzdFNlZWtUaW1lRm9yTWVkaWFU aW1lKFNvdXJjZUJ1ZmZlclByaXZhdGUqLCBjb25zdCBNZWRpYVRpbWUmIHRhcmdldFRpbWUsIGNv bnN0IE1lZGlhVGltZSYgbmVnYXRpdmVUaHJlc2hvbGQsIGNvbnN0IE1lZGlhVGltZSYgcG9zaXRp dmVUaHJlc2hvbGQpCkBAIC00NTQsNyArNDU0LDggQEAgdm9pZCBTb3VyY2VCdWZmZXI6OmFwcGVu ZEJ1ZmZlclRpbWVyRmlyZWQoVGltZXI8U291cmNlQnVmZmVyPiopCiAgICAgc2NoZWR1bGVFdmVu dChldmVudE5hbWVzKCkudXBkYXRlZW5kRXZlbnQpOwogCiAgICAgbV9zb3VyY2UtPm1vbml0b3JT b3VyY2VCdWZmZXJzKCk7Ci0gICAgcHJvdmlkZU1lZGlhRGF0YSgpOworICAgIGZvciAoYXV0byBp dGVyID0gbV90cmFja0J1ZmZlck1hcC5iZWdpbigpLCBlbmQgPSBtX3RyYWNrQnVmZmVyTWFwLmVu ZCgpOyBpdGVyICE9IGVuZDsgKytpdGVyKQorICAgICAgICBwcm92aWRlTWVkaWFEYXRhKGl0ZXIt PnZhbHVlLCBpdGVyLT5rZXkpOwogfQogCiBjb25zdCBBdG9taWNTdHJpbmcmIFNvdXJjZUJ1ZmZl cjo6ZGVjb2RlRXJyb3IoKQpAQCAtMTEyMywzOSArMTEyNCwzOCBAQCB2b2lkIFNvdXJjZUJ1ZmZl cjo6dGV4dFRyYWNrS2luZENoYW5nZWQoVGV4dFRyYWNrKiB0cmFjaykKICAgICAgICAgbV9zb3Vy Y2UtPm1lZGlhRWxlbWVudCgpLT50ZXh0VHJhY2tLaW5kQ2hhbmdlZCh0cmFjayk7CiB9CiAKLXZv aWQgU291cmNlQnVmZmVyOjpzb3VyY2VCdWZmZXJQcml2YXRlRGlkQmVjb21lUmVhZHlGb3JNb3Jl U2FtcGxlcyhTb3VyY2VCdWZmZXJQcml2YXRlKikKK3ZvaWQgU291cmNlQnVmZmVyOjpzb3VyY2VC dWZmZXJQcml2YXRlRGlkQmVjb21lUmVhZHlGb3JNb3JlU2FtcGxlcyhTb3VyY2VCdWZmZXJQcml2 YXRlKiwgQXRvbWljU3RyaW5nIHRyYWNrSUQpCiB7CiAgICAgTE9HKE1lZGlhLCAiU291cmNlQnVm ZmVyOjpzb3VyY2VCdWZmZXJQcml2YXRlRGlkQmVjb21lUmVhZHlGb3JNb3JlU2FtcGxlcyglcCki LCB0aGlzKTsKLSAgICBwcm92aWRlTWVkaWFEYXRhKCk7CisgICAgYXV0byBpdCA9IG1fdHJhY2tC dWZmZXJNYXAuZmluZCh0cmFja0lEKTsKKyAgICBpZiAoaXQgPT0gbV90cmFja0J1ZmZlck1hcC5l bmQoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgcHJvdmlkZU1lZGlhRGF0YShpdC0+dmFsdWUs IHRyYWNrSUQpOwogfQogCi12b2lkIFNvdXJjZUJ1ZmZlcjo6cHJvdmlkZU1lZGlhRGF0YSgpCit2 b2lkIFNvdXJjZUJ1ZmZlcjo6cHJvdmlkZU1lZGlhRGF0YShUcmFja0J1ZmZlciYgdHJhY2tCdWZm ZXIsIEF0b21pY1N0cmluZyB0cmFja0lEKQogewotICAgIGlmICghbV9wcml2YXRlLT5pc1JlYWR5 Rm9yTW9yZVNhbXBsZXMoKSkKLSAgICAgICAgcmV0dXJuOwotCiAjaWYgIUxPR19ESVNBQkxFRAog ICAgIHVuc2lnbmVkIGVucXVldWVkU2FtcGxlcyA9IDA7CiAjZW5kaWYKIAotICAgIGZvciAoYXV0 byBpdCA9IG1fdHJhY2tCdWZmZXJNYXAuYmVnaW4oKSwgZW5kID0gbV90cmFja0J1ZmZlck1hcC5l bmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIFRyYWNrQnVmZmVyJiB0cmFja0J1ZmZl ciA9IGl0LT52YWx1ZTsKLSAgICAgICAgQXRvbWljU3RyaW5nIHRyYWNrSUQgPSBpdC0+a2V5Owot ICAgICAgICBhdXRvIHNhbXBsZUl0ID0gdHJhY2tCdWZmZXIuZGVjb2RlUXVldWUuYmVnaW4oKTsK LSAgICAgICAgZm9yIChhdXRvIHNhbXBsZUVuZCA9IHRyYWNrQnVmZmVyLmRlY29kZVF1ZXVlLmVu ZCgpOyBzYW1wbGVJdCAhPSBzYW1wbGVFbmQ7ICsrc2FtcGxlSXQpIHsKLSAgICAgICAgICAgIGlm ICghbV9wcml2YXRlLT5pc1JlYWR5Rm9yTW9yZVNhbXBsZXMoKSkKLSAgICAgICAgICAgICAgICBi cmVhazsKLQotICAgICAgICAgICAgUmVmUHRyPE1lZGlhU2FtcGxlPiBzYW1wbGUgPSBzYW1wbGVJ dC0+c2Vjb25kOwotICAgICAgICAgICAgdHJhY2tCdWZmZXIubGFzdEVucXVldWVkUHJlc2VudGF0 aW9uVGltZSA9IHNhbXBsZS0+cHJlc2VudGF0aW9uVGltZSgpOwotICAgICAgICAgICAgbV9wcml2 YXRlLT5lbnF1ZXVlU2FtcGxlKHNhbXBsZS5yZWxlYXNlKCksIHRyYWNrSUQpOworICAgIGF1dG8g c2FtcGxlSXQgPSB0cmFja0J1ZmZlci5kZWNvZGVRdWV1ZS5iZWdpbigpOworICAgIGZvciAoYXV0 byBzYW1wbGVFbmQgPSB0cmFja0J1ZmZlci5kZWNvZGVRdWV1ZS5lbmQoKTsgc2FtcGxlSXQgIT0g c2FtcGxlRW5kOyArK3NhbXBsZUl0KSB7CisgICAgICAgIGlmICghbV9wcml2YXRlLT5pc1JlYWR5 Rm9yTW9yZVNhbXBsZXModHJhY2tJRCkpIHsKKyAgICAgICAgICAgIG1fcHJpdmF0ZS0+bm90aWZ5 Q2xpZW50V2hlblJlYWR5Rm9yTW9yZVNhbXBsZXModHJhY2tJRCk7CisgICAgICAgICAgICBicmVh azsKKyAgICAgICAgfQorCisgICAgICAgIFJlZlB0cjxNZWRpYVNhbXBsZT4gc2FtcGxlID0gc2Ft cGxlSXQtPnNlY29uZDsKKyAgICAgICAgdHJhY2tCdWZmZXIubGFzdEVucXVldWVkUHJlc2VudGF0 aW9uVGltZSA9IHNhbXBsZS0+cHJlc2VudGF0aW9uVGltZSgpOworICAgICAgICBtX3ByaXZhdGUt PmVucXVldWVTYW1wbGUoc2FtcGxlLnJlbGVhc2UoKSwgdHJhY2tJRCk7CiAjaWYgIUxPR19ESVNB QkxFRAotICAgICAgICAgICAgKytlbnF1ZXVlZFNhbXBsZXM7CisgICAgICAgICsrZW5xdWV1ZWRT YW1wbGVzOwogI2VuZGlmCiAKLSAgICAgICAgfQotICAgICAgICB0cmFja0J1ZmZlci5kZWNvZGVR dWV1ZS5lcmFzZSh0cmFja0J1ZmZlci5kZWNvZGVRdWV1ZS5iZWdpbigpLCBzYW1wbGVJdCk7CiAg ICAgfQorICAgIHRyYWNrQnVmZmVyLmRlY29kZVF1ZXVlLmVyYXNlKHRyYWNrQnVmZmVyLmRlY29k ZVF1ZXVlLmJlZ2luKCksIHNhbXBsZUl0KTsKIAogICAgIExPRyhNZWRpYSwgIlNvdXJjZUJ1ZmZl cjo6cHJvdmlkZU1lZGlhRGF0YSglcCkgLSBFbnF1ZXVlZCAldSBzYW1wbGVzIiwgdGhpcywgZW5x dWV1ZWRTYW1wbGVzKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFzb3VyY2UvU291cmNlQnVmZmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291 cmNlL1NvdXJjZUJ1ZmZlci5oCmluZGV4IGQyMmNkYTFhZGQyMzc5MGY5MTAzNzJjOTc1YmMyZTBj N2M1YzE3OGIuLmI4NTM1MWU1ZDk3ODM5MDQ3NTc4Y2Q5MDIwNDEyMmE4NzhkZWNjOWEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvU291cmNlQnVmZmVyLmgK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuaApA QCAtMTA4LDcgKzEwOCw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIHNvdXJjZUJ1ZmZl clByaXZhdGVEaWRSZWNlaXZlU2FtcGxlKFNvdXJjZUJ1ZmZlclByaXZhdGUqLCBQYXNzUmVmUHRy PE1lZGlhU2FtcGxlPikgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBib29sIHNvdXJjZUJ1ZmZlclBy aXZhdGVIYXNBdWRpbyhjb25zdCBTb3VyY2VCdWZmZXJQcml2YXRlKikgY29uc3QgT1ZFUlJJREU7 CiAgICAgdmlydHVhbCBib29sIHNvdXJjZUJ1ZmZlclByaXZhdGVIYXNWaWRlbyhjb25zdCBTb3Vy Y2VCdWZmZXJQcml2YXRlKikgY29uc3QgT1ZFUlJJREU7Ci0gICAgdmlydHVhbCB2b2lkIHNvdXJj ZUJ1ZmZlclByaXZhdGVEaWRCZWNvbWVSZWFkeUZvck1vcmVTYW1wbGVzKFNvdXJjZUJ1ZmZlclBy aXZhdGUqKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgc291cmNlQnVmZmVyUHJpdmF0ZURp ZEJlY29tZVJlYWR5Rm9yTW9yZVNhbXBsZXMoU291cmNlQnVmZmVyUHJpdmF0ZSosIEF0b21pY1N0 cmluZyB0cmFja0lEKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgc291cmNlQnVmZmVyUHJp dmF0ZVNlZWtUb1RpbWUoU291cmNlQnVmZmVyUHJpdmF0ZSosIGNvbnN0IE1lZGlhVGltZSYpOwog ICAgIHZpcnR1YWwgTWVkaWFUaW1lIHNvdXJjZUJ1ZmZlclByaXZhdGVGYXN0U2Vla1RpbWVGb3JN ZWRpYVRpbWUoU291cmNlQnVmZmVyUHJpdmF0ZSosIGNvbnN0IE1lZGlhVGltZSYsIGNvbnN0IE1l ZGlhVGltZSYgbmVnYXRpdmVUaHJlc2hvbGQsIGNvbnN0IE1lZGlhVGltZSYgcG9zaXRpdmVUaHJl c2hvbGQpOwogCkBAIC0xNDAsNyArMTQwLDggQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgdmFsaWRh dGVJbml0aWFsaXphdGlvblNlZ21lbnQoY29uc3QgSW5pdGlhbGl6YXRpb25TZWdtZW50Jik7CiAK LSAgICB2b2lkIHByb3ZpZGVNZWRpYURhdGEoKTsKKyAgICBzdHJ1Y3QgVHJhY2tCdWZmZXI7Cisg ICAgdm9pZCBwcm92aWRlTWVkaWFEYXRhKFRyYWNrQnVmZmVyJiwgQXRvbWljU3RyaW5nIHRyYWNr SUQpOwogICAgIHZvaWQgZGlkRHJvcFNhbXBsZSgpOwogCiAgICAgUmVmUHRyPFNvdXJjZUJ1ZmZl clByaXZhdGU+IG1fcHJpdmF0ZTsKQEAgLTE2Myw3ICsxNjQsNiBAQCBwcml2YXRlOgogICAgIE1l ZGlhVGltZSBtX3RpbWVzdGFtcE9mZnNldDsKICAgICBNZWRpYVRpbWUgbV9oaWdoZXN0UHJlc2Vu dGF0aW9uRW5kVGltZXN0YW1wOwogCi0gICAgc3RydWN0IFRyYWNrQnVmZmVyOwogICAgIEhhc2hN YXA8QXRvbWljU3RyaW5nLCBUcmFja0J1ZmZlcj4gbV90cmFja0J1ZmZlck1hcDsKICAgICBib29s IG1fcmVjZWl2ZWRGaXJzdEluaXRpYWxpemF0aW9uU2VnbWVudDsKICAgICBSZWZQdHI8VGltZVJh bmdlcz4gbV9idWZmZXJlZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL1NvdXJjZUJ1ZmZlclByaXZhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL1NvdXJjZUJ1ZmZlclByaXZhdGUuaAppbmRleCBlMWI2Yzc5NGUzMzEzYWYxOTYxMTVl MWU1MTFmNjg5YWQzMWZkODkzLi5jNDA1Yjk2NDVmOWQ0YzM3ZDA3ZmVjZGZiMGU5MWFiOTk1ODQ1 ODM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Tb3VyY2VC dWZmZXJQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU291 cmNlQnVmZmVyUHJpdmF0ZS5oCkBAIC02NSw4ICs2NSwxMCBAQCBwdWJsaWM6CiAKICAgICB2aXJ0 dWFsIHZvaWQgZmx1c2hBbmRFbnF1ZXVlTm9uRGlzcGxheWluZ1NhbXBsZXMoVmVjdG9yPFJlZlB0 cjxNZWRpYVNhbXBsZT4+LCBBdG9taWNTdHJpbmcpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBlbnF1 ZXVlU2FtcGxlKFBhc3NSZWZQdHI8TWVkaWFTYW1wbGU+LCBBdG9taWNTdHJpbmcpIHsgfQotICAg IHZpcnR1YWwgYm9vbCBpc1JlYWR5Rm9yTW9yZVNhbXBsZXMoKSB7IHJldHVybiBmYWxzZTsgfQor ICAgIHZpcnR1YWwgYm9vbCBpc1JlYWR5Rm9yTW9yZVNhbXBsZXMoQXRvbWljU3RyaW5nKSB7IHJl dHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgdm9pZCBzZXRBY3RpdmUoYm9vbCkgeyB9CisgICAg dmlydHVhbCB2b2lkIHN0b3BBc2tpbmdGb3JNb3JlU2FtcGxlcyhBdG9taWNTdHJpbmcpIHsgfQor ICAgIHZpcnR1YWwgdm9pZCBub3RpZnlDbGllbnRXaGVuUmVhZHlGb3JNb3JlU2FtcGxlcyhBdG9t aWNTdHJpbmcpIHsgfQogfTsKIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvU291cmNlQnVmZmVyUHJpdmF0ZUNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvU291cmNlQnVmZmVyUHJpdmF0ZUNsaWVudC5oCmluZGV4IGJiZTY0 YTg1ZDdlODY0YTY4N2M0YjJhOTllZTMxNWEzNTRlNDczYzYuLjJhZTAwOGRlN2I2M2IwYWZjZjY4 MzhmYmY3MzUyYTc0ZjVlMjQ4ODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL1NvdXJjZUJ1ZmZlclByaXZhdGVDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9Tb3VyY2VCdWZmZXJQcml2YXRlQ2xpZW50LmgKQEAgLTczLDEx ICs3MywxMCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIHNvdXJjZUJ1ZmZlclByaXZhdGVI YXNBdWRpbyhjb25zdCBTb3VyY2VCdWZmZXJQcml2YXRlKikgY29uc3QgPSAwOwogICAgIHZpcnR1 YWwgYm9vbCBzb3VyY2VCdWZmZXJQcml2YXRlSGFzVmlkZW8oY29uc3QgU291cmNlQnVmZmVyUHJp dmF0ZSopIGNvbnN0ID0gMDsKIAotICAgIHZpcnR1YWwgdm9pZCBzb3VyY2VCdWZmZXJQcml2YXRl RGlkQmVjb21lUmVhZHlGb3JNb3JlU2FtcGxlcyhTb3VyY2VCdWZmZXJQcml2YXRlKikgPSAwOwor ICAgIHZpcnR1YWwgdm9pZCBzb3VyY2VCdWZmZXJQcml2YXRlRGlkQmVjb21lUmVhZHlGb3JNb3Jl U2FtcGxlcyhTb3VyY2VCdWZmZXJQcml2YXRlKiwgQXRvbWljU3RyaW5nIHRyYWNrSUQpID0gMDsK IAogICAgIHZpcnR1YWwgTWVkaWFUaW1lIHNvdXJjZUJ1ZmZlclByaXZhdGVGYXN0U2Vla1RpbWVG b3JNZWRpYVRpbWUoU291cmNlQnVmZmVyUHJpdmF0ZSosIGNvbnN0IE1lZGlhVGltZSYgdGltZSwg Y29uc3QgTWVkaWFUaW1lJiwgY29uc3QgTWVkaWFUaW1lJikgeyByZXR1cm4gdGltZTsgfQogICAg IHZpcnR1YWwgdm9pZCBzb3VyY2VCdWZmZXJQcml2YXRlU2Vla1RvVGltZShTb3VyY2VCdWZmZXJQ cml2YXRlKiwgY29uc3QgTWVkaWFUaW1lJikgeyB9OwotCiB9OwogCiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9Tb3VyY2VC dWZmZXJQcml2YXRlQVZGT2JqQy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv YXZmb3VuZGF0aW9uL29iamMvU291cmNlQnVmZmVyUHJpdmF0ZUFWRk9iakMuaAppbmRleCAyZTIz ZmE0NGZiMTc2YmRmNzY1NmVkN2ZlMjFjOWZmYmIxY2YxOWM4Li5hMmRiM2I1ZWI2OTU3YTAwNGJi NGNiNTA3ZWQ0NmYwMjlhZjljZWM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9Tb3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQy5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpj L1NvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDLmgKQEAgLTkyLDcgKzkyLDcgQEAgcHJpdmF0ZToK ICAgICB2aXJ0dWFsIGJvb2wgaXNGdWxsKCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIGZs dXNoQW5kRW5xdWV1ZU5vbkRpc3BsYXlpbmdTYW1wbGVzKFZlY3RvcjxSZWZQdHI8TWVkaWFTYW1w bGU+PiwgQXRvbWljU3RyaW5nIHRyYWNrSUQpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBl bnF1ZXVlU2FtcGxlKFBhc3NSZWZQdHI8TWVkaWFTYW1wbGU+LCBBdG9taWNTdHJpbmcgdHJhY2tJ RCkgT1ZFUlJJREU7Ci0gICAgdmlydHVhbCBib29sIGlzUmVhZHlGb3JNb3JlU2FtcGxlcygpIE9W RVJSSURFOworICAgIHZpcnR1YWwgYm9vbCBpc1JlYWR5Rm9yTW9yZVNhbXBsZXMoQXRvbWljU3Ry aW5nIHRyYWNrSUQpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBzZXRBY3RpdmUoYm9vbCkg T1ZFUlJJREU7CiAKICAgICBWZWN0b3I8UmVmUHRyPFZpZGVvVHJhY2tQcml2YXRlPj4gbV92aWRl b1RyYWNrczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL1NvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDLm1tIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvU291cmNlQnVmZmVyUHJp dmF0ZUFWRk9iakMubW0KaW5kZXggYzNiYzc2MmIxZmY3MDUxYmMxYWEyNWRjNDViMzA3YzYxNDA4 NmIwZC4uZWRmYWJjODdhYWVjYmYyOWZiNzU0MWI4NDNiNmFmMzA2MWM1Yzg0MSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvU291 cmNlQnVmZmVyUHJpdmF0ZUFWRk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvU291cmNlQnVmZmVyUHJpdmF0ZUFWRk9iakMubW0K QEAgLTQ2OSw3ICs0NjksNyBAQCB2b2lkIFNvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDOjp0cmFj a0RpZENoYW5nZUVuYWJsZWQoVmlkZW9UcmFja1ByaXZhdGVNZWRpYVNvdQogICAgICAgICAgICAg bV9kaXNwbGF5TGF5ZXIgPSBbW2dldEFWU2FtcGxlQnVmZmVyRGlzcGxheUxheWVyQ2xhc3MoKSBh bGxvY10gaW5pdF07CiAgICAgICAgICAgICBbbV9kaXNwbGF5TGF5ZXIgcmVxdWVzdE1lZGlhRGF0 YVdoZW5SZWFkeU9uUXVldWU6ZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSB1c2luZ0Jsb2NrOl57 CiAgICAgICAgICAgICAgICAgaWYgKG1fY2xpZW50KQotICAgICAgICAgICAgICAgICAgICBtX2Ns aWVudC0+c291cmNlQnVmZmVyUHJpdmF0ZURpZEJlY29tZVJlYWR5Rm9yTW9yZVNhbXBsZXModGhp cyk7CisgICAgICAgICAgICAgICAgICAgIG1fY2xpZW50LT5zb3VyY2VCdWZmZXJQcml2YXRlRGlk QmVjb21lUmVhZHlGb3JNb3JlU2FtcGxlcyh0aGlzLCBBdG9taWNTdHJpbmc6Om51bWJlcih0cmFj a0lEKSk7CiAgICAgICAgICAgICB9XTsKICAgICAgICAgICAgIGlmIChtX21lZGlhU291cmNlKQog ICAgICAgICAgICAgICAgIG1fbWVkaWFTb3VyY2UtPnBsYXllcigpLT5hZGREaXNwbGF5TGF5ZXIo bV9kaXNwbGF5TGF5ZXIuZ2V0KCkpOwpAQCAtNTM4LDggKzUzOCw5IEBAIHZvaWQgU291cmNlQnVm ZmVyUHJpdmF0ZUFWRk9iakM6OmVucXVldWVTYW1wbGUoUGFzc1JlZlB0cjxNZWRpYVNhbXBsZT4g cHJwTWVkaWFTCiAgICAgICAgIG1fbWVkaWFTb3VyY2UtPnBsYXllcigpLT5zZXRIYXNBdmFpbGFi bGVWaWRlb0ZyYW1lKHRydWUpOwogfQogCi1ib29sIFNvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpD Ojppc1JlYWR5Rm9yTW9yZVNhbXBsZXMoKQorYm9vbCBTb3VyY2VCdWZmZXJQcml2YXRlQVZGT2Jq Qzo6aXNSZWFkeUZvck1vcmVTYW1wbGVzKEF0b21pY1N0cmluZyB0cmFja0lEKQogeworICAgIFVO VVNFRF9QQVJBTSh0cmFja0lEKTsKICAgICByZXR1cm4gW21fZGlzcGxheUxheWVyIGlzUmVhZHlG b3JNb3JlTWVkaWFEYXRhXTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbW9jay9tZWRpYXNvdXJjZS9Nb2NrU291cmNlQnVmZmVyUHJpdmF0ZS5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbW9jay9tZWRpYXNvdXJjZS9Nb2NrU291cmNlQnVmZmVyUHJpdmF0ZS5o CmluZGV4IDA2ZDJmNDQ1MGUxYjYxNjc3NjcwNWM1ZDZiMjYyNWM0YmI0NWIwNDQuLjk3MzMwZGVk N2IxYWQwZDUwOWE2MjdhZDc4NjU4Y2RjZDExY2MyMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21vY2svbWVkaWFzb3VyY2UvTW9ja1NvdXJjZUJ1ZmZlclByaXZhdGUuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL21lZGlhc291cmNlL01vY2tTb3VyY2VC dWZmZXJQcml2YXRlLmgKQEAgLTczLDcgKzczLDcgQEAgcHJpdmF0ZToKIAogICAgIHZpcnR1YWwg dm9pZCBmbHVzaEFuZEVucXVldWVOb25EaXNwbGF5aW5nU2FtcGxlcyhWZWN0b3I8UmVmUHRyPE1l ZGlhU2FtcGxlPj4sIEF0b21pY1N0cmluZykgT1ZFUlJJREUgeyB9CiAgICAgdmlydHVhbCB2b2lk IGVucXVldWVTYW1wbGUoUGFzc1JlZlB0cjxNZWRpYVNhbXBsZT4sIEF0b21pY1N0cmluZykgT1ZF UlJJREU7Ci0gICAgdmlydHVhbCBib29sIGlzUmVhZHlGb3JNb3JlU2FtcGxlcygpIE9WRVJSSURF IHsgcmV0dXJuIHRydWU7IH0KKyAgICB2aXJ0dWFsIGJvb2wgaXNSZWFkeUZvck1vcmVTYW1wbGVz KEF0b21pY1N0cmluZykgT1ZFUlJJREUgeyByZXR1cm4gdHJ1ZTsgfQogICAgIHZpcnR1YWwgdm9p ZCBzZXRBY3RpdmUoYm9vbCkgT1ZFUlJJREU7CiAKICAgICB2b2lkIGRpZFJlY2VpdmVJbml0aWFs aXphdGlvblNlZ21lbnQoY29uc3QgTW9ja0luaXRpYWxpemF0aW9uQm94Jik7Cg==