83194 2012-04-04 12:51:29 -0700 Web Audio should use MutexTryLocker class 2012-04-04 15:13:40 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 crogers crogers fischman kbr levin+threading webkit.review.bot oldest_to_newest 595820 0 crogers 2012-04-04 12:51:29 -0700 Web Audio should use MutexTryLocker class 595824 1 135656 crogers 2012-04-04 13:00:36 -0700 Created attachment 135656 Patch 595924 2 135656 kbr 2012-04-04 14:12:02 -0700 Comment on attachment 135656 Patch Nice cleanup. r=me 596009 3 135656 webkit.review.bot 2012-04-04 15:13:36 -0700 Comment on attachment 135656 Patch Clearing flags on attachment: 135656 Committed r113245: <http://trac.webkit.org/changeset/113245> 596010 4 webkit.review.bot 2012-04-04 15:13:40 -0700 All reviewed patches have been landed. Closing bug. 135656 2012-04-04 13:00:36 -0700 2012-04-04 15:13:36 -0700 Patch bug-83194-20120404130035.patch text/plain 11115 crogers U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMDg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGZkNDhmNzViMzRmYTQxNDIxN2RjNTBm MDM0ZGYxOTE1ODYyNDQ0MWQuLmU4ZjhmZGVjM2U2ZTI2NTU2NWZiNWVkNjFiNGRkYWZhZGVhMTgy NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTItMDQtMDQgIENocmlzIFJvZ2VycyAgPGNyb2dl cnNAZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgQXVkaW8gc2hvdWxkIHVzZSBNdXRleFRyeUxv Y2tlciBjbGFzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODMxOTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgTXV0ZXhUcnlMb2NrZXIgY2xhc3Mgd2hpY2ggY2FuIGJlIHVzZWQgYXMgYSBzdGFjay1i YXNlZCBvYmplY3Qgd3JhcHBpbmcgYSBNdXRleC4KKyAgICAgICAgSXQgd2lsbCBhdXRvbWF0aWNh bGx5IHVubG9jayB0aGUgTXV0ZXggaW4gaXRzIGRlc3RydWN0b3IgaWYgdGhlIHRyeUxvY2soKSBz dWNjZWVkZWQuCisKKyAgICAgICAgKiB3dGYvVGhyZWFkaW5nUHJpbWl0aXZlcy5oOgorICAgICAg ICAoTXV0ZXhUcnlMb2NrZXIpOgorICAgICAgICAoV1RGOjpNdXRleFRyeUxvY2tlcjo6TXV0ZXhU cnlMb2NrZXIpOgorICAgICAgICAoV1RGOjpNdXRleFRyeUxvY2tlcjo6fk11dGV4VHJ5TG9ja2Vy KToKKyAgICAgICAgKFdURjo6TXV0ZXhUcnlMb2NrZXI6OmxvY2tlZCk6CisgICAgICAgIENoZWNr IGlmIHRoZSB0cnlMb2NrKCkgb24gdGhlIE11dGV4IHN1Y2NlZWRlZC4KKyAgICAgICAgKFdURik6 CisKIDIwMTItMDMtMzAgIERhdmlkIEJhcnIgIDxkYXZpZGJhcnJAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFNwbGl0IHVwIHRvcC1sZXZlbCAuZ2l0aWdub3JlIGFuZCAuZ2l0YXR0cmlidXRlcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IDM0MzBjMjEzMDFiMjg1MDg1OTJmYTNmZjAwMzEyMTgzZWM2N2RjMDUuLjg4 YWVlNjMxODI1ODRhZmU2ZWIyZjNiMDQ0NjZjMWZhYmNlN2NmNTYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNyBAQAorMjAxMi0wNC0wNCAgQ2hyaXMgUm9nZXJzICA8Y3JvZ2Vyc0Bnb29nbGUuY29t PgorCisgICAgICAgIFdlYiBBdWRpbyBzaG91bGQgdXNlIE11dGV4VHJ5TG9ja2VyIGNsYXNzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzE5NAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBleGlz dGluZyBXZWIgQXVkaW8gY29kZSBmcm9tIGRpcmVjdGx5IGNhbGxpbmcgdHJ5TG9jaygpIG9uIGEg TXV0ZXggdG8gdXNlIGEgTXV0ZXhUcnlMb2NrZXIuCisgICAgICAgIE5vIG5ldyB0ZXN0cyBzaW5j ZSBpdCBpcyBhIGxvdy1sZXZlbCB0aHJlYWRpbmcgcHJpbWl0aXZlIGFuZCBpcyBkaWZmaWN1bHQg dG8gdGVzdC4KKyAgICAgICAgRXhpc3RpbmcgV2ViIEF1ZGlvIHRlc3RzIGNvbnRpbnVlIHRvIHRl c3QgdGhlIHByb2Nlc3MoKSBtZXRob2RzIGFmZmVjdGVkLgorCisgICAgICAgICogTW9kdWxlcy93 ZWJhdWRpby9BdWRpb0J1ZmZlclNvdXJjZU5vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXVk aW9CdWZmZXJTb3VyY2VOb2RlOjpwcm9jZXNzKToKKyAgICAgICAgKiBNb2R1bGVzL3dlYmF1ZGlv L0F1ZGlvUGFyYW1UaW1lbGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBdWRpb1BhcmFtVGlt ZWxpbmU6OnZhbHVlc0ZvclRpbWVSYW5nZSk6CisgICAgICAgICogTW9kdWxlcy93ZWJhdWRpby9D b252b2x2ZXJOb2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnZvbHZlck5vZGU6OnByb2Nl c3MpOgorICAgICAgICAqIE1vZHVsZXMvd2ViYXVkaW8vTWVkaWFFbGVtZW50QXVkaW9Tb3VyY2VO b2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhRWxlbWVudEF1ZGlvU291cmNlTm9kZTo6 cHJvY2Vzcyk6CisgICAgICAgICogTW9kdWxlcy93ZWJhdWRpby9Pc2NpbGxhdG9yLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Ok9zY2lsbGF0b3I6OnByb2Nlc3MpOgorICAgICAgICAqIE1vZHVsZXMv d2ViYXVkaW8vV2F2ZVNoYXBlclByb2Nlc3Nvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXYXZl U2hhcGVyUHJvY2Vzc29yOjpwcm9jZXNzKToKKwogMjAxMi0wNC0wMyAgRGFuaWVsIENoZW5nICA8 ZGNoZW5nQGNocm9taXVtLm9yZz4KIAogICAgICAgICBIYXZpbmcgYSBkcm9wIGhhbmRsZXIgcHJl dmVudHMgbmF2aWdhdGlvbiBvbiBkcm9wIGV2ZW4gaWYgZXZlbnQgaXMgbm90IGNhbmNlbGxlZApk aWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvVGhyZWFkaW5nUHJpbWl0aXZlcy5oIGIvU291cmNl L1dURi93dGYvVGhyZWFkaW5nUHJpbWl0aXZlcy5oCmluZGV4IDllZDM4YmM5ZjE4N2ZkYTgzNzk5 OGNiYTNjZmRmYWIyZDdkNjA4ZjcuLmQwMGFkYjdiMzQyNDIzYzc5NjU2Njc0MTdkNjg0ZWZiMTE3 M2FhMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1RocmVhZGluZ1ByaW1pdGl2ZXMuaAor KysgYi9Tb3VyY2UvV1RGL3d0Zi9UaHJlYWRpbmdQcmltaXRpdmVzLmgKQEAgLTk3LDYgKzk3LDIz IEBAIHByaXZhdGU6CiAKIHR5cGVkZWYgTG9ja2VyPE11dGV4PiBNdXRleExvY2tlcjsKIAorY2xh c3MgTXV0ZXhUcnlMb2NrZXIgeworICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKE11dGV4VHJ5TG9j a2VyKTsKK3B1YmxpYzoKKyAgICBXVEZfRVhQT1JUX1BSSVZBVEUgTXV0ZXhUcnlMb2NrZXIoTXV0 ZXgmIG11dGV4KSA6IG1fbXV0ZXgobXV0ZXgpLCBtX2xvY2tlZChtdXRleC50cnlMb2NrKCkpIHsg fQorICAgIFdURl9FWFBPUlRfUFJJVkFURSB+TXV0ZXhUcnlMb2NrZXIoKQorICAgIHsKKyAgICAg ICAgaWYgKG1fbG9ja2VkKQorICAgICAgICAgICAgbV9tdXRleC51bmxvY2soKTsKKyAgICB9CisK KyAgICBXVEZfRVhQT1JUX1BSSVZBVEUgYm9vbCBsb2NrZWQoKSBjb25zdCB7IHJldHVybiBtX2xv Y2tlZDsgfQorCitwcml2YXRlOgorICAgIE11dGV4JiBtX211dGV4OworICAgIGJvb2wgbV9sb2Nr ZWQ7Cit9OworCiBjbGFzcyBSZWFkV3JpdGVMb2NrIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJM RShSZWFkV3JpdGVMb2NrKTsKIHB1YmxpYzoKQEAgLTE0Miw2ICsxNTksNyBAQCBEV09SRCBhYnNv bHV0ZVRpbWVUb1dhaXRUaW1lb3V0SW50ZXJ2YWwoZG91YmxlIGFic29sdXRlVGltZSk7CiAKIHVz aW5nIFdURjo6TXV0ZXg7CiB1c2luZyBXVEY6Ok11dGV4TG9ja2VyOwordXNpbmcgV1RGOjpNdXRl eFRyeUxvY2tlcjsKIHVzaW5nIFdURjo6VGhyZWFkQ29uZGl0aW9uOwogCiAjaWYgT1MoV0lORE9X UykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQXVkaW9CdWZm ZXJTb3VyY2VOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQXVkaW9C dWZmZXJTb3VyY2VOb2RlLmNwcAppbmRleCAyMWEyMDkzY2I0NjM3ZTY3ZjBkYmVlY2NiOTcwYTlj Mzg2ZjI2YWZhLi4yZGFlYjQzMzU1NTU5NWVhOTg5N2I4Mzg4ODVhZjI1NDZlOGIwZWNmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0F1ZGlvQnVmZmVyU291cmNl Tm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9BdWRpb0J1ZmZl clNvdXJjZU5vZGUuY3BwCkBAIC05OCw4ICs5OCw4IEBAIHZvaWQgQXVkaW9CdWZmZXJTb3VyY2VO b2RlOjpwcm9jZXNzKHNpemVfdCBmcmFtZXNUb1Byb2Nlc3MpCiAgICAgfQogCiAgICAgLy8gVGhl IGF1ZGlvIHRocmVhZCBjYW4ndCBibG9jayBvbiB0aGlzIGxvY2ssIHNvIHdlIGNhbGwgdHJ5TG9j aygpIGluc3RlYWQuCi0gICAgLy8gQ2FyZWZ1bCAtIHRoaXMgaXMgYSB0cnlMb2NrKCkgYW5kIG5v dCBhbiBhdXRvbG9ja2VyLCBzbyB3ZSBtdXN0IHVubG9jaygpIGJlZm9yZSBldmVyeSByZXR1cm4u Ci0gICAgaWYgKG1fcHJvY2Vzc0xvY2sudHJ5TG9jaygpKSB7CisgICAgTXV0ZXhUcnlMb2NrZXIg dHJ5TG9ja2VyKG1fcHJvY2Vzc0xvY2spOworICAgIGlmICh0cnlMb2NrZXIubG9ja2VkKCkpIHsK ICAgICAgICAgLy8gQ2hlY2sgaWYgaXQncyB0aW1lIHRvIHN0YXJ0IHBsYXlpbmcuCiAgICAgICAg IGRvdWJsZSBzYW1wbGVSYXRlID0gdGhpcy0+c2FtcGxlUmF0ZSgpOwogICAgICAgICBzaXplX3Qg cXVhbnR1bVN0YXJ0RnJhbWUgPSBjb250ZXh0KCktPmN1cnJlbnRTYW1wbGVGcmFtZSgpOwpAQCAt MTE3LDcgKzExNyw2IEBAIHZvaWQgQXVkaW9CdWZmZXJTb3VyY2VOb2RlOjpwcm9jZXNzKHNpemVf dCBmcmFtZXNUb1Byb2Nlc3MpCiAgICAgICAgICAgICB8fCAhYnVmZmVyKCkgfHwgc3RhcnRGcmFt ZSA+PSBxdWFudHVtRW5kRnJhbWUpIHsKICAgICAgICAgICAgIC8vIEZJWE1FOiBjYW4gb3B0aW1p emUgaGVyZSBieSBwcm9wYWdhdGluZyBzaWxlbnQgaGludCBpbnN0ZWFkIG9mIGZvcmNpbmcgdGhl IHdob2xlIGNoYWluIHRvIHByb2Nlc3Mgc2lsZW5jZS4KICAgICAgICAgICAgIG91dHB1dEJ1cy0+ emVybygpOwotICAgICAgICAgICAgbV9wcm9jZXNzTG9jay51bmxvY2soKTsKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgfQogCkBAIC0xNTksOCArMTU4LDYgQEAgdm9pZCBBdWRpb0J1ZmZl clNvdXJjZU5vZGU6OnByb2Nlc3Moc2l6ZV90IGZyYW1lc1RvUHJvY2VzcykKIAogICAgICAgICAg ICAgZmluaXNoKCk7CiAgICAgICAgIH0KLQotICAgICAgICBtX3Byb2Nlc3NMb2NrLnVubG9jaygp OwogICAgIH0gZWxzZSB7CiAgICAgICAgIC8vIFRvbyBiYWQgLSB0aGUgdHJ5TG9jaygpIGZhaWxl ZC4gIFdlIG11c3QgYmUgaW4gdGhlIG1pZGRsZSBvZiBjaGFuZ2luZyBidWZmZXJzIGFuZCB3ZXJl IGFscmVhZHkgb3V0cHV0dGluZyBzaWxlbmNlIGFueXdheS4KICAgICAgICAgb3V0cHV0QnVzLT56 ZXJvKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0F1ZGlv UGFyYW1UaW1lbGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0F1ZGlv UGFyYW1UaW1lbGluZS5jcHAKaW5kZXggNjNjMmJiNjM5ZmE3MzJhYmU5NzgxOWExZWFjMGU3Yjhh ZmM0YmU2OC4uYzAyMTIxODMyM2Y2MWY3N2UwN2Q5MmVhODZlMmY5MjFhMzg0YzU2MyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9BdWRpb1BhcmFtVGltZWxpbmUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQXVkaW9QYXJhbVRpbWVs aW5lLmNwcApAQCAtMTQzLDcgKzE0Myw4IEBAIGZsb2F0IEF1ZGlvUGFyYW1UaW1lbGluZTo6dmFs dWVzRm9yVGltZVJhbmdlKGZsb2F0IHN0YXJ0VGltZSwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGZsb2F0IGNvbnRyb2xSYXRlKQogewogICAgIC8vIFdlIGNh bid0IGNvbnRlbmQgdGhlIGxvY2sgaW4gdGhlIHJlYWx0aW1lIGF1ZGlvIHRocmVhZC4KLSAgICBp ZiAoIW1fZXZlbnRzTG9jay50cnlMb2NrKCkpIHsKKyAgICBNdXRleFRyeUxvY2tlciB0cnlMb2Nr ZXIobV9ldmVudHNMb2NrKTsKKyAgICBpZiAoIXRyeUxvY2tlci5sb2NrZWQoKSkgewogICAgICAg ICBpZiAodmFsdWVzKSB7CiAgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbnVt YmVyT2ZWYWx1ZXM7ICsraSkKICAgICAgICAgICAgICAgICB2YWx1ZXNbaV0gPSBkZWZhdWx0VmFs dWU7CkBAIC0xNTIsNyArMTUzLDYgQEAgZmxvYXQgQXVkaW9QYXJhbVRpbWVsaW5lOjp2YWx1ZXNG b3JUaW1lUmFuZ2UoZmxvYXQgc3RhcnRUaW1lLAogICAgIH0KIAogICAgIGZsb2F0IHZhbHVlID0g dmFsdWVzRm9yVGltZVJhbmdlSW1wbChzdGFydFRpbWUsIGVuZFRpbWUsIGRlZmF1bHRWYWx1ZSwg dmFsdWVzLCBudW1iZXJPZlZhbHVlcywgc2FtcGxlUmF0ZSwgY29udHJvbFJhdGUpOwotICAgIG1f ZXZlbnRzTG9jay51bmxvY2soKTsKIAogICAgIHJldHVybiB2YWx1ZTsKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQ29udm9sdmVyTm9kZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0NvbnZvbHZlck5vZGUuY3BwCmluZGV4IGMyNWNl NDRhZDAyNWZkYTViYjJhYzVjODljOTJmMjY3YTJiMjUzZjEuLmYyNjNlMjdlZGRlMTdlZGFjNDVl ZjFjMzQ1NTg2NzUxYTRjNjI1OTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv d2ViYXVkaW8vQ29udm9sdmVyTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93 ZWJhdWRpby9Db252b2x2ZXJOb2RlLmNwcApAQCAtNjgsNyArNjgsOCBAQCB2b2lkIENvbnZvbHZl ck5vZGU6OnByb2Nlc3Moc2l6ZV90IGZyYW1lc1RvUHJvY2VzcykKICAgICBBU1NFUlQob3V0cHV0 QnVzKTsKIAogICAgIC8vIFN5bmNocm9uaXplIHdpdGggcG9zc2libGUgZHluYW1pYyBjaGFuZ2Vz IHRvIHRoZSBpbXB1bHNlIHJlc3BvbnNlLgotICAgIGlmIChtX3Byb2Nlc3NMb2NrLnRyeUxvY2so KSkgeworICAgIE11dGV4VHJ5TG9ja2VyIHRyeUxvY2tlcihtX3Byb2Nlc3NMb2NrKTsKKyAgICBp ZiAodHJ5TG9ja2VyLmxvY2tlZCgpKSB7CiAgICAgICAgIGlmICghaXNJbml0aWFsaXplZCgpIHx8 ICFtX3JldmVyYi5nZXQoKSkKICAgICAgICAgICAgIG91dHB1dEJ1cy0+emVybygpOwogICAgICAg ICBlbHNlIHsKQEAgLTc4LDggKzc5LDYgQEAgdm9pZCBDb252b2x2ZXJOb2RlOjpwcm9jZXNzKHNp emVfdCBmcmFtZXNUb1Byb2Nlc3MpCiAgICAgICAgICAgICAvLyB3ZSBrZWVwIGdldHRpbmcgZmVk IHNpbGVuY2UuCiAgICAgICAgICAgICBtX3JldmVyYi0+cHJvY2VzcyhpbnB1dCgwKS0+YnVzKCks IG91dHB1dEJ1cywgZnJhbWVzVG9Qcm9jZXNzKTsKICAgICAgICAgfQotICAgICAgICAKLSAgICAg ICAgbV9wcm9jZXNzTG9jay51bmxvY2soKTsKICAgICB9IGVsc2UgewogICAgICAgICAvLyBUb28g YmFkIC0gdGhlIHRyeUxvY2soKSBmYWlsZWQuICBXZSBtdXN0IGJlIGluIHRoZSBtaWRkbGUgb2Yg c2V0dGluZyBhIG5ldyBpbXB1bHNlIHJlc3BvbnNlLgogICAgICAgICBvdXRwdXRCdXMtPnplcm8o KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vTWVkaWFFbGVt ZW50QXVkaW9Tb3VyY2VOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8v TWVkaWFFbGVtZW50QXVkaW9Tb3VyY2VOb2RlLmNwcAppbmRleCAzNjBlYzFiOGJmOTI5YTM5ZDQx ZDJhNDg2MTc2MDMzY2QyMTdlOTE3Li44YWY0NDIzMGI2ZTRiMmFmNWI2ODA5NTc3NGUzZjU1MzBh ZTFlMWIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL01lZGlh RWxlbWVudEF1ZGlvU291cmNlTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93 ZWJhdWRpby9NZWRpYUVsZW1lbnRBdWRpb1NvdXJjZU5vZGUuY3BwCkBAIC0xMTQsNyArMTE0LDgg QEAgdm9pZCBNZWRpYUVsZW1lbnRBdWRpb1NvdXJjZU5vZGU6OnByb2Nlc3Moc2l6ZV90IG51bWJl ck9mRnJhbWVzKQogICAgIC8vIFVzZSBhIHRyeUxvY2soKSB0byBhdm9pZCBjb250ZW50aW9uIGlu IHRoZSByZWFsLXRpbWUgYXVkaW8gdGhyZWFkLgogICAgIC8vIElmIHdlIGZhaWwgdG8gYWNxdWly ZSB0aGUgbG9jayB0aGVuIHRoZSBIVE1MTWVkaWFFbGVtZW50IG11c3QgYmUgaW4gdGhlIG1pZGRs ZSBvZgogICAgIC8vIHJlY29uZmlndXJpbmcgaXRzIHBsYXliYWNrIGVuZ2luZSwgc28gd2Ugb3V0 cHV0IHNpbGVuY2UgaW4gdGhpcyBjYXNlLgotICAgIGlmIChtX3Byb2Nlc3NMb2NrLnRyeUxvY2so KSkgeworICAgIE11dGV4VHJ5TG9ja2VyIHRyeUxvY2tlcihtX3Byb2Nlc3NMb2NrKTsKKyAgICBp ZiAodHJ5TG9ja2VyLmxvY2tlZCgpKSB7CiAgICAgICAgIGlmIChBdWRpb1NvdXJjZVByb3ZpZGVy KiBwcm92aWRlciA9IG1lZGlhRWxlbWVudCgpLT5hdWRpb1NvdXJjZVByb3ZpZGVyKCkpIHsKICAg ICAgICAgICAgIGlmIChtX211bHRpQ2hhbm5lbFJlc2FtcGxlci5nZXQoKSkgewogICAgICAgICAg ICAgICAgIEFTU0VSVChtX3NvdXJjZVNhbXBsZVJhdGUgIT0gc2FtcGxlUmF0ZSgpKTsKQEAgLTEy OSw3ICsxMzAsNiBAQCB2b2lkIE1lZGlhRWxlbWVudEF1ZGlvU291cmNlTm9kZTo6cHJvY2Vzcyhz aXplX3QgbnVtYmVyT2ZGcmFtZXMpCiAgICAgICAgICAgICAvLyBvciB0aGUgc3RyZWFtIGlzIG5v dCB5ZXQgYXZhaWxhYmxlLgogICAgICAgICAgICAgb3V0cHV0QnVzLT56ZXJvKCk7CiAgICAgICAg IH0KLSAgICAgICAgbV9wcm9jZXNzTG9jay51bmxvY2soKTsKICAgICB9IGVsc2UgewogICAgICAg ICAvLyBXZSBmYWlsZWQgdG8gYWNxdWlyZSB0aGUgbG9jay4KICAgICAgICAgb3V0cHV0QnVzLT56 ZXJvKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL09zY2ls bGF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9Pc2NpbGxhdG9yLmNw cAppbmRleCA0N2Q4NDk0MWEzODQ4Zjg1MGQ5ZGUwMmU1ZGY3MjdiYzZkOTk0MWY0Li4xZmFiNGQ4 MTY5MTQyN2JmZjIwZWYzYTc1YTQwMGY1NTNjMTAyOTY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL3dlYmF1ZGlvL09zY2lsbGF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2ViYXVkaW8vT3NjaWxsYXRvci5jcHAKQEAgLTE4MSw4ICsxODEsOCBAQCB2b2lk IE9zY2lsbGF0b3I6OnByb2Nlc3Moc2l6ZV90IGZyYW1lc1RvUHJvY2VzcykKICAgICAgICAgcmV0 dXJuOwogCiAgICAgLy8gVGhlIGF1ZGlvIHRocmVhZCBjYW4ndCBibG9jayBvbiB0aGlzIGxvY2ss IHNvIHdlIGNhbGwgdHJ5TG9jaygpIGluc3RlYWQuCi0gICAgLy8gQ2FyZWZ1bCAtIHRoaXMgaXMg YSB0cnlMb2NrKCkgYW5kIG5vdCBhbiBhdXRvbG9ja2VyLCBzbyB3ZSBtdXN0IHVubG9jaygpIGJl Zm9yZSBldmVyeSByZXR1cm4uCi0gICAgaWYgKCFtX3Byb2Nlc3NMb2NrLnRyeUxvY2soKSkgewor ICAgIE11dGV4VHJ5TG9ja2VyIHRyeUxvY2tlcihtX3Byb2Nlc3NMb2NrKTsKKyAgICBpZiAoIXRy eUxvY2tlci5sb2NrZWQoKSkgewogICAgICAgICAvLyBUb28gYmFkIC0gdGhlIHRyeUxvY2soKSBm YWlsZWQuIFdlIG11c3QgYmUgaW4gdGhlIG1pZGRsZSBvZiBjaGFuZ2luZyB3YXZlLXRhYmxlcy4K ICAgICAgICAgb3V0cHV0QnVzLT56ZXJvKCk7CiAgICAgICAgIHJldHVybjsKQEAgLTE5MSw3ICsx OTEsNiBAQCB2b2lkIE9zY2lsbGF0b3I6OnByb2Nlc3Moc2l6ZV90IGZyYW1lc1RvUHJvY2VzcykK ICAgICAvLyBXZSBtdXN0IGFjY2VzcyBtX3dhdmVUYWJsZSBvbmx5IGluc2lkZSB0aGUgbG9jay4K ICAgICBpZiAoIW1fd2F2ZVRhYmxlLmdldCgpKSB7CiAgICAgICAgIG91dHB1dEJ1cy0+emVybygp OwotICAgICAgICBtX3Byb2Nlc3NMb2NrLnVubG9jaygpOwogICAgICAgICByZXR1cm47CiAgICAg fQogCkBAIC0yNjMsOCArMjYyLDYgQEAgdm9pZCBPc2NpbGxhdG9yOjpwcm9jZXNzKHNpemVfdCBm cmFtZXNUb1Byb2Nlc3MpCiAgICAgfQogCiAgICAgbV92aXJ0dWFsUmVhZEluZGV4ID0gdmlydHVh bFJlYWRJbmRleDsKLQotICAgIG1fcHJvY2Vzc0xvY2sudW5sb2NrKCk7CiB9CiAKIHZvaWQgT3Nj aWxsYXRvcjo6cmVzZXQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJh dWRpby9XYXZlU2hhcGVyUHJvY2Vzc29yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vi YXVkaW8vV2F2ZVNoYXBlclByb2Nlc3Nvci5jcHAKaW5kZXggNGY4M2UxNjY5OGNlMTQ2NDM4MDYw Zjg5Y2MxNWUzNzkwM2FjODZmNS4uZGQ4MjU3NDljNTkyNWM0NzliYWQ2N2Y0ZjNhNmIzNjc3Njhk YjdlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9XYXZlU2hh cGVyUHJvY2Vzc29yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL1dh dmVTaGFwZXJQcm9jZXNzb3IuY3BwCkBAIC02NCwxMyArNjQsMTEgQEAgdm9pZCBXYXZlU2hhcGVy UHJvY2Vzc29yOjpwcm9jZXNzKGNvbnN0IEF1ZGlvQnVzKiBzb3VyY2UsIEF1ZGlvQnVzKiBkZXN0 aW5hdGlvbiwKICAgICB9CiAKICAgICAvLyBUaGUgYXVkaW8gdGhyZWFkIGNhbid0IGJsb2NrIG9u IHRoaXMgbG9jaywgc28gd2UgY2FsbCB0cnlMb2NrKCkgaW5zdGVhZC4KLSAgICAvLyBDYXJlZnVs IC0gdGhpcyBpcyBhIHRyeUxvY2soKSBhbmQgbm90IGFuIGF1dG9sb2NrZXIsIHNvIHdlIG11c3Qg dW5sb2NrKCkgYmVmb3JlIGV2ZXJ5IHJldHVybi4KLSAgICBpZiAobV9wcm9jZXNzTG9jay50cnlM b2NrKCkpIHsgICAgICAgIAorICAgIE11dGV4VHJ5TG9ja2VyIHRyeUxvY2tlcihtX3Byb2Nlc3NM b2NrKTsKKyAgICBpZiAodHJ5TG9ja2VyLmxvY2tlZCgpKSB7ICAgICAgICAKICAgICAgICAgLy8g Rm9yIGVhY2ggY2hhbm5lbCBvZiBvdXIgaW5wdXQsIHByb2Nlc3MgdXNpbmcgdGhlIGNvcnJlc3Bv bmRpbmcgV2F2ZVNoYXBlckRTUEtlcm5lbCBpbnRvIHRoZSBvdXRwdXQgY2hhbm5lbC4KICAgICAg ICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fa2VybmVscy5zaXplKCk7ICsraSkKICAgICAg ICAgICAgIG1fa2VybmVsc1tpXS0+cHJvY2Vzcyhzb3VyY2UtPmNoYW5uZWwoaSktPmRhdGEoKSwg ZGVzdGluYXRpb24tPmNoYW5uZWwoaSktPm11dGFibGVEYXRhKCksIGZyYW1lc1RvUHJvY2Vzcyk7 Ci0KLSAgICAgICAgbV9wcm9jZXNzTG9jay51bmxvY2soKTsKICAgICB9IGVsc2UgewogICAgICAg ICAvLyBUb28gYmFkIC0gdGhlIHRyeUxvY2soKSBmYWlsZWQuIFdlIG11c3QgYmUgaW4gdGhlIG1p ZGRsZSBvZiBhIHNldEN1cnZlKCkgY2FsbC4KICAgICAgICAgZGVzdGluYXRpb24tPnplcm8oKTsK