108173 2013-01-29 02:25:06 -0800 MediaStream API: A MediaStreamComponent should be able to return the MediaStreamDescriptor it belongs to 2013-01-29 13:01:11 -0800 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 hta jamesr tkent+wkapi webkit.review.bot oldest_to_newest 818745 0 tommyw 2013-01-29 02:25:06 -0800 MediaStream API: A MediaStreamComponent should be able to return the MediaStreamDescriptor it belongs to 818748 1 185206 tommyw 2013-01-29 02:29:13 -0800 Created attachment 185206 Patch 818750 2 webkit.review.bot 2013-01-29 02:32:00 -0800 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. 819203 3 185206 abarth 2013-01-29 12:31:55 -0800 Comment on attachment 185206 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=185206&action=review Ok > Source/WebCore/ChangeLog:10 > + This is also better from an architectonic view as well. architectonic <--- great word 819245 4 185206 webkit.review.bot 2013-01-29 13:01:04 -0800 Comment on attachment 185206 Patch Clearing flags on attachment: 185206 Committed r141151: <http://trac.webkit.org/changeset/141151> 819246 5 webkit.review.bot 2013-01-29 13:01:11 -0800 All reviewed patches have been landed. Closing bug. 185206 2013-01-29 02:29:13 -0800 2013-01-29 13:01:04 -0800 Patch bug-108173-20130129112559.patch text/plain 14581 tommyw U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMDc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCAzZmY2MGIxYTdhZDEx OGU1NTAxZDUzMmQxYzJkNGM0ODU3MGJlMGEwLi5kZGJmZGI2ZDQ4ZjNhMmVkNTFlYWYxMmYyNmI3 MjdlMDk3NGQ1MWFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMy0wMS0yOSAg VG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4KKworICAgICAgICBNZWRpYVN0 cmVhbSBBUEk6IEEgTWVkaWFTdHJlYW1Db21wb25lbnQgc2hvdWxkIGJlIGFibGUgdG8gcmV0dXJu IHRoZSBNZWRpYVN0cmVhbURlc2NyaXB0b3IgaXQgYmVsb25ncyB0bworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MTczCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBjaHJvbWl1bS9wdWJsaWMvV2ViTWVk aWFTdHJlYW1Db21wb25lbnQuaDoKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgIChXZWJNZWRp YVN0cmVhbUNvbXBvbmVudCk6CisKIDIwMTMtMDEtMjggIEFsZXhhbmRyZSBFbGlhcyAgPGFlbGlh c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgTWFrZSBwYWdlIHNjYWxlIHNocmluayBGcmFtZVZp ZXcgaW4gYXBwbHlQYWdlU2NhbGVJbkNvbXBvc2l0b3IgbW9kZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGYyNzU1 YzRmMzNlM2ZlMDc0M2ZjNWY5MzY1MWU1ZDU3MTIxYjM1ZTEuLjUxODQ5N2NhMDJiMzI3NjFlZmM0 ZjUwZDI4YTJlYjZjNzg0OWM3YTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MSBAQAorMjAxMy0w MS0yOSAgVG9tbXkgV2lkZW5mbHljaHQgIDx0b21teXdAZ29vZ2xlLmNvbT4KKworICAgICAgICBN ZWRpYVN0cmVhbSBBUEk6IEEgTWVkaWFTdHJlYW1Db21wb25lbnQgc2hvdWxkIGJlIGFibGUgdG8g cmV0dXJuIHRoZSBNZWRpYVN0cmVhbURlc2NyaXB0b3IgaXQgYmVsb25ncyB0bworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MTczCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVG8gYmUgYWJsZSB0byByZXR1 cm4gdGhlIE1lZGlhU3RyZWFtRGVzY3JpcHRvciBhIE1lZGlhU3RyZWFtQ29tcG9uZW50IGJlbG9u Z3MgdG8gdGhlICJvd25lcnNoaXAiCisgICAgICAgIG9mIHRoZSBNZWRpYVN0cmVhbURlc2NyaXB0 b3IgbmVlZGVkIHRvIG1vdmUgZnJvbSBhIE1lZGlhU3RyZWFtVHJhY2sgdG8gdGhlIE1lZGlhU3Ry ZWFtQ29tcG9uZW50LgorICAgICAgICBUaGlzIGlzIGFsc28gYmV0dGVyIGZyb20gYW4gYXJjaGl0 ZWN0b25pYyB2aWV3IGFzIHdlbGwuCisKKyAgICAgICAgUGF0Y2ggY292ZXJlZCBieSBleGlzdGlu ZyB0ZXN0cy4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW06Ok1lZGlhU3RyZWFtKToKKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhU3RyZWFtOjphZGRUcmFjayk6CisgICAgICAgIChXZWJDb3JlOjpNZWRp YVN0cmVhbTo6YWRkUmVtb3RlVHJhY2spOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0v TWVkaWFTdHJlYW1UcmFjay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbVRyYWNr OjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1UcmFjazo6TWVkaWFTdHJl YW1UcmFjayk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbVRyYWNrOjpzZXRFbmFibGVk KToKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suaDoKKyAg ICAgICAgKE1lZGlhU3RyZWFtVHJhY2spOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0v UlRDU3RhdHNSZXF1ZXN0SW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSVENTdGF0c1JlcXVl c3RJbXBsOjpSVENTdGF0c1JlcXVlc3RJbXBsKToKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1 bS9zdXBwb3J0L1dlYk1lZGlhU3RyZWFtQ29tcG9uZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViTWVkaWFTdHJlYW1Db21wb25lbnQ6OnN0cmVhbSk6CisgICAgICAgIChXZWJLaXQpOgorICAg ICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtQ29tcG9uZW50Lmg6CisgICAg ICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtQ29tcG9uZW50Ojpj cmVhdGUpOgorICAgICAgICAoTWVkaWFTdHJlYW1Db21wb25lbnQpOgorICAgICAgICAoV2ViQ29y ZTo6TWVkaWFTdHJlYW1Db21wb25lbnQ6OnN0cmVhbSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRp YVN0cmVhbUNvbXBvbmVudDo6c2V0U3RyZWFtKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3Ry ZWFtQ29tcG9uZW50OjpNZWRpYVN0cmVhbUNvbXBvbmVudCk6CisgICAgICAgICogcGxhdGZvcm0v bWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVN0cmVhbURlc2NyaXB0b3I6Ok1lZGlhU3RyZWFtRGVzY3JpcHRvcik6CisKIDIwMTMtMDEt MjkgIEVsbGlvdHQgU3ByZWhuICA8ZXNwcmVobkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgU3Rv cmUgU2hhZG93Um9vdFR5cGUgaW5zaWRlIHRoZSBiaXRmaWVsZApkaWZmIC0tZ2l0IGEvU291cmNl L1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVN0cmVhbUNvbXBvbmVudC5oIGIvU291 cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVN0cmVhbUNvbXBvbmVudC5oCmlu ZGV4IGIxMjM2YzE2ZTQyYWE5YTQ1ZGY3ZjgyNmFlNTZmYTc1ZDRiYzc4MDIuLjdmMzc5MDlmN2Rh ZWQ3NmRjZjhlOTA5NzVlYzUxYTVmZWU4N2ZjYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9QbGF0Zm9y bS9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFTdHJlYW1Db21wb25lbnQuaAorKysgYi9Tb3VyY2Uv UGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYk1lZGlhU3RyZWFtQ29tcG9uZW50LmgKQEAgLTQw LDcgKzQwLDcgQEAgY2xhc3MgTWVkaWFTdHJlYW1Db21wb25lbnQ7CiB9CiAKIG5hbWVzcGFjZSBX ZWJLaXQgewotCitjbGFzcyBXZWJNZWRpYVN0cmVhbURlc2NyaXB0b3I7CiBjbGFzcyBXZWJNZWRp YVN0cmVhbVNvdXJjZTsKIGNsYXNzIFdlYlN0cmluZzsKIApAQCAtNjIsNiArNjIsNyBAQCBwdWJs aWM6CiAKICAgICBXRUJLSVRfRVhQT1JUIFdlYlN0cmluZyBpZCgpIGNvbnN0OwogCisgICAgV0VC S0lUX0VYUE9SVCBXZWJNZWRpYVN0cmVhbURlc2NyaXB0b3Igc3RyZWFtKCkgY29uc3Q7CiAgICAg V0VCS0lUX0VYUE9SVCBXZWJNZWRpYVN0cmVhbVNvdXJjZSBzb3VyY2UoKSBjb25zdDsKICAgICBX RUJLSVRfRVhQT1JUIGJvb2wgaXNFbmFibGVkKCkgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uY3BwIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5jcHAKaW5kZXggZGNmMGU4Mjc1 ODdkZWFiZGZlOTk4MmU3YmZiZDFiYjZhMWZhYzA3MC4uMmVkOTY3Nzk4MTA4MmQ4NDU5MjYyNjFk MzE1NmU1ODM0YzM5NjkyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbS5jcHAKQEAgLTExNSwxMiArMTE1LDEyIEBAIE1lZGlhU3RyZWFt OjpNZWRpYVN0cmVhbShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBQYXNzUmVmUHRy PE1lZGlhU3RyZWFtCiAgICAgc2l6ZV90IG51bWJlck9mQXVkaW9UcmFja3MgPSBtX2Rlc2NyaXB0 b3ItPm51bWJlck9mQXVkaW9Db21wb25lbnRzKCk7CiAgICAgbV9hdWRpb1RyYWNrcy5yZXNlcnZl Q2FwYWNpdHkobnVtYmVyT2ZBdWRpb1RyYWNrcyk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkg PCBudW1iZXJPZkF1ZGlvVHJhY2tzOyBpKyspCi0gICAgICAgIG1fYXVkaW9UcmFja3MuYXBwZW5k KE1lZGlhU3RyZWFtVHJhY2s6OmNyZWF0ZShjb250ZXh0LCBtX2Rlc2NyaXB0b3IsIG1fZGVzY3Jp cHRvci0+YXVkaW9Db21wb25lbnQoaSkpKTsKKyAgICAgICAgbV9hdWRpb1RyYWNrcy5hcHBlbmQo TWVkaWFTdHJlYW1UcmFjazo6Y3JlYXRlKGNvbnRleHQsIG1fZGVzY3JpcHRvci0+YXVkaW9Db21w b25lbnQoaSkpKTsKIAogICAgIHNpemVfdCBudW1iZXJPZlZpZGVvVHJhY2tzID0gbV9kZXNjcmlw dG9yLT5udW1iZXJPZlZpZGVvQ29tcG9uZW50cygpOwogICAgIG1fdmlkZW9UcmFja3MucmVzZXJ2 ZUNhcGFjaXR5KG51bWJlck9mVmlkZW9UcmFja3MpOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgbnVtYmVyT2ZWaWRlb1RyYWNrczsgaSsrKQotICAgICAgICBtX3ZpZGVvVHJhY2tzLmFwcGVu ZChNZWRpYVN0cmVhbVRyYWNrOjpjcmVhdGUoY29udGV4dCwgbV9kZXNjcmlwdG9yLCBtX2Rlc2Ny aXB0b3ItPnZpZGVvQ29tcG9uZW50KGkpKSk7CisgICAgICAgIG1fdmlkZW9UcmFja3MuYXBwZW5k KE1lZGlhU3RyZWFtVHJhY2s6OmNyZWF0ZShjb250ZXh0LCBtX2Rlc2NyaXB0b3ItPnZpZGVvQ29t cG9uZW50KGkpKSk7CiB9CiAKIE1lZGlhU3RyZWFtOjp+TWVkaWFTdHJlYW0oKQpAQCAtMTUwLDgg KzE1MCw4IEBAIHZvaWQgTWVkaWFTdHJlYW06OmFkZFRyYWNrKFBhc3NSZWZQdHI8TWVkaWFTdHJl YW1UcmFjaz4gcHJwVHJhY2ssIEV4Y2VwdGlvbkNvZGUmCiAgICAgaWYgKGdldFRyYWNrQnlJZCh0 cmFjay0+aWQoKSkpCiAgICAgICAgIHJldHVybjsKIAotICAgIFJlZlB0cjxNZWRpYVN0cmVhbUNv bXBvbmVudD4gY29tcG9uZW50ID0gTWVkaWFTdHJlYW1Db21wb25lbnQ6OmNyZWF0ZSh0cmFjay0+ Y29tcG9uZW50KCktPnNvdXJjZSgpKTsKLSAgICBSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4gbmV3 VHJhY2sgPSBNZWRpYVN0cmVhbVRyYWNrOjpjcmVhdGUoc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgp LCBtX2Rlc2NyaXB0b3IsIGNvbXBvbmVudC5nZXQoKSk7CisgICAgUmVmUHRyPE1lZGlhU3RyZWFt Q29tcG9uZW50PiBjb21wb25lbnQgPSBNZWRpYVN0cmVhbUNvbXBvbmVudDo6Y3JlYXRlKG1fZGVz Y3JpcHRvci5nZXQoKSwgdHJhY2stPmNvbXBvbmVudCgpLT5zb3VyY2UoKSk7CisgICAgUmVmUHRy PE1lZGlhU3RyZWFtVHJhY2s+IG5ld1RyYWNrID0gTWVkaWFTdHJlYW1UcmFjazo6Y3JlYXRlKHNj cmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwgY29tcG9uZW50LmdldCgpKTsKIAogICAgIHN3aXRjaCAo Y29tcG9uZW50LT5zb3VyY2UoKS0+dHlwZSgpKSB7CiAgICAgY2FzZSBNZWRpYVN0cmVhbVNvdXJj ZTo6VHlwZUF1ZGlvOgpAQCAtMjU3LDEwICsyNTcsMTMgQEAgRXZlbnRUYXJnZXREYXRhKiBNZWRp YVN0cmVhbTo6ZW5zdXJlRXZlbnRUYXJnZXREYXRhKCkKIAogdm9pZCBNZWRpYVN0cmVhbTo6YWRk UmVtb3RlVHJhY2soTWVkaWFTdHJlYW1Db21wb25lbnQqIGNvbXBvbmVudCkKIHsKKyAgICBBU1NF UlQoY29tcG9uZW50ICYmICFjb21wb25lbnQtPnN0cmVhbSgpKTsKICAgICBpZiAoZW5kZWQoKSkK ICAgICAgICAgcmV0dXJuOwogCi0gICAgUmVmUHRyPE1lZGlhU3RyZWFtVHJhY2s+IHRyYWNrID0g TWVkaWFTdHJlYW1UcmFjazo6Y3JlYXRlKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwgbV9kZXNj cmlwdG9yLCBjb21wb25lbnQpOworICAgIGNvbXBvbmVudC0+c2V0U3RyZWFtKGRlc2NyaXB0b3Io KSk7CisKKyAgICBSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4gdHJhY2sgPSBNZWRpYVN0cmVhbVRy YWNrOjpjcmVhdGUoc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLCBjb21wb25lbnQpOwogICAgIHN3 aXRjaCAoY29tcG9uZW50LT5zb3VyY2UoKS0+dHlwZSgpKSB7CiAgICAgY2FzZSBNZWRpYVN0cmVh bVNvdXJjZTo6VHlwZUF1ZGlvOgogICAgICAgICBtX2F1ZGlvVHJhY2tzLmFwcGVuZCh0cmFjayk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3Ry ZWFtVHJhY2suY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0 cmVhbVRyYWNrLmNwcAppbmRleCA2MjY4MzgzNDYyYTNiMDFjYjE4MGJjYTkxY2JjMWY5MDM5NmZm NzRlLi5iMzJjZDkwZWZhZWExZTQ3ZTc1YWVlMjE0NDI1M2Q5OTRjZGNhYmM3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFj ay5jcHAKQEAgLTM0LDE3ICszNCwxNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLVBhc3NS ZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4gTWVkaWFTdHJlYW1UcmFjazo6Y3JlYXRlKFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1EZXNjcmlwdG9y PiBzdHJlYW1EZXNjcmlwdG9yLCBNZWRpYVN0cmVhbUNvbXBvbmVudCogY29tcG9uZW50KQorUGFz c1JlZlB0cjxNZWRpYVN0cmVhbVRyYWNrPiBNZWRpYVN0cmVhbVRyYWNrOjpjcmVhdGUoU2NyaXB0 RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgTWVkaWFTdHJlYW1Db21wb25lbnQqIGNvbXBvbmVu dCkKIHsKLSAgICBSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4gdHJhY2sgPSBhZG9wdFJlZihuZXcg TWVkaWFTdHJlYW1UcmFjayhjb250ZXh0LCBzdHJlYW1EZXNjcmlwdG9yLCBjb21wb25lbnQpKTsK KyAgICBSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4gdHJhY2sgPSBhZG9wdFJlZihuZXcgTWVkaWFT dHJlYW1UcmFjayhjb250ZXh0LCBjb21wb25lbnQpKTsKICAgICB0cmFjay0+c3VzcGVuZElmTmVl ZGVkKCk7CiAgICAgcmV0dXJuIHRyYWNrLnJlbGVhc2UoKTsKIH0KIAotTWVkaWFTdHJlYW1UcmFj azo6TWVkaWFTdHJlYW1UcmFjayhTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBQYXNz UmVmUHRyPE1lZGlhU3RyZWFtRGVzY3JpcHRvcj4gc3RyZWFtRGVzY3JpcHRvciwgTWVkaWFTdHJl YW1Db21wb25lbnQqIGNvbXBvbmVudCkKK01lZGlhU3RyZWFtVHJhY2s6Ok1lZGlhU3RyZWFtVHJh Y2soU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgTWVkaWFTdHJlYW1Db21wb25lbnQq IGNvbXBvbmVudCkKICAgICA6IEFjdGl2ZURPTU9iamVjdChjb250ZXh0LCB0aGlzKQogICAgICwg bV9zdG9wcGVkKGZhbHNlKQotICAgICwgbV9zdHJlYW1EZXNjcmlwdG9yKHN0cmVhbURlc2NyaXB0 b3IpCiAgICAgLCBtX2NvbXBvbmVudChjb21wb25lbnQpCiB7CiAgICAgbV9jb21wb25lbnQtPnNv dXJjZSgpLT5hZGRPYnNlcnZlcih0aGlzKTsKQEAgLTkzLDEwICs5MiwxMCBAQCB2b2lkIE1lZGlh U3RyZWFtVHJhY2s6OnNldEVuYWJsZWQoYm9vbCBlbmFibGVkKQogCiAgICAgbV9jb21wb25lbnQt PnNldEVuYWJsZWQoZW5hYmxlZCk7CiAKLSAgICBpZiAobV9zdHJlYW1EZXNjcmlwdG9yLT5lbmRl ZCgpKQorICAgIGlmIChtX2NvbXBvbmVudC0+c3RyZWFtKCktPmVuZGVkKCkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIE1lZGlhU3RyZWFtQ2VudGVyOjppbnN0YW5jZSgpLmRpZFNldE1lZGlhU3Ry ZWFtVHJhY2tFbmFibGVkKG1fc3RyZWFtRGVzY3JpcHRvci5nZXQoKSwgbV9jb21wb25lbnQuZ2V0 KCkpOworICAgIE1lZGlhU3RyZWFtQ2VudGVyOjppbnN0YW5jZSgpLmRpZFNldE1lZGlhU3RyZWFt VHJhY2tFbmFibGVkKG1fY29tcG9uZW50LT5zdHJlYW0oKSwgbV9jb21wb25lbnQuZ2V0KCkpOwog fQogCiBTdHJpbmcgTWVkaWFTdHJlYW1UcmFjazo6cmVhZHlTdGF0ZSgpIGNvbnN0CkBAIC0xNDAs MTEgKzEzOSw2IEBAIHZvaWQgTWVkaWFTdHJlYW1UcmFjazo6c291cmNlQ2hhbmdlZFN0YXRlKCkK ICAgICB9CiB9CiAKLU1lZGlhU3RyZWFtRGVzY3JpcHRvciogTWVkaWFTdHJlYW1UcmFjazo6c3Ry ZWFtRGVzY3JpcHRvcigpCi17Ci0gICAgcmV0dXJuIG1fc3RyZWFtRGVzY3JpcHRvci5nZXQoKTsK LX0KLQogTWVkaWFTdHJlYW1Db21wb25lbnQqIE1lZGlhU3RyZWFtVHJhY2s6OmNvbXBvbmVudCgp CiB7CiAgICAgcmV0dXJuIG1fY29tcG9uZW50LmdldCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrLmggYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suaAppbmRleCBjMWI4ZjQw YjNjZTc3MDQwNjM4NjI5ZjFjNWEyNTc3NmZmOTY1OTZhLi5lN2ZkMTNlNjViMmY2NzUyZDZlYjE3 NWNjZTU0NzhjMTA3MDM3NGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suaApAQCAtNDMsNyArNDMsNyBAQCBjbGFzcyBN ZWRpYVN0cmVhbUNvbXBvbmVudDsKIAogY2xhc3MgTWVkaWFTdHJlYW1UcmFjayA6IHB1YmxpYyBS ZWZDb3VudGVkPE1lZGlhU3RyZWFtVHJhY2s+LCBwdWJsaWMgQWN0aXZlRE9NT2JqZWN0LCBwdWJs aWMgRXZlbnRUYXJnZXQsIHB1YmxpYyBNZWRpYVN0cmVhbVNvdXJjZTo6T2JzZXJ2ZXIgewogcHVi bGljOgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPE1lZGlhU3RyZWFtVHJhY2s+IGNyZWF0ZShTY3Jp cHRFeGVjdXRpb25Db250ZXh0KiwgUGFzc1JlZlB0cjxNZWRpYVN0cmVhbURlc2NyaXB0b3I+LCBN ZWRpYVN0cmVhbUNvbXBvbmVudCopOworICAgIHN0YXRpYyBQYXNzUmVmUHRyPE1lZGlhU3RyZWFt VHJhY2s+IGNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgTWVkaWFTdHJlYW1Db21wb25l bnQqKTsKICAgICB2aXJ0dWFsIH5NZWRpYVN0cmVhbVRyYWNrKCk7CiAKICAgICBTdHJpbmcga2lu ZCgpIGNvbnN0OwpAQCAtNTksNyArNTksNiBAQCBwdWJsaWM6CiAgICAgREVGSU5FX0FUVFJJQlVU RV9FVkVOVF9MSVNURU5FUih1bm11dGUpOwogICAgIERFRklORV9BVFRSSUJVVEVfRVZFTlRfTElT VEVORVIoZW5kZWQpOwogCi0gICAgTWVkaWFTdHJlYW1EZXNjcmlwdG9yKiBzdHJlYW1EZXNjcmlw dG9yKCk7CiAgICAgTWVkaWFTdHJlYW1Db21wb25lbnQqIGNvbXBvbmVudCgpOwogICAgIGJvb2wg ZW5kZWQoKSBjb25zdDsKIApAQCAtNzQsNyArNzMsNyBAQCBwdWJsaWM6CiAgICAgdXNpbmcgUmVm Q291bnRlZDxNZWRpYVN0cmVhbVRyYWNrPjo6ZGVyZWY7CiAKIHByaXZhdGU6Ci0gICAgTWVkaWFT dHJlYW1UcmFjayhTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgUGFzc1JlZlB0cjxNZWRpYVN0cmVh bURlc2NyaXB0b3I+LCBNZWRpYVN0cmVhbUNvbXBvbmVudCopOworICAgIE1lZGlhU3RyZWFtVHJh Y2soU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIE1lZGlhU3RyZWFtQ29tcG9uZW50Kik7CiAKICAg ICAvLyBFdmVudFRhcmdldAogICAgIHZpcnR1YWwgRXZlbnRUYXJnZXREYXRhKiBldmVudFRhcmdl dERhdGEoKSBPVkVSUklERTsKQEAgLTg3LDcgKzg2LDYgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFs IHZvaWQgc291cmNlQ2hhbmdlZFN0YXRlKCkgT1ZFUlJJREU7CiAKICAgICBib29sIG1fc3RvcHBl ZDsKLSAgICBSZWZQdHI8TWVkaWFTdHJlYW1EZXNjcmlwdG9yPiBtX3N0cmVhbURlc2NyaXB0b3I7 CiAgICAgUmVmUHRyPE1lZGlhU3RyZWFtQ29tcG9uZW50PiBtX2NvbXBvbmVudDsKIH07CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDU3RhdHNSZXF1 ZXN0SW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1N0YXRz UmVxdWVzdEltcGwuY3BwCmluZGV4IGI0MDE2YTM2NmIzZDg2NTNiZTUyMGZkOWJkNTNlMjhjNzQ2 ZGM4YzAuLjc5Y2NhOGMwYzJlMDgzNzA4MTMxNWYyMzkxZjYzODMyOGNhNTU5NGMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDU3RhdHNSZXF1ZXN0SW1w bC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENTdGF0c1Jl cXVlc3RJbXBsLmNwcApAQCAtNDQsNyArNDQsNyBAQCBQYXNzUmVmUHRyPFJUQ1N0YXRzUmVxdWVz dEltcGw+IFJUQ1N0YXRzUmVxdWVzdEltcGw6OmNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZQog UlRDU3RhdHNSZXF1ZXN0SW1wbDo6UlRDU3RhdHNSZXF1ZXN0SW1wbChTY3JpcHRFeGVjdXRpb25D b250ZXh0KiBjb250ZXh0LCBQYXNzUmVmUHRyPFJUQ1N0YXRzQ2FsbGJhY2s+IGNhbGxiYWNrLCBQ YXNzUmVmUHRyPE1lZGlhU3RyZWFtVHJhY2s+IHNlbGVjdG9yKQogICAgIDogQWN0aXZlRE9NT2Jq ZWN0KGNvbnRleHQsIHRoaXMpCiAgICAgLCBtX3N1Y2Nlc3NDYWxsYmFjayhjYWxsYmFjaykKLSAg ICAsIG1fc3RyZWFtKHNlbGVjdG9yID8gc2VsZWN0b3ItPnN0cmVhbURlc2NyaXB0b3IoKSA6IDAp CisgICAgLCBtX3N0cmVhbShzZWxlY3RvciA/IHNlbGVjdG9yLT5jb21wb25lbnQoKS0+c3RyZWFt KCkgOiAwKQogICAgICwgbV9jb21wb25lbnQoc2VsZWN0b3IgPyBzZWxlY3Rvci0+Y29tcG9uZW50 KCkgOiAwKQogewogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21p dW0vc3VwcG9ydC9XZWJNZWRpYVN0cmVhbUNvbXBvbmVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYk1lZGlhU3RyZWFtQ29tcG9uZW50LmNwcAppbmRl eCA2ODhjODMyNDU2OWJhNWQxMjIzOTU5N2U3ZmI5OGRlYzNiMmFjYzYzLi4yYzk1N2RiOWRjOGVm ZjVjMzY1MWIzZDU0MGJiYWQwOGYxZjliMjc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYk1lZGlhU3RyZWFtQ29tcG9uZW50LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYk1lZGlhU3RyZWFt Q29tcG9uZW50LmNwcApAQCAtMzUsNiArMzUsNyBAQAogI2luY2x1ZGUgPHB1YmxpYy9XZWJNZWRp YVN0cmVhbUNvbXBvbmVudC5oPgogCiAjaW5jbHVkZSAiTWVkaWFTdHJlYW1Db21wb25lbnQuaCIK KyNpbmNsdWRlIDxwdWJsaWMvV2ViTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmg+CiAjaW5jbHVkZSA8 cHVibGljL1dlYk1lZGlhU3RyZWFtU291cmNlLmg+CiAjaW5jbHVkZSA8cHVibGljL1dlYlN0cmlu Zy5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KQEAgLTg2LDYgKzg3LDEyIEBAIFdlYlN0cmlu ZyBXZWJNZWRpYVN0cmVhbUNvbXBvbmVudDo6aWQoKSBjb25zdAogICAgIHJldHVybiBtX3ByaXZh dGUtPmlkKCk7CiB9CiAKK1dlYk1lZGlhU3RyZWFtRGVzY3JpcHRvciBXZWJNZWRpYVN0cmVhbUNv bXBvbmVudDo6c3RyZWFtKCkgY29uc3QKK3sKKyAgICBBU1NFUlQoIW1fcHJpdmF0ZS5pc051bGwo KSk7CisgICAgcmV0dXJuIFdlYk1lZGlhU3RyZWFtRGVzY3JpcHRvcihtX3ByaXZhdGUtPnN0cmVh bSgpKTsKK30KKwogV2ViTWVkaWFTdHJlYW1Tb3VyY2UgV2ViTWVkaWFTdHJlYW1Db21wb25lbnQ6 OnNvdXJjZSgpIGNvbnN0CiB7CiAgICAgQVNTRVJUKCFtX3ByaXZhdGUuaXNOdWxsKCkpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1D b21wb25lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3Ry ZWFtQ29tcG9uZW50LmgKaW5kZXggODk4ZTVmZGMyZjU1MTM5ZjAyNzg2MmE2ZjUyMTQ5OGIwMTQw MTcyNC4uOWVlMDhlM2JiYTk2YmEyZDc1OWNhZTE2ODRiMzIxZGVhZWE4YzBlZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1Db21wb25l bnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVh bUNvbXBvbmVudC5oCkBAIC0zOCwxMyArMzgsMjMgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog CitjbGFzcyBNZWRpYVN0cmVhbURlc2NyaXB0b3I7CisKIGNsYXNzIE1lZGlhU3RyZWFtQ29tcG9u ZW50IDogcHVibGljIFJlZkNvdW50ZWQ8TWVkaWFTdHJlYW1Db21wb25lbnQ+IHsKIHB1YmxpYzoK ICAgICBzdGF0aWMgUGFzc1JlZlB0cjxNZWRpYVN0cmVhbUNvbXBvbmVudD4gY3JlYXRlKFBhc3NS ZWZQdHI8TWVkaWFTdHJlYW1Tb3VyY2U+IHNvdXJjZSkKICAgICB7Ci0gICAgICAgIHJldHVybiBh ZG9wdFJlZihuZXcgTWVkaWFTdHJlYW1Db21wb25lbnQoc291cmNlKSk7CisgICAgICAgIHJldHVy biBhZG9wdFJlZihuZXcgTWVkaWFTdHJlYW1Db21wb25lbnQoMCwgc291cmNlKSk7CiAgICAgfQog CisgICAgc3RhdGljIFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1Db21wb25lbnQ+IGNyZWF0ZShNZWRp YVN0cmVhbURlc2NyaXB0b3IqIHN0cmVhbSwgUGFzc1JlZlB0cjxNZWRpYVN0cmVhbVNvdXJjZT4g c291cmNlKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBNZWRpYVN0cmVhbUNv bXBvbmVudChzdHJlYW0sIHNvdXJjZSkpOworICAgIH0KKworICAgIE1lZGlhU3RyZWFtRGVzY3Jp cHRvciogc3RyZWFtKCkgY29uc3QgeyByZXR1cm4gbV9zdHJlYW07IH0KKyAgICB2b2lkIHNldFN0 cmVhbShNZWRpYVN0cmVhbURlc2NyaXB0b3IqIHN0cmVhbSkgeyBBU1NFUlQoIW1fc3RyZWFtICYm IHN0cmVhbSk7IG1fc3RyZWFtID0gc3RyZWFtOyB9CisKICAgICBNZWRpYVN0cmVhbVNvdXJjZSog c291cmNlKCkgY29uc3QgeyByZXR1cm4gbV9zb3VyY2UuZ2V0KCk7IH0KIAogICAgIFN0cmluZyBp ZCgpIGNvbnN0IHsgcmV0dXJuIG1faWQ7IH0KQEAgLTUyLDEzICs2MiwxNSBAQCBwdWJsaWM6CiAg ICAgdm9pZCBzZXRFbmFibGVkKGJvb2wgZW5hYmxlZCkgeyBtX2VuYWJsZWQgPSBlbmFibGVkOyB9 CiAKIHByaXZhdGU6Ci0gICAgTWVkaWFTdHJlYW1Db21wb25lbnQoUGFzc1JlZlB0cjxNZWRpYVN0 cmVhbVNvdXJjZT4gc291cmNlKQotICAgICAgICA6IG1fc291cmNlKHNvdXJjZSkKKyAgICBNZWRp YVN0cmVhbUNvbXBvbmVudChNZWRpYVN0cmVhbURlc2NyaXB0b3IqIHN0cmVhbSwgUGFzc1JlZlB0 cjxNZWRpYVN0cmVhbVNvdXJjZT4gc291cmNlKQorICAgICAgICA6IG1fc3RyZWFtKHN0cmVhbSkK KyAgICAgICAgLCBtX3NvdXJjZShzb3VyY2UpCiAgICAgICAgICwgbV9pZChjcmVhdGVDYW5vbmlj YWxVVUlEU3RyaW5nKCkpCiAgICAgICAgICwgbV9lbmFibGVkKHRydWUpCiAgICAgewogICAgIH0K IAorICAgIE1lZGlhU3RyZWFtRGVzY3JpcHRvciogbV9zdHJlYW07CiAgICAgUmVmUHRyPE1lZGlh U3RyZWFtU291cmNlPiBtX3NvdXJjZTsKICAgICBTdHJpbmcgbV9pZDsKICAgICBib29sIG1fZW5h YmxlZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL01l ZGlhU3RyZWFtRGVzY3JpcHRvci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJl YW0vTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmgKaW5kZXggZTU1OGIxM2IwNGQxNDE0MDM1YzlhZWUx NGQ4ODhjNTY4NDE5Y2I4Yy4uOTQ2YzZkZTdjNWQxYTEwYmVhMTQ5ZTk4YjVhYzdjZDczMDMwNGQz NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFT dHJlYW1EZXNjcmlwdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJl YW0vTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmgKQEAgLTk5LDEwICs5OSwxMCBAQCBwcml2YXRlOgog ICAgICAgICAsIG1fZW5kZWQoZmFsc2UpCiAgICAgewogICAgICAgICBmb3IgKHNpemVfdCBpID0g MDsgaSA8IGF1ZGlvU291cmNlcy5zaXplKCk7IGkrKykKLSAgICAgICAgICAgIG1fYXVkaW9Db21w b25lbnRzLmFwcGVuZChNZWRpYVN0cmVhbUNvbXBvbmVudDo6Y3JlYXRlKGF1ZGlvU291cmNlc1tp XSkpOworICAgICAgICAgICAgbV9hdWRpb0NvbXBvbmVudHMuYXBwZW5kKE1lZGlhU3RyZWFtQ29t cG9uZW50OjpjcmVhdGUodGhpcywgYXVkaW9Tb3VyY2VzW2ldKSk7CiAKICAgICAgICAgZm9yIChz aXplX3QgaSA9IDA7IGkgPCB2aWRlb1NvdXJjZXMuc2l6ZSgpOyBpKyspCi0gICAgICAgICAgICBt X3ZpZGVvQ29tcG9uZW50cy5hcHBlbmQoTWVkaWFTdHJlYW1Db21wb25lbnQ6OmNyZWF0ZSh2aWRl b1NvdXJjZXNbaV0pKTsKKyAgICAgICAgICAgIG1fdmlkZW9Db21wb25lbnRzLmFwcGVuZChNZWRp YVN0cmVhbUNvbXBvbmVudDo6Y3JlYXRlKHRoaXMsIHZpZGVvU291cmNlc1tpXSkpOwogICAgIH0K IAogICAgIE1lZGlhU3RyZWFtRGVzY3JpcHRvckNsaWVudCogbV9jbGllbnQ7Cg==