99593 2012-10-17 06:49:20 -0700 MediaStream API: Rename owner to client in MediaStreamDescriptor 2012-11-06 08:15:40 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 56459 1 tommyw tommyw abarth eric.carlson feature-media-reviews hta webkit.review.bot oldest_to_newest 744213 0 tommyw 2012-10-17 06:49:20 -0700 As discussed in #99080 rename owner to client in MediaStreamDescriptor. It's confusing for a RefCounted object to have an "owner". 744229 1 169180 tommyw 2012-10-17 07:25:48 -0700 Created attachment 169180 Patch 746128 2 169180 abarth 2012-10-19 01:41:22 -0700 Comment on attachment 169180 Patch Thanks! 746141 3 169180 webkit.review.bot 2012-10-19 02:04:09 -0700 Comment on attachment 169180 Patch Rejecting attachment 169180 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: /ChangeLog Auto-merging Tools/ChangeLog CONFLICT (content): Merge conflict in Tools/ChangeLog Failed to merge in the changes. Patch failed at 0001 Unreviewed fix after r131868. When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 164. Full output: http://queues.webkit.org/results/14461371 746209 4 169597 tommyw 2012-10-19 04:16:46 -0700 Created attachment 169597 Patch for landing 746210 5 169597 webkit.review.bot 2012-10-19 04:19:26 -0700 Comment on attachment 169597 Patch for landing Rejecting attachment 169597 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 ERROR: /mnt/git/webkit-commit-queue/LayoutTests/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://queues.webkit.org/results/14460426 746234 6 tommyw 2012-10-19 05:29:01 -0700 Weird, this patch doesn't modify LayoutTests/ChangeLog... 746392 7 169597 abarth 2012-10-19 10:03:05 -0700 Comment on attachment 169597 Patch for landing Sorry, that bug has been cropping up a lot lately. 746407 8 169597 webkit.review.bot 2012-10-19 10:14:46 -0700 Comment on attachment 169597 Patch for landing Clearing flags on attachment: 169597 Committed r131914: <http://trac.webkit.org/changeset/131914> 169180 2012-10-17 07:25:48 -0700 2012-10-19 02:04:09 -0700 Patch bug-99593-20121017162435.patch text/plain 9308 tommyw U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjk0MzhkMWZlZGVhNzFk OGUxZDVlNTZiYWQxYWM4MGIzYjEwMjFkYS4uNjE4Y2Q2MjkxMjMxNjMyMTFlY2U5NzcwZTAwNmQ2 ZTljNzViNDhhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTEwLTE3ICBUb21t eSBXaWRlbmZseWNodCAgPHRvbW15d0Bnb29nbGUuY29tPgorCisgICAgICAgIE1lZGlhU3RyZWFt IEFQSTogUmVuYW1lIG93bmVyIHRvIGNsaWVudCBpbiBNZWRpYVN0cmVhbURlc2NyaXB0b3IKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5NTkzCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBy ZW5hbWVzIG93bmVyIHRvIGNsaWVudCBpbiBNZWRpYVN0cmVhbURlc2NyaXB0b3IgYXMgZGlzY3Vz c2VkIGluICM5OTA4MC4KKworICAgICAgICBObyBuZXcgdGVzdHMgbmVlZGVkLCBjb3ZlcmVkIGJ5 IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0 cmVhbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbTo6TWVkaWFTdHJlYW0pOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW06On5NZWRpYVN0cmVhbSk6CisgICAgICAgICog TW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5oOgorICAgICAgICAoTWVkaWFTdHJlYW0p OgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vUGVlckNvbm5lY3Rpb24wMC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpQZWVyQ29ubmVjdGlvbjAwOjpkaWRSZW1vdmVSZW1vdGVTdHJlYW0p OgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb246OmRpZFJlbW92ZVJlbW90ZVN0cmVh bSk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1DZW50ZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1DZW50ZXI6OmVuZExvY2FsTWVkaWFTdHJl YW0pOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1DZW50ZXI6OmFkZE1lZGlhU3RyZWFt VHJhY2spOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1DZW50ZXI6OnJlbW92ZU1lZGlh U3RyZWFtVHJhY2spOgorICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFt RGVzY3JpcHRvci5oOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1EZXNjcmlwdG9yQ2xp ZW50Ojp+TWVkaWFTdHJlYW1EZXNjcmlwdG9yQ2xpZW50KToKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhU3RyZWFtRGVzY3JpcHRvcjo6Y2xpZW50KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3Ry ZWFtRGVzY3JpcHRvcjo6c2V0Q2xpZW50KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFt RGVzY3JpcHRvcjo6TWVkaWFTdHJlYW1EZXNjcmlwdG9yKToKKyAgICAgICAgKE1lZGlhU3RyZWFt RGVzY3JpcHRvcik6CisKIDIwMTItMTAtMTcgIERvdWdsYXMgU3RvY2t3ZWxsICA8ZHN0b2Nrd2Vs bEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQ29udGVudCBvZiByZXBsYWNlZCBlbGVtZW50cyBz aG91bGQgYmUgdHJpbW1lZCB0byB0aGUgY29udGVudCBlZGdlIGN1cnZlLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLmNwcAppbmRleCBjZThl MjY1NWVlN2YyMzMzOWFjOWQ5ZmQ0ZDE4N2RlYzQ5MTk3M2NhLi4zZGEzMTIxMTcxZWRlOTZiZTU5 OTc5NTNkNjkzNmRiYzYxYTczNGZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLmNwcApAQCAtODgsNyArODgsNyBAQCBNZWRpYVN0cmVh bTo6TWVkaWFTdHJlYW0oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgUGFzc1JlZlB0 cjxNZWRpYVN0cmVhbQogICAgIDogQ29udGV4dERlc3RydWN0aW9uT2JzZXJ2ZXIoY29udGV4dCkK ICAgICAsIG1fZGVzY3JpcHRvcihzdHJlYW1EZXNjcmlwdG9yKQogewotICAgIG1fZGVzY3JpcHRv ci0+c2V0T3duZXIodGhpcyk7CisgICAgbV9kZXNjcmlwdG9yLT5zZXRDbGllbnQodGhpcyk7CiAK ICAgICBNZWRpYVN0cmVhbVRyYWNrVmVjdG9yIGF1ZGlvVHJhY2tWZWN0b3I7CiAgICAgc2l6ZV90 IG51bWJlck9mQXVkaW9UcmFja3MgPSBtX2Rlc2NyaXB0b3ItPm51bWJlck9mQXVkaW9Db21wb25l bnRzKCk7CkBAIC0xMDcsNyArMTA3LDcgQEAgTWVkaWFTdHJlYW06Ok1lZGlhU3RyZWFtKFNjcmlw dEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIFBhc3NSZWZQdHI8TWVkaWFTdHJlYW0KIAogTWVk aWFTdHJlYW06On5NZWRpYVN0cmVhbSgpCiB7Ci0gICAgbV9kZXNjcmlwdG9yLT5zZXRPd25lcigw KTsKKyAgICBtX2Rlc2NyaXB0b3ItPnNldENsaWVudCgwKTsKICAgICBtX2F1ZGlvVHJhY2tzLT5k ZXRhY2hPd25lcigpOwogICAgIG1fdmlkZW9UcmFja3MtPmRldGFjaE93bmVyKCk7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLmgg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLmgKaW5kZXgg ZmM4ZDY2NzllYzY3ZjkyMmZlNWYyMmVmOTI5NmEzNjE1N2MxMjc3OC4uNjQyZWMwZjkyMjBhMWQy ZDA5NGJiYjc1NTFlNGI1ZjBlMjA2Y2U1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uaApAQCAtMzcsNyArMzcsNyBAQAogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKLWNsYXNzIE1lZGlhU3RyZWFtIDogcHVibGljIFJlZkNvdW50ZWQ8TWVk aWFTdHJlYW0+LCBwdWJsaWMgTWVkaWFTdHJlYW1EZXNjcmlwdG9yT3duZXIsIHB1YmxpYyBFdmVu dFRhcmdldCwgcHVibGljIENvbnRleHREZXN0cnVjdGlvbk9ic2VydmVyIHsKK2NsYXNzIE1lZGlh U3RyZWFtIDogcHVibGljIFJlZkNvdW50ZWQ8TWVkaWFTdHJlYW0+LCBwdWJsaWMgTWVkaWFTdHJl YW1EZXNjcmlwdG9yQ2xpZW50LCBwdWJsaWMgRXZlbnRUYXJnZXQsIHB1YmxpYyBDb250ZXh0RGVz dHJ1Y3Rpb25PYnNlcnZlciB7CiBwdWJsaWM6CiAgICAgZW51bSBSZWFkeVN0YXRlIHsKICAgICAg ICAgTElWRSA9IDEsCkBAIC01OCw3ICs1OCw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgYm9v bCBpc0xvY2FsKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KIAotICAgIC8vIE1lZGlhU3RyZWFt RGVzY3JpcHRvck93bmVyCisgICAgLy8gTWVkaWFTdHJlYW1EZXNjcmlwdG9yQ2xpZW50CiAgICAg dmlydHVhbCB2b2lkIHN0cmVhbUVuZGVkKCkgT1ZFUlJJREU7CiAKICAgICBNZWRpYVN0cmVhbURl c2NyaXB0b3IqIGRlc2NyaXB0b3IoKSBjb25zdCB7IHJldHVybiBtX2Rlc2NyaXB0b3IuZ2V0KCk7 IH0KQEAgLTgyLDcgKzgyLDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgcmVmRXZlbnRU YXJnZXQoKSBPVkVSUklERSB7IHJlZigpOyB9CiAgICAgdmlydHVhbCB2b2lkIGRlcmVmRXZlbnRU YXJnZXQoKSBPVkVSUklERSB7IGRlcmVmKCk7IH0KIAotICAgIC8vIE1lZGlhU3RyZWFtRGVzY3Jp cHRvck93bmVyCisgICAgLy8gTWVkaWFTdHJlYW1EZXNjcmlwdG9yQ2xpZW50CiAgICAgdmlydHVh bCB2b2lkIGFkZFRyYWNrKE1lZGlhU3RyZWFtQ29tcG9uZW50KikgT1ZFUlJJREU7CiAgICAgdmly dHVhbCB2b2lkIHJlbW92ZVRyYWNrKE1lZGlhU3RyZWFtQ29tcG9uZW50KikgT1ZFUlJJREU7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUGVlckNvbm5l Y3Rpb24wMC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1BlZXJDb25u ZWN0aW9uMDAuY3BwCmluZGV4IDg1NTZkMDhjMWZiOWU5MDJlODdjYTQzNTU1OGZkNjUyZWNjZDYz ODkuLjg5ZmM2MDdmYTFhNWE2NmQ2YzJhYmE5NjIwM2M1MThkMjdmZTEyN2UgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUGVlckNvbm5lY3Rpb24wMC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9QZWVyQ29ubmVjdGlvbjAw LmNwcApAQCAtNDEyLDkgKzQxMiw5IEBAIHZvaWQgUGVlckNvbm5lY3Rpb24wMDo6ZGlkQWRkUmVt b3RlU3RyZWFtKFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1EZXNjcmlwdG9yPiBzdHJlCiB2b2lkIFBl ZXJDb25uZWN0aW9uMDA6OmRpZFJlbW92ZVJlbW90ZVN0cmVhbShNZWRpYVN0cmVhbURlc2NyaXB0 b3IqIHN0cmVhbURlc2NyaXB0b3IpCiB7CiAgICAgQVNTRVJUKHNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQoKS0+aXNDb250ZXh0VGhyZWFkKCkpOwotICAgIEFTU0VSVChzdHJlYW1EZXNjcmlwdG9yLT5v d25lcigpKTsKKyAgICBBU1NFUlQoc3RyZWFtRGVzY3JpcHRvci0+Y2xpZW50KCkpOwogCi0gICAg UmVmUHRyPE1lZGlhU3RyZWFtPiBzdHJlYW0gPSBzdGF0aWNfY2FzdDxNZWRpYVN0cmVhbSo+KHN0 cmVhbURlc2NyaXB0b3ItPm93bmVyKCkpOworICAgIFJlZlB0cjxNZWRpYVN0cmVhbT4gc3RyZWFt ID0gc3RhdGljX2Nhc3Q8TWVkaWFTdHJlYW0qPihzdHJlYW1EZXNjcmlwdG9yLT5jbGllbnQoKSk7 CiAgICAgc3RyZWFtLT5zdHJlYW1FbmRlZCgpOwogCiAgICAgaWYgKG1fcmVhZHlTdGF0ZSA9PSBD TE9TRUQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JU Q1BlZXJDb25uZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0v UlRDUGVlckNvbm5lY3Rpb24uY3BwCmluZGV4IGJhZWVkZDIyYmYzZmNhNTM5MGE3NzIyZWZhZTYz MWI3ZWFlYzI2YWYuLjk2MGIwYjBkZDM5NGMyYmE4Nzc3OTIwOTRlZjczMGFkNDNkNDhjMjAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5l Y3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVl ckNvbm5lY3Rpb24uY3BwCkBAIC00ODMsOSArNDgzLDkgQEAgdm9pZCBSVENQZWVyQ29ubmVjdGlv bjo6ZGlkQWRkUmVtb3RlU3RyZWFtKFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1EZXNjcmlwdG9yPiBz dHIKIHZvaWQgUlRDUGVlckNvbm5lY3Rpb246OmRpZFJlbW92ZVJlbW90ZVN0cmVhbShNZWRpYVN0 cmVhbURlc2NyaXB0b3IqIHN0cmVhbURlc2NyaXB0b3IpCiB7CiAgICAgQVNTRVJUKHNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQoKS0+aXNDb250ZXh0VGhyZWFkKCkpOwotICAgIEFTU0VSVChzdHJlYW1E ZXNjcmlwdG9yLT5vd25lcigpKTsKKyAgICBBU1NFUlQoc3RyZWFtRGVzY3JpcHRvci0+Y2xpZW50 KCkpOwogCi0gICAgUmVmUHRyPE1lZGlhU3RyZWFtPiBzdHJlYW0gPSBzdGF0aWNfY2FzdDxNZWRp YVN0cmVhbSo+KHN0cmVhbURlc2NyaXB0b3ItPm93bmVyKCkpOworICAgIFJlZlB0cjxNZWRpYVN0 cmVhbT4gc3RyZWFtID0gc3RhdGljX2Nhc3Q8TWVkaWFTdHJlYW0qPihzdHJlYW1EZXNjcmlwdG9y LT5jbGllbnQoKSk7CiAgICAgc3RyZWFtLT5zdHJlYW1FbmRlZCgpOwogCiAgICAgaWYgKG1fcmVh ZHlTdGF0ZSA9PSBSZWFkeVN0YXRlQ2xvc2VkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1DZW50ZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1DZW50ZXIuY3BwCmluZGV4IGY0Zjk4 MjJkZTUwOTY0NjIwZjRlYTU5ZjZlMDExNjNiNzA2MWE2YTcuLmRlYTJjNDc5NjdmMGQyOWQzMjkz YTYxMGZiOTRiYzgzZGFhODc4ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21lZGlhc3RyZWFtL01lZGlhU3RyZWFtQ2VudGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbUNlbnRlci5jcHAKQEAgLTQ5LDI1ICs0OSwy NSBAQCBNZWRpYVN0cmVhbUNlbnRlcjo6fk1lZGlhU3RyZWFtQ2VudGVyKCkKIAogdm9pZCBNZWRp YVN0cmVhbUNlbnRlcjo6ZW5kTG9jYWxNZWRpYVN0cmVhbShNZWRpYVN0cmVhbURlc2NyaXB0b3Iq IHN0cmVhbURlc2NyaXB0b3IpCiB7Ci0gICAgTWVkaWFTdHJlYW1EZXNjcmlwdG9yT3duZXIqIG93 bmVyID0gc3RyZWFtRGVzY3JpcHRvci0+b3duZXIoKTsKLSAgICBpZiAob3duZXIpCi0gICAgICAg IG93bmVyLT5zdHJlYW1FbmRlZCgpOworICAgIE1lZGlhU3RyZWFtRGVzY3JpcHRvckNsaWVudCog Y2xpZW50ID0gc3RyZWFtRGVzY3JpcHRvci0+Y2xpZW50KCk7CisgICAgaWYgKGNsaWVudCkKKyAg ICAgICAgY2xpZW50LT5zdHJlYW1FbmRlZCgpOwogICAgIGVsc2UKICAgICAgICAgc3RyZWFtRGVz Y3JpcHRvci0+c2V0RW5kZWQoKTsKIH0KIAogdm9pZCBNZWRpYVN0cmVhbUNlbnRlcjo6YWRkTWVk aWFTdHJlYW1UcmFjayhNZWRpYVN0cmVhbURlc2NyaXB0b3IqIHN0cmVhbURlc2NyaXB0b3IsIE1l ZGlhU3RyZWFtQ29tcG9uZW50KiBjb21wb25lbnQpCiB7Ci0gICAgTWVkaWFTdHJlYW1EZXNjcmlw dG9yT3duZXIqIG93bmVyID0gc3RyZWFtRGVzY3JpcHRvci0+b3duZXIoKTsKLSAgICBpZiAob3du ZXIpCi0gICAgICAgIG93bmVyLT5hZGRUcmFjayhjb21wb25lbnQpOworICAgIE1lZGlhU3RyZWFt RGVzY3JpcHRvckNsaWVudCogY2xpZW50ID0gc3RyZWFtRGVzY3JpcHRvci0+Y2xpZW50KCk7Cisg ICAgaWYgKGNsaWVudCkKKyAgICAgICAgY2xpZW50LT5hZGRUcmFjayhjb21wb25lbnQpOwogfQog CiB2b2lkIE1lZGlhU3RyZWFtQ2VudGVyOjpyZW1vdmVNZWRpYVN0cmVhbVRyYWNrKE1lZGlhU3Ry ZWFtRGVzY3JpcHRvciogc3RyZWFtRGVzY3JpcHRvciwgTWVkaWFTdHJlYW1Db21wb25lbnQqIGNv bXBvbmVudCkKIHsKLSAgICBNZWRpYVN0cmVhbURlc2NyaXB0b3JPd25lciogb3duZXIgPSBzdHJl YW1EZXNjcmlwdG9yLT5vd25lcigpOwotICAgIGlmIChvd25lcikKLSAgICAgICAgb3duZXItPnJl bW92ZVRyYWNrKGNvbXBvbmVudCk7CisgICAgTWVkaWFTdHJlYW1EZXNjcmlwdG9yQ2xpZW50KiBj bGllbnQgPSBzdHJlYW1EZXNjcmlwdG9yLT5jbGllbnQoKTsKKyAgICBpZiAoY2xpZW50KQorICAg ICAgICBjbGllbnQtPnJlbW92ZVRyYWNrKGNvbXBvbmVudCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNl IFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFt L01lZGlhU3RyZWFtRGVzY3JpcHRvci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmgKaW5kZXggYzYwNjEwNTJkYTEzNTJhNTI4ZTM1 MTQyMzMyYmQwN2E4MDU0OGRhMC4uMTI0MWUzMzg5NTgzZTY4MzJhYjBiOTE1YjQzNmQxNjI4NGIw YzMzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVk aWFTdHJlYW1EZXNjcmlwdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vTWVkaWFTdHJlYW1EZXNjcmlwdG9yLmgKQEAgLTQwLDkgKzQwLDkgQEAKIAogbmFtZXNw YWNlIFdlYkNvcmUgewogCi1jbGFzcyBNZWRpYVN0cmVhbURlc2NyaXB0b3JPd25lciB7CitjbGFz cyBNZWRpYVN0cmVhbURlc2NyaXB0b3JDbGllbnQgewogcHVibGljOgotICAgIHZpcnR1YWwgfk1l ZGlhU3RyZWFtRGVzY3JpcHRvck93bmVyKCkgeyB9CisgICAgdmlydHVhbCB+TWVkaWFTdHJlYW1E ZXNjcmlwdG9yQ2xpZW50KCkgeyB9CiAKICAgICB2aXJ0dWFsIHZvaWQgc3RyZWFtRW5kZWQoKSA9 IDA7CiAgICAgdmlydHVhbCB2b2lkIGFkZFRyYWNrKE1lZGlhU3RyZWFtQ29tcG9uZW50KikgPSAw OwpAQCAtNjEsOCArNjEsOCBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcg TWVkaWFTdHJlYW1EZXNjcmlwdG9yKGxhYmVsLCBhdWRpb1NvdXJjZXMsIHZpZGVvU291cmNlcykp OwogICAgIH0KIAotICAgIE1lZGlhU3RyZWFtRGVzY3JpcHRvck93bmVyKiBvd25lcigpIGNvbnN0 IHsgcmV0dXJuIG1fb3duZXI7IH0KLSAgICB2b2lkIHNldE93bmVyKE1lZGlhU3RyZWFtRGVzY3Jp cHRvck93bmVyKiBvd25lcikgeyBtX293bmVyID0gb3duZXI7IH0KKyAgICBNZWRpYVN0cmVhbURl c2NyaXB0b3JDbGllbnQqIGNsaWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fY2xpZW50OyB9CisgICAg dm9pZCBzZXRDbGllbnQoTWVkaWFTdHJlYW1EZXNjcmlwdG9yQ2xpZW50KiBjbGllbnQpIHsgbV9j bGllbnQgPSBjbGllbnQ7IH0KIAogICAgIFN0cmluZyBsYWJlbCgpIGNvbnN0IHsgcmV0dXJuIG1f bGFiZWw7IH0KIApAQCAtODAsNyArODAsNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgTWVk aWFTdHJlYW1EZXNjcmlwdG9yKGNvbnN0IFN0cmluZyYgbGFiZWwsIGNvbnN0IE1lZGlhU3RyZWFt U291cmNlVmVjdG9yJiBhdWRpb1NvdXJjZXMsIGNvbnN0IE1lZGlhU3RyZWFtU291cmNlVmVjdG9y JiB2aWRlb1NvdXJjZXMpCi0gICAgICAgIDogbV9vd25lcigwKQorICAgICAgICA6IG1fY2xpZW50 KDApCiAgICAgICAgICwgbV9sYWJlbChsYWJlbCkKICAgICAgICAgLCBtX2VuZGVkKGZhbHNlKQog ICAgIHsKQEAgLTkxLDcgKzkxLDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgIG1fdmlkZW9Db21w b25lbnRzLmFwcGVuZChNZWRpYVN0cmVhbUNvbXBvbmVudDo6Y3JlYXRlKHZpZGVvU291cmNlc1tp XSkpOwogICAgIH0KIAotICAgIE1lZGlhU3RyZWFtRGVzY3JpcHRvck93bmVyKiBtX293bmVyOwor ICAgIE1lZGlhU3RyZWFtRGVzY3JpcHRvckNsaWVudCogbV9jbGllbnQ7CiAgICAgU3RyaW5nIG1f bGFiZWw7CiAgICAgVmVjdG9yPFJlZlB0cjxNZWRpYVN0cmVhbUNvbXBvbmVudD4gPiBtX2F1ZGlv Q29tcG9uZW50czsKICAgICBWZWN0b3I8UmVmUHRyPE1lZGlhU3RyZWFtQ29tcG9uZW50PiA+IG1f dmlkZW9Db21wb25lbnRzOwo= 169597 2012-10-19 04:16:46 -0700 2012-10-19 10:14:46 -0700 Patch for landing bug-99593-20121019131529.patch text/plain 9330 tommyw U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxODg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2ZlN2RiNzI1YTk0ZjY2 YmY3N2Q3NDkzYTA1YzQzNjg4ODIyM2NjNy4uMDk0YzljYzk3NGQyY2JhODVlMWZhZTdhYjc0MDZl NzYwMzk1NTFkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTEwLTE3ICBUb21t eSBXaWRlbmZseWNodCAgPHRvbW15d0Bnb29nbGUuY29tPgorCisgICAgICAgIE1lZGlhU3RyZWFt IEFQSTogUmVuYW1lIG93bmVyIHRvIGNsaWVudCBpbiBNZWRpYVN0cmVhbURlc2NyaXB0b3IKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5NTkzCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAgICBUaGlzIHBhdGNoIHJlbmFt ZXMgb3duZXIgdG8gY2xpZW50IGluIE1lZGlhU3RyZWFtRGVzY3JpcHRvciBhcyBkaXNjdXNzZWQg aW4gIzk5MDgwLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBuZWVkZWQsIGNvdmVyZWQgYnkgZXhp c3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFt LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtOjpNZWRpYVN0cmVhbSk6CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbTo6fk1lZGlhU3RyZWFtKToKKyAgICAgICAgKiBNb2R1 bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLmg6CisgICAgICAgIChNZWRpYVN0cmVhbSk6Cisg ICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9QZWVyQ29ubmVjdGlvbjAwLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlBlZXJDb25uZWN0aW9uMDA6OmRpZFJlbW92ZVJlbW90ZVN0cmVhbSk6Cisg ICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSVENQZWVyQ29ubmVjdGlvbjo6ZGlkUmVtb3ZlUmVtb3RlU3RyZWFtKToK KyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbUNlbnRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbUNlbnRlcjo6ZW5kTG9jYWxNZWRpYVN0cmVhbSk6 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbUNlbnRlcjo6YWRkTWVkaWFTdHJlYW1UcmFj ayk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbUNlbnRlcjo6cmVtb3ZlTWVkaWFTdHJl YW1UcmFjayk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1EZXNj cmlwdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbURlc2NyaXB0b3JDbGllbnQ6 On5NZWRpYVN0cmVhbURlc2NyaXB0b3JDbGllbnQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFT dHJlYW1EZXNjcmlwdG9yOjpjbGllbnQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1E ZXNjcmlwdG9yOjpzZXRDbGllbnQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1EZXNj cmlwdG9yOjpNZWRpYVN0cmVhbURlc2NyaXB0b3IpOgorICAgICAgICAoTWVkaWFTdHJlYW1EZXNj cmlwdG9yKToKKwogMjAxMi0xMC0xOSAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEludmFsaWQgUmVnZXggaW4gU0FTU1Nv dXJjZU1hcHBpbmcvZGlkUmVxdWVzdENvbnRlbnQsIGJyZWFrcyBTdXBwb3J0IGZvciBTYXNzIGV4 cGVyaW1lbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0v TWVkaWFTdHJlYW0uY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRp YVN0cmVhbS5jcHAKaW5kZXggY2U4ZTI2NTVlZTdmMjMzMzlhYzlkOWZkNGQxODdkZWM0OTE5NzNj YS4uM2RhMzEyMTE3MWVkZTk2YmU1OTk3OTUzZDY5MzZkYmM2MWE3MzRmYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5jcHAKQEAgLTg4 LDcgKzg4LDcgQEAgTWVkaWFTdHJlYW06Ok1lZGlhU3RyZWFtKFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQqIGNvbnRleHQsIFBhc3NSZWZQdHI8TWVkaWFTdHJlYW0KICAgICA6IENvbnRleHREZXN0cnVj dGlvbk9ic2VydmVyKGNvbnRleHQpCiAgICAgLCBtX2Rlc2NyaXB0b3Ioc3RyZWFtRGVzY3JpcHRv cikKIHsKLSAgICBtX2Rlc2NyaXB0b3ItPnNldE93bmVyKHRoaXMpOworICAgIG1fZGVzY3JpcHRv ci0+c2V0Q2xpZW50KHRoaXMpOwogCiAgICAgTWVkaWFTdHJlYW1UcmFja1ZlY3RvciBhdWRpb1Ry YWNrVmVjdG9yOwogICAgIHNpemVfdCBudW1iZXJPZkF1ZGlvVHJhY2tzID0gbV9kZXNjcmlwdG9y LT5udW1iZXJPZkF1ZGlvQ29tcG9uZW50cygpOwpAQCAtMTA3LDcgKzEwNyw3IEBAIE1lZGlhU3Ry ZWFtOjpNZWRpYVN0cmVhbShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBQYXNzUmVm UHRyPE1lZGlhU3RyZWFtCiAKIE1lZGlhU3RyZWFtOjp+TWVkaWFTdHJlYW0oKQogewotICAgIG1f ZGVzY3JpcHRvci0+c2V0T3duZXIoMCk7CisgICAgbV9kZXNjcmlwdG9yLT5zZXRDbGllbnQoMCk7 CiAgICAgbV9hdWRpb1RyYWNrcy0+ZGV0YWNoT3duZXIoKTsKICAgICBtX3ZpZGVvVHJhY2tzLT5k ZXRhY2hPd25lcigpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbS5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVh bS9NZWRpYVN0cmVhbS5oCmluZGV4IGZjOGQ2Njc5ZWM2N2Y5MjJmZTVmMjJlZjkyOTZhMzYxNTdj MTI3NzguLjY0MmVjMGY5MjIwYTFkMmQwOTRiYmI3NTUxZTRiNWYwZTIwNmNlNTIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLmgKQEAgLTM3 LDcgKzM3LDcgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1jbGFzcyBNZWRpYVN0cmVhbSA6 IHB1YmxpYyBSZWZDb3VudGVkPE1lZGlhU3RyZWFtPiwgcHVibGljIE1lZGlhU3RyZWFtRGVzY3Jp cHRvck93bmVyLCBwdWJsaWMgRXZlbnRUYXJnZXQsIHB1YmxpYyBDb250ZXh0RGVzdHJ1Y3Rpb25P YnNlcnZlciB7CitjbGFzcyBNZWRpYVN0cmVhbSA6IHB1YmxpYyBSZWZDb3VudGVkPE1lZGlhU3Ry ZWFtPiwgcHVibGljIE1lZGlhU3RyZWFtRGVzY3JpcHRvckNsaWVudCwgcHVibGljIEV2ZW50VGFy Z2V0LCBwdWJsaWMgQ29udGV4dERlc3RydWN0aW9uT2JzZXJ2ZXIgewogcHVibGljOgogICAgIGVu dW0gUmVhZHlTdGF0ZSB7CiAgICAgICAgIExJVkUgPSAxLApAQCAtNTgsNyArNTgsNyBAQCBwdWJs aWM6CiAKICAgICB2aXJ0dWFsIGJvb2wgaXNMb2NhbCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9 CiAKLSAgICAvLyBNZWRpYVN0cmVhbURlc2NyaXB0b3JPd25lcgorICAgIC8vIE1lZGlhU3RyZWFt RGVzY3JpcHRvckNsaWVudAogICAgIHZpcnR1YWwgdm9pZCBzdHJlYW1FbmRlZCgpIE9WRVJSSURF OwogCiAgICAgTWVkaWFTdHJlYW1EZXNjcmlwdG9yKiBkZXNjcmlwdG9yKCkgY29uc3QgeyByZXR1 cm4gbV9kZXNjcmlwdG9yLmdldCgpOyB9CkBAIC04Miw3ICs4Miw3IEBAIHByaXZhdGU6CiAgICAg dmlydHVhbCB2b2lkIHJlZkV2ZW50VGFyZ2V0KCkgT1ZFUlJJREUgeyByZWYoKTsgfQogICAgIHZp cnR1YWwgdm9pZCBkZXJlZkV2ZW50VGFyZ2V0KCkgT1ZFUlJJREUgeyBkZXJlZigpOyB9CiAKLSAg ICAvLyBNZWRpYVN0cmVhbURlc2NyaXB0b3JPd25lcgorICAgIC8vIE1lZGlhU3RyZWFtRGVzY3Jp cHRvckNsaWVudAogICAgIHZpcnR1YWwgdm9pZCBhZGRUcmFjayhNZWRpYVN0cmVhbUNvbXBvbmVu dCopIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCByZW1vdmVUcmFjayhNZWRpYVN0cmVhbUNv bXBvbmVudCopIE9WRVJSSURFOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL1BlZXJDb25uZWN0aW9uMDAuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXN0cmVhbS9QZWVyQ29ubmVjdGlvbjAwLmNwcAppbmRleCA4NTU2ZDA4YzFmYjllOTAy ZTg3Y2E0MzU1NThmZDY1MmVjY2Q2Mzg5Li44OWZjNjA3ZmExYTVhNjZkNmMyYWJhOTYyMDNjNTE4 ZDI3ZmUxMjdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFt L1BlZXJDb25uZWN0aW9uMDAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vUGVlckNvbm5lY3Rpb24wMC5jcHAKQEAgLTQxMiw5ICs0MTIsOSBAQCB2b2lkIFBlZXJD b25uZWN0aW9uMDA6OmRpZEFkZFJlbW90ZVN0cmVhbShQYXNzUmVmUHRyPE1lZGlhU3RyZWFtRGVz Y3JpcHRvcj4gc3RyZQogdm9pZCBQZWVyQ29ubmVjdGlvbjAwOjpkaWRSZW1vdmVSZW1vdGVTdHJl YW0oTWVkaWFTdHJlYW1EZXNjcmlwdG9yKiBzdHJlYW1EZXNjcmlwdG9yKQogewogICAgIEFTU0VS VChzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPmlzQ29udGV4dFRocmVhZCgpKTsKLSAgICBBU1NF UlQoc3RyZWFtRGVzY3JpcHRvci0+b3duZXIoKSk7CisgICAgQVNTRVJUKHN0cmVhbURlc2NyaXB0 b3ItPmNsaWVudCgpKTsKIAotICAgIFJlZlB0cjxNZWRpYVN0cmVhbT4gc3RyZWFtID0gc3RhdGlj X2Nhc3Q8TWVkaWFTdHJlYW0qPihzdHJlYW1EZXNjcmlwdG9yLT5vd25lcigpKTsKKyAgICBSZWZQ dHI8TWVkaWFTdHJlYW0+IHN0cmVhbSA9IHN0YXRpY19jYXN0PE1lZGlhU3RyZWFtKj4oc3RyZWFt RGVzY3JpcHRvci0+Y2xpZW50KCkpOwogICAgIHN0cmVhbS0+c3RyZWFtRW5kZWQoKTsKIAogICAg IGlmIChtX3JlYWR5U3RhdGUgPT0gQ0xPU0VEKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmNwcAppbmRleCBkMmY5MDcy M2U0MTNlMmI2YmJjYzQyMDYxMjczYTQ4M2U5MDVjY2VjLi44NTgzNTE3Zjg4NWY2YzIyNzEyZTk2 MjU4YjVjZWFkZjdhZDFjYjczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmNwcApAQCAtNDgzLDkgKzQ4Myw5IEBA IHZvaWQgUlRDUGVlckNvbm5lY3Rpb246OmRpZEFkZFJlbW90ZVN0cmVhbShQYXNzUmVmUHRyPE1l ZGlhU3RyZWFtRGVzY3JpcHRvcj4gc3RyCiB2b2lkIFJUQ1BlZXJDb25uZWN0aW9uOjpkaWRSZW1v dmVSZW1vdGVTdHJlYW0oTWVkaWFTdHJlYW1EZXNjcmlwdG9yKiBzdHJlYW1EZXNjcmlwdG9yKQog ewogICAgIEFTU0VSVChzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPmlzQ29udGV4dFRocmVhZCgp KTsKLSAgICBBU1NFUlQoc3RyZWFtRGVzY3JpcHRvci0+b3duZXIoKSk7CisgICAgQVNTRVJUKHN0 cmVhbURlc2NyaXB0b3ItPmNsaWVudCgpKTsKIAotICAgIFJlZlB0cjxNZWRpYVN0cmVhbT4gc3Ry ZWFtID0gc3RhdGljX2Nhc3Q8TWVkaWFTdHJlYW0qPihzdHJlYW1EZXNjcmlwdG9yLT5vd25lcigp KTsKKyAgICBSZWZQdHI8TWVkaWFTdHJlYW0+IHN0cmVhbSA9IHN0YXRpY19jYXN0PE1lZGlhU3Ry ZWFtKj4oc3RyZWFtRGVzY3JpcHRvci0+Y2xpZW50KCkpOwogICAgIHN0cmVhbS0+c3RyZWFtRW5k ZWQoKTsKIAogICAgIGlmIChtX3JlYWR5U3RhdGUgPT0gUmVhZHlTdGF0ZUNsb3NlZCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtQ2Vu dGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFt Q2VudGVyLmNwcAppbmRleCBmNGY5ODIyZGU1MDk2NDYyMGY0ZWE1OWY2ZTAxMTYzYjcwNjFhNmE3 Li5kZWEyYzQ3OTY3ZjBkMjlkMzI5M2E2MTBmYjk0YmM4M2RhYTg3OGQ5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbUNlbnRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1DZW50 ZXIuY3BwCkBAIC00OSwyNSArNDksMjUgQEAgTWVkaWFTdHJlYW1DZW50ZXI6On5NZWRpYVN0cmVh bUNlbnRlcigpCiAKIHZvaWQgTWVkaWFTdHJlYW1DZW50ZXI6OmVuZExvY2FsTWVkaWFTdHJlYW0o TWVkaWFTdHJlYW1EZXNjcmlwdG9yKiBzdHJlYW1EZXNjcmlwdG9yKQogewotICAgIE1lZGlhU3Ry ZWFtRGVzY3JpcHRvck93bmVyKiBvd25lciA9IHN0cmVhbURlc2NyaXB0b3ItPm93bmVyKCk7Ci0g ICAgaWYgKG93bmVyKQotICAgICAgICBvd25lci0+c3RyZWFtRW5kZWQoKTsKKyAgICBNZWRpYVN0 cmVhbURlc2NyaXB0b3JDbGllbnQqIGNsaWVudCA9IHN0cmVhbURlc2NyaXB0b3ItPmNsaWVudCgp OworICAgIGlmIChjbGllbnQpCisgICAgICAgIGNsaWVudC0+c3RyZWFtRW5kZWQoKTsKICAgICBl bHNlCiAgICAgICAgIHN0cmVhbURlc2NyaXB0b3ItPnNldEVuZGVkKCk7CiB9CiAKIHZvaWQgTWVk aWFTdHJlYW1DZW50ZXI6OmFkZE1lZGlhU3RyZWFtVHJhY2soTWVkaWFTdHJlYW1EZXNjcmlwdG9y KiBzdHJlYW1EZXNjcmlwdG9yLCBNZWRpYVN0cmVhbUNvbXBvbmVudCogY29tcG9uZW50KQogewot ICAgIE1lZGlhU3RyZWFtRGVzY3JpcHRvck93bmVyKiBvd25lciA9IHN0cmVhbURlc2NyaXB0b3It Pm93bmVyKCk7Ci0gICAgaWYgKG93bmVyKQotICAgICAgICBvd25lci0+YWRkVHJhY2soY29tcG9u ZW50KTsKKyAgICBNZWRpYVN0cmVhbURlc2NyaXB0b3JDbGllbnQqIGNsaWVudCA9IHN0cmVhbURl c2NyaXB0b3ItPmNsaWVudCgpOworICAgIGlmIChjbGllbnQpCisgICAgICAgIGNsaWVudC0+YWRk VHJhY2soY29tcG9uZW50KTsKIH0KIAogdm9pZCBNZWRpYVN0cmVhbUNlbnRlcjo6cmVtb3ZlTWVk aWFTdHJlYW1UcmFjayhNZWRpYVN0cmVhbURlc2NyaXB0b3IqIHN0cmVhbURlc2NyaXB0b3IsIE1l ZGlhU3RyZWFtQ29tcG9uZW50KiBjb21wb25lbnQpCiB7Ci0gICAgTWVkaWFTdHJlYW1EZXNjcmlw dG9yT3duZXIqIG93bmVyID0gc3RyZWFtRGVzY3JpcHRvci0+b3duZXIoKTsKLSAgICBpZiAob3du ZXIpCi0gICAgICAgIG93bmVyLT5yZW1vdmVUcmFjayhjb21wb25lbnQpOworICAgIE1lZGlhU3Ry ZWFtRGVzY3JpcHRvckNsaWVudCogY2xpZW50ID0gc3RyZWFtRGVzY3JpcHRvci0+Y2xpZW50KCk7 CisgICAgaWYgKGNsaWVudCkKKyAgICAgICAgY2xpZW50LT5yZW1vdmVUcmFjayhjb21wb25lbnQp OwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbURlc2NyaXB0b3IuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtRGVzY3JpcHRvci5oCmluZGV4 IGM2MDYxMDUyZGExMzUyYTUyOGUzNTE0MjMzMmJkMDdhODA1NDhkYTAuLjEyNDFlMzM4OTU4M2U2 ODMyYWIwYjkxNWI0MzZkMTYyODRiMGMzM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtRGVzY3JpcHRvci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtRGVzY3JpcHRvci5oCkBAIC00 MCw5ICs0MCw5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotY2xhc3MgTWVkaWFTdHJlYW1E ZXNjcmlwdG9yT3duZXIgeworY2xhc3MgTWVkaWFTdHJlYW1EZXNjcmlwdG9yQ2xpZW50IHsKIHB1 YmxpYzoKLSAgICB2aXJ0dWFsIH5NZWRpYVN0cmVhbURlc2NyaXB0b3JPd25lcigpIHsgfQorICAg IHZpcnR1YWwgfk1lZGlhU3RyZWFtRGVzY3JpcHRvckNsaWVudCgpIHsgfQogCiAgICAgdmlydHVh bCB2b2lkIHN0cmVhbUVuZGVkKCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBhZGRUcmFjayhNZWRp YVN0cmVhbUNvbXBvbmVudCopID0gMDsKQEAgLTYxLDggKzYxLDggQEAgcHVibGljOgogICAgICAg ICByZXR1cm4gYWRvcHRSZWYobmV3IE1lZGlhU3RyZWFtRGVzY3JpcHRvcihsYWJlbCwgYXVkaW9T b3VyY2VzLCB2aWRlb1NvdXJjZXMpKTsKICAgICB9CiAKLSAgICBNZWRpYVN0cmVhbURlc2NyaXB0 b3JPd25lciogb3duZXIoKSBjb25zdCB7IHJldHVybiBtX293bmVyOyB9Ci0gICAgdm9pZCBzZXRP d25lcihNZWRpYVN0cmVhbURlc2NyaXB0b3JPd25lciogb3duZXIpIHsgbV9vd25lciA9IG93bmVy OyB9CisgICAgTWVkaWFTdHJlYW1EZXNjcmlwdG9yQ2xpZW50KiBjbGllbnQoKSBjb25zdCB7IHJl dHVybiBtX2NsaWVudDsgfQorICAgIHZvaWQgc2V0Q2xpZW50KE1lZGlhU3RyZWFtRGVzY3JpcHRv ckNsaWVudCogY2xpZW50KSB7IG1fY2xpZW50ID0gY2xpZW50OyB9CiAKICAgICBTdHJpbmcgbGFi ZWwoKSBjb25zdCB7IHJldHVybiBtX2xhYmVsOyB9CiAKQEAgLTgwLDcgKzgwLDcgQEAgcHVibGlj OgogCiBwcml2YXRlOgogICAgIE1lZGlhU3RyZWFtRGVzY3JpcHRvcihjb25zdCBTdHJpbmcmIGxh YmVsLCBjb25zdCBNZWRpYVN0cmVhbVNvdXJjZVZlY3RvciYgYXVkaW9Tb3VyY2VzLCBjb25zdCBN ZWRpYVN0cmVhbVNvdXJjZVZlY3RvciYgdmlkZW9Tb3VyY2VzKQotICAgICAgICA6IG1fb3duZXIo MCkKKyAgICAgICAgOiBtX2NsaWVudCgwKQogICAgICAgICAsIG1fbGFiZWwobGFiZWwpCiAgICAg ICAgICwgbV9lbmRlZChmYWxzZSkKICAgICB7CkBAIC05MSw3ICs5MSw3IEBAIHByaXZhdGU6CiAg ICAgICAgICAgICBtX3ZpZGVvQ29tcG9uZW50cy5hcHBlbmQoTWVkaWFTdHJlYW1Db21wb25lbnQ6 OmNyZWF0ZSh2aWRlb1NvdXJjZXNbaV0pKTsKICAgICB9CiAKLSAgICBNZWRpYVN0cmVhbURlc2Ny aXB0b3JPd25lciogbV9vd25lcjsKKyAgICBNZWRpYVN0cmVhbURlc2NyaXB0b3JDbGllbnQqIG1f Y2xpZW50OwogICAgIFN0cmluZyBtX2xhYmVsOwogICAgIFZlY3RvcjxSZWZQdHI8TWVkaWFTdHJl YW1Db21wb25lbnQ+ID4gbV9hdWRpb0NvbXBvbmVudHM7CiAgICAgVmVjdG9yPFJlZlB0cjxNZWRp YVN0cmVhbUNvbXBvbmVudD4gPiBtX3ZpZGVvQ29tcG9uZW50czsK