85798 2012-05-07 06:23:29 -0700 MediaStream API: Allow UserMediaRequest::succeed to take an MediaStreamDescriptor 2012-05-07 10:31:36 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 56459 1 tommyw tommyw abarth dglazkov eric.carlson feature-media-reviews fishd jamesr tkent+wkapi webkit.review.bot oldest_to_newest 617562 0 tommyw 2012-05-07 06:23:29 -0700 Adding another UserMediaRequest::succeed function that takes an MediaStreamDescriptor instead of the two MediaStreamSource arrays. 617563 1 140519 tommyw 2012-05-07 06:30:35 -0700 Created attachment 140519 Patch 617565 2 webkit.review.bot 2012-05-07 06:33:48 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 617616 3 140531 tommyw 2012-05-07 08:35:58 -0700 Created attachment 140531 Patch 617692 4 140531 webkit.review.bot 2012-05-07 10:31:27 -0700 Comment on attachment 140531 Patch Clearing flags on attachment: 140531 Committed r116317: <http://trac.webkit.org/changeset/116317> 617693 5 webkit.review.bot 2012-05-07 10:31:36 -0700 All reviewed patches have been landed. Closing bug. 140519 2012-05-07 06:30:35 -0700 2012-05-07 08:35:50 -0700 Patch bug-85798-20120507153032.patch text/plain 9952 tommyw U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2MjgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCBiYjIxYzljODYzMzU3 ZjI2NDljNDYzOTVhODNkNTQ3NDg0NjRkMjc3Li42MTRjNDgwMDY4ZTBlZGM1ZmU3MWE1OTczOGJh YWQyNjZjMDNjNGIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0wNS0wNyAg VG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4KKworICAgICAgICBNZWRpYVN0 cmVhbSBBUEk6IEFsbG93IFVzZXJNZWRpYVJlcXVlc3Q6OnN1Y2NlZWQgdG8gdGFrZSBhbiBNZWRp YVN0cmVhbURlc2NyaXB0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTg1Nzk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkaW5nIGFub3RoZXIgVXNlck1lZGlhUmVxdWVzdDo6c3VjY2VlZCBmdW5jdGlv biB0aGF0IHRha2VzIGFuIE1lZGlhU3RyZWFtRGVzY3JpcHRvcgorICAgICAgICBpbnN0ZWFkIG9m IHRoZSB0d28gTWVkaWFTdHJlYW1Tb3VyY2UgYXJyYXlzLgorCisgICAgICAgICogY2hyb21pdW0v cHVibGljL1dlYk1lZGlhU3RyZWFtQ2VudGVyLmg6CisgICAgICAgIChXZWJNZWRpYVN0cmVhbUNl bnRlcik6CisgICAgICAgIChXZWJLaXQ6OldlYk1lZGlhU3RyZWFtQ2VudGVyOjpjb25zdHJ1Y3RT RFApOgorCiAyMDEyLTA1LTA0ICBUb21teSBXaWRlbmZseWNodCAgPHRvbW15d0Bnb29nbGUuY29t PgogCiAgICAgICAgIE1lZGlhU3RyZWFtIEFQSTogTWFrZSBQZWVyQ29ubmVjdGlvbjAwJ3MgQVBJ IGZ1bGx5IGNvbXBsaWFudCB3aXRoIHRoZSBkcmFmdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGQ1OTYwOTE0ZTZk YzcyOWFhY2FhZjU4YTAwNjBiZjMwZmU2YTFiYzUuLjYzMTQxZTUyMWZiMWIxNjYzZjNiZmZhZTMx ZjY4MzliNDg0MDkzODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxMi0wNS0wNyAg VG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4KKworICAgICAgICBNZWRpYVN0 cmVhbSBBUEk6IEFsbG93IFVzZXJNZWRpYVJlcXVlc3Q6OnN1Y2NlZWQgdG8gdGFrZSBhbiBNZWRp YVN0cmVhbURlc2NyaXB0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTg1Nzk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkaW5nIGFub3RoZXIgVXNlck1lZGlhUmVxdWVzdDo6c3VjY2VlZCBmdW5jdGlv biB0aGF0IHRha2VzIGFuIE1lZGlhU3RyZWFtRGVzY3JpcHRvcgorICAgICAgICBpbnN0ZWFkIG9m IHRoZSB0d28gTWVkaWFTdHJlYW1Tb3VyY2UgYXJyYXlzLgorCisgICAgICAgIE5vdCBjdXJyZW50 bHkgdGVzdGFibGUuCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL0xvY2FsTWVkaWFT dHJlYW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TG9jYWxNZWRpYVN0cmVhbTo6Y3JlYXRlKToK KyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6TG9jYWxNZWRpYVN0cmVhbTo6 TG9jYWxNZWRpYVN0cmVhbSk6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9Mb2NhbE1l ZGlhU3RyZWFtLmg6CisgICAgICAgIChMb2NhbE1lZGlhU3RyZWFtKToKKyAgICAgICAgKiBNb2R1 bGVzL21lZGlhc3RyZWFtL1VzZXJNZWRpYVJlcXVlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 VXNlck1lZGlhUmVxdWVzdDo6c3VjY2VlZCk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAg KiBNb2R1bGVzL21lZGlhc3RyZWFtL1VzZXJNZWRpYVJlcXVlc3QuaDoKKyAgICAgICAgKFdlYkNv cmUpOgorICAgICAgICAoVXNlck1lZGlhUmVxdWVzdCk6CisKIDIwMTItMDUtMDYgIEtpbnVrbyBZ YXN1ZGEgIDxraW51a29AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIENsZWFudXA6IE1vdmUgRmls ZVN5c3RlbSBBUEkgdHlwZSBkZWZpbml0aW9ucyBpbnRvIGEgc2VwYXJhdGUgaGVhZGVyIGZpbGUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggNmQxODZjOGE1NDZjYTA1NjAxNGFjM2Y4MWU4 OWE0MTBlYTEzOWFlYS4uZjRkYzQ0MmU4OWRiMjRhMDQ5NzE4MDgzODRiYjQyNGZlOGVkMjc4ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMi0wNS0wNyAg VG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4KKworICAgICAgICBNZWRpYVN0 cmVhbSBBUEk6IEFsbG93IFVzZXJNZWRpYVJlcXVlc3Q6OnN1Y2NlZWQgdG8gdGFrZSBhbiBNZWRp YVN0cmVhbURlc2NyaXB0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTg1Nzk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkaW5nIGFub3RoZXIgV2ViVXNlck1lZGlhUmVxdWVzdDo6cmVxdWVzdFN1Y2Nl ZWQgZnVuY3Rpb24gdGhhdCB0YWtlcyBhbgorICAgICAgICBXZWJNZWRpYVN0cmVhbURlc2NyaXB0 b3IgaW5zdGVhZCBvZiB0aGUgdHdvIFdlYk1lZGlhU3RyZWFtU291cmNlIGFycmF5cy4KKworICAg ICAgICAqIHB1YmxpYy9XZWJVc2VyTWVkaWFSZXF1ZXN0Lmg6CisgICAgICAgIChXZWJLaXQpOgor ICAgICAgICAoV2ViVXNlck1lZGlhUmVxdWVzdCk6CisgICAgICAgICogc3JjL1dlYlVzZXJNZWRp YVJlcXVlc3QuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJVc2VyTWVkaWFSZXF1ZXN0OjpyZXF1 ZXN0U3VjY2VlZGVkKToKKwogMjAxMi0wNS0wNiAgS2ludWtvIFlhc3VkYSAgPGtpbnVrb0BjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgQ2xlYW51cDogTW92ZSBGaWxlU3lzdGVtIEFQSSB0eXBlIGRl ZmluaXRpb25zIGludG8gYSBzZXBhcmF0ZSBoZWFkZXIgZmlsZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9Mb2NhbE1lZGlhU3RyZWFtLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTG9jYWxNZWRpYVN0cmVhbS5jcHAKaW5kZXgg NzYyNjUxOTFjMjRlYjg3YWUyN2I2N2Y4NDdmY2M4ODVkMmRjZTY2Zi4uZWNhMTFmNWI5YTM2MDFk NDZhNzM1NGJhZjE3ZmQyYTY0ZjY5M2E0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXN0cmVhbS9Mb2NhbE1lZGlhU3RyZWFtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc3RyZWFtL0xvY2FsTWVkaWFTdHJlYW0uY3BwCkBAIC0zNSwxMyArMzUs MTggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBQYXNzUmVmUHRyPExvY2FsTWVkaWFTdHJlYW0+ IExvY2FsTWVkaWFTdHJlYW06OmNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0 LCBjb25zdCBNZWRpYVN0cmVhbVNvdXJjZVZlY3RvciYgYXVkaW9Tb3VyY2VzLCBjb25zdCBNZWRp YVN0cmVhbVNvdXJjZVZlY3RvciYgdmlkZW9Tb3VyY2VzKQogewotICAgIFJlZlB0cjxMb2NhbE1l ZGlhU3RyZWFtPiBzdHJlYW0gPSBhZG9wdFJlZihuZXcgTG9jYWxNZWRpYVN0cmVhbShjb250ZXh0 LCBhdWRpb1NvdXJjZXMsIHZpZGVvU291cmNlcykpOworICAgIFJlZlB0cjxMb2NhbE1lZGlhU3Ry ZWFtPiBzdHJlYW0gPSBhZG9wdFJlZihuZXcgTG9jYWxNZWRpYVN0cmVhbShjb250ZXh0LCBNZWRp YVN0cmVhbURlc2NyaXB0b3I6OmNyZWF0ZShjcmVhdGVDYW5vbmljYWxVVUlEU3RyaW5nKCksIGF1 ZGlvU291cmNlcywgdmlkZW9Tb3VyY2VzKSkpOwogICAgIHN0cmVhbS0+c3VzcGVuZElmTmVlZGVk KCk7CiAgICAgcmV0dXJuIHN0cmVhbS5yZWxlYXNlKCk7CiB9CiAKLUxvY2FsTWVkaWFTdHJlYW06 OkxvY2FsTWVkaWFTdHJlYW0oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgY29uc3Qg TWVkaWFTdHJlYW1Tb3VyY2VWZWN0b3ImIGF1ZGlvU291cmNlcywgY29uc3QgTWVkaWFTdHJlYW1T b3VyY2VWZWN0b3ImIHZpZGVvU291cmNlcykKLSAgICA6IE1lZGlhU3RyZWFtKGNvbnRleHQsIE1l ZGlhU3RyZWFtRGVzY3JpcHRvcjo6Y3JlYXRlKGNyZWF0ZUNhbm9uaWNhbFVVSURTdHJpbmcoKSwg YXVkaW9Tb3VyY2VzLCB2aWRlb1NvdXJjZXMpKQorUGFzc1JlZlB0cjxMb2NhbE1lZGlhU3RyZWFt PiBMb2NhbE1lZGlhU3RyZWFtOjpjcmVhdGUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4 dCwgUGFzc1JlZlB0cjxNZWRpYVN0cmVhbURlc2NyaXB0b3I+IHN0cmVhbURlc2NyaXB0b3IpCit7 CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBMb2NhbE1lZGlhU3RyZWFtKGNvbnRleHQsIHN0cmVh bURlc2NyaXB0b3IpKTsKK30KKworTG9jYWxNZWRpYVN0cmVhbTo6TG9jYWxNZWRpYVN0cmVhbShT Y3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBQYXNzUmVmUHRyPE1lZGlhU3RyZWFtRGVz Y3JpcHRvcj4gc3RyZWFtRGVzY3JpcHRvcikKKyAgICA6IE1lZGlhU3RyZWFtKGNvbnRleHQsIHN0 cmVhbURlc2NyaXB0b3IpCiB7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzdHJlYW0vTG9jYWxNZWRpYVN0cmVhbS5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXN0cmVhbS9Mb2NhbE1lZGlhU3RyZWFtLmgKaW5kZXggNzc3MDMyMDRkNWQ2YmU4ZDdi MDlmMmE1ZGIxNTI4ODZjZWQ4YWZkNy4uMDA2OTA1NzkzMTkxYzU1YTNjOWVhMjZmYTg5MzlmMmJj ZDU2ZmEyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9M b2NhbE1lZGlhU3RyZWFtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVh bS9Mb2NhbE1lZGlhU3RyZWFtLmgKQEAgLTM1LDYgKzM1LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogY2xhc3MgTG9jYWxNZWRpYVN0cmVhbSA6IHB1YmxpYyBNZWRpYVN0cmVhbSB7CiBwdWJsaWM6 CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8TG9jYWxNZWRpYVN0cmVhbT4gY3JlYXRlKFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQqLCBjb25zdCBNZWRpYVN0cmVhbVNvdXJjZVZlY3RvciYgYXVkaW9Tb3Vy Y2VzLCBjb25zdCBNZWRpYVN0cmVhbVNvdXJjZVZlY3RvciYgdmlkZW9Tb3VyY2VzKTsKKyAgICBz dGF0aWMgUGFzc1JlZlB0cjxMb2NhbE1lZGlhU3RyZWFtPiBjcmVhdGUoU2NyaXB0RXhlY3V0aW9u Q29udGV4dCosIFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1EZXNjcmlwdG9yPik7CiAgICAgdmlydHVh bCB+TG9jYWxNZWRpYVN0cmVhbSgpOwogCiAgICAgdm9pZCBzdG9wRnVuY3Rpb24oKTsKQEAgLTQ2 LDcgKzQ3LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgY29uc3QgQXRvbWljU3RyaW5nJiBpbnRl cmZhY2VOYW1lKCkgY29uc3QgT1ZFUlJJREU7CiAKIHByaXZhdGU6Ci0gICAgTG9jYWxNZWRpYVN0 cmVhbShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgY29uc3QgTWVkaWFTdHJlYW1Tb3VyY2VWZWN0 b3ImIGF1ZGlvU291cmNlcywgY29uc3QgTWVkaWFTdHJlYW1Tb3VyY2VWZWN0b3ImIHZpZGVvU291 cmNlcyk7CisgICAgTG9jYWxNZWRpYVN0cmVhbShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgUGFz c1JlZlB0cjxNZWRpYVN0cmVhbURlc2NyaXB0b3I+KTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdl YkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vVXNl ck1lZGlhUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1Vz ZXJNZWRpYVJlcXVlc3QuY3BwCmluZGV4IGU2MTk1NjE4MGYwZTE3MjMzMjI3NDVjYjAzYWVjNjdk Y2EwNTNiYTMuLjYzZDAyZTI5ZjczYzMyYjE3ZDQwMzBkYWI2NDdjOGEzM2EzMzlhYWYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vVXNlck1lZGlhUmVxdWVz dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9Vc2VyTWVkaWFS ZXF1ZXN0LmNwcApAQCAtMzgsNiArMzgsNyBAQAogI2luY2x1ZGUgIkRpY3Rpb25hcnkuaCIKICNp bmNsdWRlICJMb2NhbE1lZGlhU3RyZWFtLmgiCiAjaW5jbHVkZSAiTWVkaWFTdHJlYW1DZW50ZXIu aCIKKyNpbmNsdWRlICJNZWRpYVN0cmVhbURlc2NyaXB0b3IuaCIKICNpbmNsdWRlICJTcGFjZVNw bGl0U3RyaW5nLmgiCiAjaW5jbHVkZSAiVXNlck1lZGlhQ29udHJvbGxlci5oIgogCkBAIC04OCw2 ICs4OSwxNSBAQCB2b2lkIFVzZXJNZWRpYVJlcXVlc3Q6OnN1Y2NlZWQoY29uc3QgTWVkaWFTdHJl YW1Tb3VyY2VWZWN0b3ImIGF1ZGlvU291cmNlcywgY29ucwogICAgIG1fc3VjY2Vzc0NhbGxiYWNr LT5oYW5kbGVFdmVudChzdHJlYW0uZ2V0KCkpOwogfQogCit2b2lkIFVzZXJNZWRpYVJlcXVlc3Q6 OnN1Y2NlZWQoUGFzc1JlZlB0cjxNZWRpYVN0cmVhbURlc2NyaXB0b3I+IHN0cmVhbURlc2NyaXB0 b3IpCit7CisgICAgaWYgKCFtX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQpCisgICAgICAgIHJldHVy bjsKKworICAgIFJlZlB0cjxMb2NhbE1lZGlhU3RyZWFtPiBzdHJlYW0gPSBMb2NhbE1lZGlhU3Ry ZWFtOjpjcmVhdGUobV9zY3JpcHRFeGVjdXRpb25Db250ZXh0LCBzdHJlYW1EZXNjcmlwdG9yKTsK KyAgICBtX3N1Y2Nlc3NDYWxsYmFjay0+aGFuZGxlRXZlbnQoc3RyZWFtLmdldCgpKTsKK30KKwog dm9pZCBVc2VyTWVkaWFSZXF1ZXN0OjpmYWlsKCkKIHsKICAgICBpZiAoIW1fc2NyaXB0RXhlY3V0 aW9uQ29udGV4dCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJl YW0vVXNlck1lZGlhUmVxdWVzdC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVh bS9Vc2VyTWVkaWFSZXF1ZXN0LmgKaW5kZXggN2NiY2U1OTRjZGI1NDNjZjc3NmM3NGE2NTlkMmRh YmU2OTJlNzUxNy4uODdjYTg5YjdjYzY0YmM5OTNkNGRkZTAzNzlmMWY1N2I2ZmIwNmY3MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9Vc2VyTWVkaWFSZXF1 ZXN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9Vc2VyTWVkaWFS ZXF1ZXN0LmgKQEAgLTQ1LDYgKzQ1LDcgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3Mg RGljdGlvbmFyeTsKK2NsYXNzIE1lZGlhU3RyZWFtRGVzY3JpcHRvcjsKIGNsYXNzIFVzZXJNZWRp YUNvbnRyb2xsZXI7CiAKIGNsYXNzIFVzZXJNZWRpYVJlcXVlc3QgOiBwdWJsaWMgTWVkaWFTdHJl YW1Tb3VyY2VzUXVlcnlDbGllbnQsIHB1YmxpYyBDb250ZXh0RGVzdHJ1Y3Rpb25PYnNlcnZlciB7 CkBAIC01OCw2ICs1OSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHN0YXJ0KCk7CiAKICAgICB2b2lk IHN1Y2NlZWQoY29uc3QgTWVkaWFTdHJlYW1Tb3VyY2VWZWN0b3ImIGF1ZGlvU291cmNlcywgY29u c3QgTWVkaWFTdHJlYW1Tb3VyY2VWZWN0b3ImIHZpZGVvU291cmNlcyk7CisgICAgdm9pZCBzdWNj ZWVkKFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1EZXNjcmlwdG9yPik7CiAgICAgdm9pZCBmYWlsKCk7 CiAKICAgICAvLyBNZWRpYVN0cmVhbVNvdXJjZXNRdWVyeUNsaWVudApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVXNlck1lZGlhUmVxdWVzdC5oIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVXNlck1lZGlhUmVxdWVzdC5oCmluZGV4IDU0YjUz NGU3YjJkZDc4YTg5MmQxZGQyMTFiN2VjNjRiYjZlZjM1YjkuLjU0OTQ5NDA3ZjcwNWUxN2VmMDBh MTkwYzc3YjM5NjAxNzEzYzEyMjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYlVzZXJNZWRpYVJlcXVlc3QuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJVc2VyTWVkaWFSZXF1ZXN0LmgKQEAgLTQxLDYgKzQxLDcgQEAgY2xhc3MgVXNl ck1lZGlhUmVxdWVzdDsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKK2NsYXNzIFdlYk1lZGlhU3Ry ZWFtRGVzY3JpcHRvcjsKIGNsYXNzIFdlYk1lZGlhU3RyZWFtU291cmNlOwogY2xhc3MgV2ViU3Ry aW5nOwogdGVtcGxhdGUgPHR5cGVuYW1lIFQ+IGNsYXNzIFdlYlZlY3RvcjsKQEAgLTY3LDcgKzY4 LDExIEBAIHB1YmxpYzoKIAogICAgIFdFQktJVF9FWFBPUlQgV2ViU2VjdXJpdHlPcmlnaW4gc2Vj dXJpdHlPcmlnaW4oKSBjb25zdDsKIAorICAgIC8vIERFUFJFQ0FURUQKICAgICBXRUJLSVRfRVhQ T1JUIHZvaWQgcmVxdWVzdFN1Y2NlZWRlZChjb25zdCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJlYW1T b3VyY2U+JiBhdWRpb1NvdXJjZXMsIGNvbnN0IFdlYlZlY3RvcjxXZWJNZWRpYVN0cmVhbVNvdXJj ZT4mIHZpZGVvU291cmNlcyk7CisKKyAgICBXRUJLSVRfRVhQT1JUIHZvaWQgcmVxdWVzdFN1Y2Nl ZWRlZChjb25zdCBXZWJNZWRpYVN0cmVhbURlc2NyaXB0b3ImKTsKKwogICAgIFdFQktJVF9FWFBP UlQgdm9pZCByZXF1ZXN0RmFpbGVkKCk7CiAKICNpZiBXRUJLSVRfSU1QTEVNRU5UQVRJT04KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlVzZXJNZWRpYVJlcXVlc3Qu Y3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVXNlck1lZGlhUmVxdWVzdC5jcHAK aW5kZXggZGNkMjcwMzg1YWEzYjUxODFiZDQwNDM1MWZlNzg1Zjk2NzQ0OGVhYy4uNzE4ZWQyYmY1 YmI5ZWJjODJlNDgwZGM4ODRiZmIxMmE2MjNlZThlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViVXNlck1lZGlhUmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViVXNlck1lZGlhUmVxdWVzdC5jcHAKQEAgLTM2LDExICszNiwxMyBA QAogCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJGcmFtZS5oIgorI2luY2x1ZGUg Ik1lZGlhU3RyZWFtRGVzY3JpcHRvci5oIgogI2luY2x1ZGUgIk1lZGlhU3RyZWFtU291cmNlLmgi CiAjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luLmgiCiAjaW5jbHVk ZSAiVXNlck1lZGlhUmVxdWVzdC5oIgogI2luY2x1ZGUgIldlYlNlY3VyaXR5T3JpZ2luLmgiCisj aW5jbHVkZSAicGxhdGZvcm0vV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmgiCiAjaW5jbHVkZSAi cGxhdGZvcm0vV2ViTWVkaWFTdHJlYW1Tb3VyY2UuaCIKICNpbmNsdWRlICJwbGF0Zm9ybS9XZWJT dHJpbmcuaCIKICNpbmNsdWRlICJwbGF0Zm9ybS9XZWJWZWN0b3IuaCIKQEAgLTk1LDYgKzk3LDE1 IEBAIHZvaWQgV2ViVXNlck1lZGlhUmVxdWVzdDo6cmVxdWVzdFN1Y2NlZWRlZChjb25zdCBXZWJW ZWN0b3I8V2ViTWVkaWFTdHJlYW1Tb3VyY2U+CiAgICAgbV9wcml2YXRlLT5zdWNjZWVkKGF1ZGlv LCB2aWRlbyk7CiB9CiAKK3ZvaWQgV2ViVXNlck1lZGlhUmVxdWVzdDo6cmVxdWVzdFN1Y2NlZWRl ZChjb25zdCBXZWJNZWRpYVN0cmVhbURlc2NyaXB0b3ImIHN0cmVhbURlc2NyaXB0b3IpCit7Cisg ICAgQVNTRVJUKCFzdHJlYW1EZXNjcmlwdG9yLmlzTnVsbCgpKTsKKyAgICBpZiAobV9wcml2YXRl LmlzTnVsbCgpKQorICAgICAgICByZXR1cm47CisKKyAgICBtX3ByaXZhdGUtPnN1Y2NlZWQoc3Ry ZWFtRGVzY3JpcHRvcik7Cit9CisKIHZvaWQgV2ViVXNlck1lZGlhUmVxdWVzdDo6cmVxdWVzdEZh aWxlZCgpCiB7CiAgICAgbV9wcml2YXRlLT5mYWlsKCk7Cg== 140531 2012-05-07 08:35:58 -0700 2012-05-07 10:31:27 -0700 Patch bug-85798-20120507173556.patch text/plain 9845 tommyw U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2MzEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCBiYjIxYzljODYzMzU3 ZjI2NDljNDYzOTVhODNkNTQ3NDg0NjRkMjc3Li42MTRjNDgwMDY4ZTBlZGM1ZmU3MWE1OTczOGJh YWQyNjZjMDNjNGIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0wNS0wNyAg VG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4KKworICAgICAgICBNZWRpYVN0 cmVhbSBBUEk6IEFsbG93IFVzZXJNZWRpYVJlcXVlc3Q6OnN1Y2NlZWQgdG8gdGFrZSBhbiBNZWRp YVN0cmVhbURlc2NyaXB0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTg1Nzk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkaW5nIGFub3RoZXIgVXNlck1lZGlhUmVxdWVzdDo6c3VjY2VlZCBmdW5jdGlv biB0aGF0IHRha2VzIGFuIE1lZGlhU3RyZWFtRGVzY3JpcHRvcgorICAgICAgICBpbnN0ZWFkIG9m IHRoZSB0d28gTWVkaWFTdHJlYW1Tb3VyY2UgYXJyYXlzLgorCisgICAgICAgICogY2hyb21pdW0v cHVibGljL1dlYk1lZGlhU3RyZWFtQ2VudGVyLmg6CisgICAgICAgIChXZWJNZWRpYVN0cmVhbUNl bnRlcik6CisgICAgICAgIChXZWJLaXQ6OldlYk1lZGlhU3RyZWFtQ2VudGVyOjpjb25zdHJ1Y3RT RFApOgorCiAyMDEyLTA1LTA0ICBUb21teSBXaWRlbmZseWNodCAgPHRvbW15d0Bnb29nbGUuY29t PgogCiAgICAgICAgIE1lZGlhU3RyZWFtIEFQSTogTWFrZSBQZWVyQ29ubmVjdGlvbjAwJ3MgQVBJ IGZ1bGx5IGNvbXBsaWFudCB3aXRoIHRoZSBkcmFmdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGI4NWQwNDkzYzMw MDMzNzE1MzkzMWNhODYxM2U4NWVmMTI0NDcyZTAuLjAzZjdhYTY0MWIwNzU4MWExNDRlN2QxMmY1 NGZjZDExY2NjN2IxNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxMi0wNS0wNyAg VG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4KKworICAgICAgICBNZWRpYVN0 cmVhbSBBUEk6IEFsbG93IFVzZXJNZWRpYVJlcXVlc3Q6OnN1Y2NlZWQgdG8gdGFrZSBhbiBNZWRp YVN0cmVhbURlc2NyaXB0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTg1Nzk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkaW5nIGFub3RoZXIgVXNlck1lZGlhUmVxdWVzdDo6c3VjY2VlZCBmdW5jdGlv biB0aGF0IHRha2VzIGFuIE1lZGlhU3RyZWFtRGVzY3JpcHRvcgorICAgICAgICBpbnN0ZWFkIG9m IHRoZSB0d28gTWVkaWFTdHJlYW1Tb3VyY2UgYXJyYXlzLgorCisgICAgICAgIE5vdCBjdXJyZW50 bHkgdGVzdGFibGUuCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL0xvY2FsTWVkaWFT dHJlYW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TG9jYWxNZWRpYVN0cmVhbTo6Y3JlYXRlKToK KyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6TG9jYWxNZWRpYVN0cmVhbTo6 TG9jYWxNZWRpYVN0cmVhbSk6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9Mb2NhbE1l ZGlhU3RyZWFtLmg6CisgICAgICAgIChMb2NhbE1lZGlhU3RyZWFtKToKKyAgICAgICAgKiBNb2R1 bGVzL21lZGlhc3RyZWFtL1VzZXJNZWRpYVJlcXVlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 VXNlck1lZGlhUmVxdWVzdDo6c3VjY2VlZCk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAg KiBNb2R1bGVzL21lZGlhc3RyZWFtL1VzZXJNZWRpYVJlcXVlc3QuaDoKKyAgICAgICAgKFdlYkNv cmUpOgorICAgICAgICAoVXNlck1lZGlhUmVxdWVzdCk6CisKIDIwMTItMDUtMDcgIEFkYW0gQmVy Z2t2aXN0ICA8YWRhbS5iZXJna3Zpc3RAZXJpY3Nzb24uY29tPgogCiAgICAgICAgIE1lZGlhU3Ry ZWFtIHNob3VsZCBub3QgYmUgYW4gQWN0aXZlRE9NT2JqZWN0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCmluZGV4IDc3MzE2NWYzNDI4YTk4MzgxMGFjOWU3OWZiMDI0ZjMxMjViY2ZlY2EuLjEyN2Mz OWE1MDc2M2FkZjg2YmYzMmE4ZWI1ZDIyMjE4ZDlmM2YxYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTItMDUtMDcgIFRvbW15IFdpZGVuZmx5Y2h0ICA8 dG9tbXl3QGdvb2dsZS5jb20+CisKKyAgICAgICAgTWVkaWFTdHJlYW0gQVBJOiBBbGxvdyBVc2Vy TWVkaWFSZXF1ZXN0OjpzdWNjZWVkIHRvIHRha2UgYW4gTWVkaWFTdHJlYW1EZXNjcmlwdG9yCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTc5OAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGluZyBhbm90 aGVyIFdlYlVzZXJNZWRpYVJlcXVlc3Q6OnJlcXVlc3RTdWNjZWVkIGZ1bmN0aW9uIHRoYXQgdGFr ZXMgYW4KKyAgICAgICAgV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yIGluc3RlYWQgb2YgdGhlIHR3 byBXZWJNZWRpYVN0cmVhbVNvdXJjZSBhcnJheXMuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViVXNl ck1lZGlhUmVxdWVzdC5oOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYlVzZXJNZWRp YVJlcXVlc3QpOgorICAgICAgICAqIHNyYy9XZWJVc2VyTWVkaWFSZXF1ZXN0LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViVXNlck1lZGlhUmVxdWVzdDo6cmVxdWVzdFN1Y2NlZWRlZCk6CisKIDIw MTItMDUtMDcgIEtpbnVrbyBZYXN1ZGEgIDxraW51a29AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFVucmV2aWV3ZWQ6IHRoZSBzYW1lIGZpeCBpbiBhbm90aGVyIGZpbGUgZm9yIGNocm9taXVtIHdp biBidWlsZC4gIEFkZGluZyBXZWJDb3JlIG5hbWVzcGFjZSB0byBGaWxlU3lzdGVtVHlwZXMuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL0xvY2FsTWVkaWFT dHJlYW0uY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9Mb2NhbE1lZGlh U3RyZWFtLmNwcAppbmRleCBjY2IwZGQwOWRhN2RiM2FkZWRlODM3MjFmYTM1YzcxMGYyMGY1OWE3 Li45YmQ2MmVhMzkwY2U4YzNmNjgxYjAwNGI0NjRhOWJhZjFlMzdjMTE1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL0xvY2FsTWVkaWFTdHJlYW0uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTG9jYWxNZWRpYVN0cmVhbS5j cHAKQEAgLTM1LDExICszNSwxNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIFBhc3NSZWZQdHI8 TG9jYWxNZWRpYVN0cmVhbT4gTG9jYWxNZWRpYVN0cmVhbTo6Y3JlYXRlKFNjcmlwdEV4ZWN1dGlv bkNvbnRleHQqIGNvbnRleHQsIGNvbnN0IE1lZGlhU3RyZWFtU291cmNlVmVjdG9yJiBhdWRpb1Nv dXJjZXMsIGNvbnN0IE1lZGlhU3RyZWFtU291cmNlVmVjdG9yJiB2aWRlb1NvdXJjZXMpCiB7Ci0g ICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBMb2NhbE1lZGlhU3RyZWFtKGNvbnRleHQsIGF1ZGlvU291 cmNlcywgdmlkZW9Tb3VyY2VzKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBMb2NhbE1lZGlh U3RyZWFtKGNvbnRleHQsIE1lZGlhU3RyZWFtRGVzY3JpcHRvcjo6Y3JlYXRlKGNyZWF0ZUNhbm9u aWNhbFVVSURTdHJpbmcoKSwgYXVkaW9Tb3VyY2VzLCB2aWRlb1NvdXJjZXMpKSk7CiB9CiAKLUxv Y2FsTWVkaWFTdHJlYW06OkxvY2FsTWVkaWFTdHJlYW0oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCog Y29udGV4dCwgY29uc3QgTWVkaWFTdHJlYW1Tb3VyY2VWZWN0b3ImIGF1ZGlvU291cmNlcywgY29u c3QgTWVkaWFTdHJlYW1Tb3VyY2VWZWN0b3ImIHZpZGVvU291cmNlcykKLSAgICA6IE1lZGlhU3Ry ZWFtKGNvbnRleHQsIE1lZGlhU3RyZWFtRGVzY3JpcHRvcjo6Y3JlYXRlKGNyZWF0ZUNhbm9uaWNh bFVVSURTdHJpbmcoKSwgYXVkaW9Tb3VyY2VzLCB2aWRlb1NvdXJjZXMpKQorUGFzc1JlZlB0cjxM b2NhbE1lZGlhU3RyZWFtPiBMb2NhbE1lZGlhU3RyZWFtOjpjcmVhdGUoU2NyaXB0RXhlY3V0aW9u Q29udGV4dCogY29udGV4dCwgUGFzc1JlZlB0cjxNZWRpYVN0cmVhbURlc2NyaXB0b3I+IHN0cmVh bURlc2NyaXB0b3IpCit7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBMb2NhbE1lZGlhU3RyZWFt KGNvbnRleHQsIHN0cmVhbURlc2NyaXB0b3IpKTsKK30KKworTG9jYWxNZWRpYVN0cmVhbTo6TG9j YWxNZWRpYVN0cmVhbShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBQYXNzUmVmUHRy PE1lZGlhU3RyZWFtRGVzY3JpcHRvcj4gc3RyZWFtRGVzY3JpcHRvcikKKyAgICA6IE1lZGlhU3Ry ZWFtKGNvbnRleHQsIHN0cmVhbURlc2NyaXB0b3IpCiB7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTG9jYWxNZWRpYVN0cmVhbS5oIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9Mb2NhbE1lZGlhU3RyZWFtLmgKaW5kZXggMzg2 YWIxYjE4NWYyNjUwZjZmOGM2MWUyNDYxYmU0M2M5ZjJmOTc0ZC4uZTc2ZDQzNGYxMjU4Y2NlOGZj MDZiYzI3M2I0NDEwZjlmN2FlYmE0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXN0cmVhbS9Mb2NhbE1lZGlhU3RyZWFtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXN0cmVhbS9Mb2NhbE1lZGlhU3RyZWFtLmgKQEAgLTM1LDYgKzM1LDcgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgTG9jYWxNZWRpYVN0cmVhbSA6IHB1YmxpYyBNZWRpYVN0 cmVhbSB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8TG9jYWxNZWRpYVN0cmVhbT4g Y3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBjb25zdCBNZWRpYVN0cmVhbVNvdXJjZVZl Y3RvciYgYXVkaW9Tb3VyY2VzLCBjb25zdCBNZWRpYVN0cmVhbVNvdXJjZVZlY3RvciYgdmlkZW9T b3VyY2VzKTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxMb2NhbE1lZGlhU3RyZWFtPiBjcmVhdGUo U2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1EZXNjcmlwdG9y Pik7CiAgICAgdmlydHVhbCB+TG9jYWxNZWRpYVN0cmVhbSgpOwogCiAgICAgdm9pZCBzdG9wKCk7 CkBAIC00Myw3ICs0NCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGNvbnN0IEF0b21pY1N0cmlu ZyYgaW50ZXJmYWNlTmFtZSgpIGNvbnN0IE9WRVJSSURFOwogCiBwcml2YXRlOgotICAgIExvY2Fs TWVkaWFTdHJlYW0oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIGNvbnN0IE1lZGlhU3RyZWFtU291 cmNlVmVjdG9yJiBhdWRpb1NvdXJjZXMsIGNvbnN0IE1lZGlhU3RyZWFtU291cmNlVmVjdG9yJiB2 aWRlb1NvdXJjZXMpOworICAgIExvY2FsTWVkaWFTdHJlYW0oU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCosIFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1EZXNjcmlwdG9yPik7CiB9OwogCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3Ry ZWFtL1VzZXJNZWRpYVJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0 cmVhbS9Vc2VyTWVkaWFSZXF1ZXN0LmNwcAppbmRleCBlNjE5NTYxODBmMGUxNzIzMzIyNzQ1Y2Iw M2FlYzY3ZGNhMDUzYmEzLi42M2QwMmUyOWY3M2MzMmIxN2Q0MDMwZGFiNjQ3YzhhMzNhMzM5YWFm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1VzZXJNZWRp YVJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vVXNl ck1lZGlhUmVxdWVzdC5jcHAKQEAgLTM4LDYgKzM4LDcgQEAKICNpbmNsdWRlICJEaWN0aW9uYXJ5 LmgiCiAjaW5jbHVkZSAiTG9jYWxNZWRpYVN0cmVhbS5oIgogI2luY2x1ZGUgIk1lZGlhU3RyZWFt Q2VudGVyLmgiCisjaW5jbHVkZSAiTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmgiCiAjaW5jbHVkZSAi U3BhY2VTcGxpdFN0cmluZy5oIgogI2luY2x1ZGUgIlVzZXJNZWRpYUNvbnRyb2xsZXIuaCIKIApA QCAtODgsNiArODksMTUgQEAgdm9pZCBVc2VyTWVkaWFSZXF1ZXN0OjpzdWNjZWVkKGNvbnN0IE1l ZGlhU3RyZWFtU291cmNlVmVjdG9yJiBhdWRpb1NvdXJjZXMsIGNvbnMKICAgICBtX3N1Y2Nlc3ND YWxsYmFjay0+aGFuZGxlRXZlbnQoc3RyZWFtLmdldCgpKTsKIH0KIAordm9pZCBVc2VyTWVkaWFS ZXF1ZXN0OjpzdWNjZWVkKFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1EZXNjcmlwdG9yPiBzdHJlYW1E ZXNjcmlwdG9yKQoreworICAgIGlmICghbV9zY3JpcHRFeGVjdXRpb25Db250ZXh0KQorICAgICAg ICByZXR1cm47CisKKyAgICBSZWZQdHI8TG9jYWxNZWRpYVN0cmVhbT4gc3RyZWFtID0gTG9jYWxN ZWRpYVN0cmVhbTo6Y3JlYXRlKG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgc3RyZWFtRGVzY3Jp cHRvcik7CisgICAgbV9zdWNjZXNzQ2FsbGJhY2stPmhhbmRsZUV2ZW50KHN0cmVhbS5nZXQoKSk7 Cit9CisKIHZvaWQgVXNlck1lZGlhUmVxdWVzdDo6ZmFpbCgpCiB7CiAgICAgaWYgKCFtX3Njcmlw dEV4ZWN1dGlvbkNvbnRleHQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc3RyZWFtL1VzZXJNZWRpYVJlcXVlc3QuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFzdHJlYW0vVXNlck1lZGlhUmVxdWVzdC5oCmluZGV4IDdjYmNlNTk0Y2RiNTQzY2Y3NzZjNzRh NjU5ZDJkYWJlNjkyZTc1MTcuLjg3Y2E4OWI3Y2M2NGJjOTkzZDRkZGUwMzc5ZjFmNTdiNmZiMDZm NzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vVXNlck1l ZGlhUmVxdWVzdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vVXNl ck1lZGlhUmVxdWVzdC5oCkBAIC00NSw2ICs0NSw3IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK IGNsYXNzIERpY3Rpb25hcnk7CitjbGFzcyBNZWRpYVN0cmVhbURlc2NyaXB0b3I7CiBjbGFzcyBV c2VyTWVkaWFDb250cm9sbGVyOwogCiBjbGFzcyBVc2VyTWVkaWFSZXF1ZXN0IDogcHVibGljIE1l ZGlhU3RyZWFtU291cmNlc1F1ZXJ5Q2xpZW50LCBwdWJsaWMgQ29udGV4dERlc3RydWN0aW9uT2Jz ZXJ2ZXIgewpAQCAtNTgsNiArNTksNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzdGFydCgpOwogCiAg ICAgdm9pZCBzdWNjZWVkKGNvbnN0IE1lZGlhU3RyZWFtU291cmNlVmVjdG9yJiBhdWRpb1NvdXJj ZXMsIGNvbnN0IE1lZGlhU3RyZWFtU291cmNlVmVjdG9yJiB2aWRlb1NvdXJjZXMpOworICAgIHZv aWQgc3VjY2VlZChQYXNzUmVmUHRyPE1lZGlhU3RyZWFtRGVzY3JpcHRvcj4pOwogICAgIHZvaWQg ZmFpbCgpOwogCiAgICAgLy8gTWVkaWFTdHJlYW1Tb3VyY2VzUXVlcnlDbGllbnQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVzZXJNZWRpYVJlcXVlc3QuaCBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVzZXJNZWRpYVJlcXVlc3QuaAppbmRl eCA1NGI1MzRlN2IyZGQ3OGE4OTJkMWRkMjExYjdlYzY0YmI2ZWYzNWI5Li41NDk0OTQwN2Y3MDVl MTdlZjAwYTE5MGM3N2IzOTYwMTcxM2MxMjIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJVc2VyTWVkaWFSZXF1ZXN0LmgKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViVXNlck1lZGlhUmVxdWVzdC5oCkBAIC00MSw2ICs0MSw3IEBAIGNs YXNzIFVzZXJNZWRpYVJlcXVlc3Q7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitjbGFzcyBXZWJN ZWRpYVN0cmVhbURlc2NyaXB0b3I7CiBjbGFzcyBXZWJNZWRpYVN0cmVhbVNvdXJjZTsKIGNsYXNz IFdlYlN0cmluZzsKIHRlbXBsYXRlIDx0eXBlbmFtZSBUPiBjbGFzcyBXZWJWZWN0b3I7CkBAIC02 Nyw3ICs2OCwxMSBAQCBwdWJsaWM6CiAKICAgICBXRUJLSVRfRVhQT1JUIFdlYlNlY3VyaXR5T3Jp Z2luIHNlY3VyaXR5T3JpZ2luKCkgY29uc3Q7CiAKKyAgICAvLyBERVBSRUNBVEVECiAgICAgV0VC S0lUX0VYUE9SVCB2b2lkIHJlcXVlc3RTdWNjZWVkZWQoY29uc3QgV2ViVmVjdG9yPFdlYk1lZGlh U3RyZWFtU291cmNlPiYgYXVkaW9Tb3VyY2VzLCBjb25zdCBXZWJWZWN0b3I8V2ViTWVkaWFTdHJl YW1Tb3VyY2U+JiB2aWRlb1NvdXJjZXMpOworCisgICAgV0VCS0lUX0VYUE9SVCB2b2lkIHJlcXVl c3RTdWNjZWVkZWQoY29uc3QgV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yJik7CisKICAgICBXRUJL SVRfRVhQT1JUIHZvaWQgcmVxdWVzdEZhaWxlZCgpOwogCiAjaWYgV0VCS0lUX0lNUExFTUVOVEFU SU9OCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVc2VyTWVkaWFS ZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlVzZXJNZWRpYVJlcXVl c3QuY3BwCmluZGV4IGRjZDI3MDM4NWFhM2I1MTgxYmQ0MDQzNTFmZTc4NWY5Njc0NDhlYWMuLjcx OGVkMmJmNWJiOWViYzgyZTQ4MGRjODg0YmZiMTJhNjIzZWU4ZTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlVzZXJNZWRpYVJlcXVlc3QuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlVzZXJNZWRpYVJlcXVlc3QuY3BwCkBAIC0zNiwxMSAr MzYsMTMgQEAKIAogI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKKyNp bmNsdWRlICJNZWRpYVN0cmVhbURlc2NyaXB0b3IuaCIKICNpbmNsdWRlICJNZWRpYVN0cmVhbVNv dXJjZS5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJTZWN1cml0eU9yaWdpbi5oIgog I2luY2x1ZGUgIlVzZXJNZWRpYVJlcXVlc3QuaCIKICNpbmNsdWRlICJXZWJTZWN1cml0eU9yaWdp bi5oIgorI2luY2x1ZGUgInBsYXRmb3JtL1dlYk1lZGlhU3RyZWFtRGVzY3JpcHRvci5oIgogI2lu Y2x1ZGUgInBsYXRmb3JtL1dlYk1lZGlhU3RyZWFtU291cmNlLmgiCiAjaW5jbHVkZSAicGxhdGZv cm0vV2ViU3RyaW5nLmgiCiAjaW5jbHVkZSAicGxhdGZvcm0vV2ViVmVjdG9yLmgiCkBAIC05NSw2 ICs5NywxNSBAQCB2b2lkIFdlYlVzZXJNZWRpYVJlcXVlc3Q6OnJlcXVlc3RTdWNjZWVkZWQoY29u c3QgV2ViVmVjdG9yPFdlYk1lZGlhU3RyZWFtU291cmNlPgogICAgIG1fcHJpdmF0ZS0+c3VjY2Vl ZChhdWRpbywgdmlkZW8pOwogfQogCit2b2lkIFdlYlVzZXJNZWRpYVJlcXVlc3Q6OnJlcXVlc3RT dWNjZWVkZWQoY29uc3QgV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yJiBzdHJlYW1EZXNjcmlwdG9y KQoreworICAgIEFTU0VSVCghc3RyZWFtRGVzY3JpcHRvci5pc051bGwoKSk7CisgICAgaWYgKG1f cHJpdmF0ZS5pc051bGwoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9wcml2YXRlLT5zdWNj ZWVkKHN0cmVhbURlc2NyaXB0b3IpOworfQorCiB2b2lkIFdlYlVzZXJNZWRpYVJlcXVlc3Q6OnJl cXVlc3RGYWlsZWQoKQogewogICAgIG1fcHJpdmF0ZS0+ZmFpbCgpOwo=