108269 2013-01-29 17:30:29 -0800 Remove MessageID parameter from Connection::sendMessage 2013-01-29 17:40:39 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 819574 0 andersca 2013-01-29 17:30:29 -0800 Remove MessageID parameter from Connection::sendMessage 819579 1 185357 andersca 2013-01-29 17:33:11 -0800 Created attachment 185357 Patch 819582 2 webkit.review.bot 2013-01-29 17:36:23 -0800 Attachment 185357 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit2/Platform/CoreIPC/Connection.cpp', u'Source/WebKit2/Platform/CoreIPC/Connection.h', u'Source/WebKit2/Platform/CoreIPC/MessageSender.h', u'Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp', u'Source/WebKit2/Shared/ChildProcessProxy.cpp', u'Source/WebKit2/Shared/WebConnection.cpp', u'Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp']" exit_code: 1 Source/WebKit2/Platform/CoreIPC/Connection.h:184: Local variables should never be PassOwnPtr (see http://webkit.org/coding/RefPtr.html). [readability/pass_ptr] [5] Source/WebKit2/Platform/CoreIPC/Connection.h:185: Local variables should never be PassOwnPtr (see http://webkit.org/coding/RefPtr.html). [readability/pass_ptr] [5] Total errors found: 2 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 819588 3 andersca 2013-01-29 17:40:39 -0800 Committed r141191: <http://trac.webkit.org/changeset/141191> 185357 2013-01-29 17:33:11 -0800 2013-01-29 17:34:00 -0800 Patch bug-108269-20130129172957.patch text/plain 13577 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMTgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNWY4MzUxMzVmMGViN2Q3 YzQxNzE2YmIxZDM4MDMyNDdlYTYzZWVmNy4uMTU4MmQ1MTc4NTlkMGNiNTEwNjNlZjJjZjM1N2My Mjg0OTMzNmRjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDEzLTAxLTI5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVtb3ZlIE1lc3Nh Z2VJRCBwYXJhbWV0ZXIgZnJvbSBDb25uZWN0aW9uOjpzZW5kTWVzc2FnZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MjY5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9Db3JlSVBDL0Nv bm5lY3Rpb24uY3BwOgorICAgICAgICAoQ29yZUlQQzo6Q29ubmVjdGlvbjo6c2VuZE1lc3NhZ2Up OgorICAgICAgICAoQ29yZUlQQzo6Q29ubmVjdGlvbjo6c2VuZFN5bmNSZXBseSk6CisgICAgICAg IChDb3JlSVBDOjpDb25uZWN0aW9uOjpzZW5kU3luY01lc3NhZ2UpOgorICAgICAgICAoQ29yZUlQ Qzo6Q29ubmVjdGlvbjo6c2VuZFN5bmNNZXNzYWdlRnJvbVNlY29uZGFyeVRocmVhZCk6CisgICAg ICAgICogUGxhdGZvcm0vQ29yZUlQQy9Db25uZWN0aW9uLmg6CisgICAgICAgIChDb25uZWN0aW9u KToKKyAgICAgICAgKENvcmVJUEM6OkNvbm5lY3Rpb246OnNlbmQpOgorICAgICAgICAoQ29yZUlQ Qzo6Q29ubmVjdGlvbjo6c2VuZFN5bmMpOgorICAgICAgICAqIFBsYXRmb3JtL0NvcmVJUEMvTWVz c2FnZVNlbmRlci5oOgorICAgICAgICAoQ29yZUlQQzo6TWVzc2FnZVNlbmRlcjo6c2VuZCk6Cisg ICAgICAgIChDb3JlSVBDOjpNZXNzYWdlU2VuZGVyOjpzZW5kTWVzc2FnZSk6CisgICAgICAgICog UGxhdGZvcm0vQ29yZUlQQy9tYWMvQ29ubmVjdGlvbk1hYy5jcHA6CisgICAgICAgIChDb3JlSVBD OjpDb25uZWN0aW9uOjpvcGVuKToKKyAgICAgICAgKiBTaGFyZWQvQ2hpbGRQcm9jZXNzUHJveHku Y3BwOgorICAgICAgICAoV2ViS2l0OjpDaGlsZFByb2Nlc3NQcm94eTo6c2VuZE1lc3NhZ2UpOgor ICAgICAgICAoV2ViS2l0OjpDaGlsZFByb2Nlc3NQcm94eTo6ZGlkRmluaXNoTGF1bmNoaW5nKToK KyAgICAgICAgKiBTaGFyZWQvV2ViQ29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YkNvbm5lY3Rpb246OnBvc3RNZXNzYWdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVk QnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6SW5qZWN0ZWRCdW5k bGU6OnBvc3RNZXNzYWdlKToKKyAgICAgICAgKFdlYktpdDo6SW5qZWN0ZWRCdW5kbGU6OnBvc3RT eW5jaHJvbm91c01lc3NhZ2UpOgorCisyMDEzLTAxLTI5ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRl cnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgU3RvcCBnZW5lcmF0aW5nIHRoZSBtZXNzYWdlIGtp bmQgZW51bQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTA4MjU4CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQ29u bmVjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0Nvbm5lY3Rpb24u Y3BwCmluZGV4IGNkOWZmNTc3ZGFjODliOGEwNWNjYTgyOTI2Y2FjMjVkOWY2MTUxMzEuLmU2YTk0 ZjE5NmNkMjcwM2FjMzk4ZWQ1MzI1Y2ZlNjFmZmYzYmRmMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQ29ubmVjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvUGxhdGZvcm0vQ29yZUlQQy9Db25uZWN0aW9uLmNwcApAQCAtMzE1LDcgKzMxNSw3IEBAIFBh c3NPd25QdHI8TWVzc2FnZUVuY29kZXI+IENvbm5lY3Rpb246OmNyZWF0ZVN5bmNNZXNzYWdlRW5j b2RlcihTdHJpbmdSZWZlcmVuY2UKICAgICByZXR1cm4gZW5jb2Rlci5yZWxlYXNlKCk7CiB9CiAK LWJvb2wgQ29ubmVjdGlvbjo6c2VuZE1lc3NhZ2UoTWVzc2FnZUlEIG1lc3NhZ2VJRCwgUGFzc093 blB0cjxNZXNzYWdlRW5jb2Rlcj4gZW5jb2RlciwgdW5zaWduZWQgbWVzc2FnZVNlbmRGbGFncykK K2Jvb2wgQ29ubmVjdGlvbjo6c2VuZE1lc3NhZ2UoUGFzc093blB0cjxNZXNzYWdlRW5jb2Rlcj4g ZW5jb2RlciwgdW5zaWduZWQgbWVzc2FnZVNlbmRGbGFncykKIHsKICAgICBpZiAoIWlzVmFsaWQo KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMzI3LDcgKzMyNyw3IEBAIGJvb2wgQ29ubmVj dGlvbjo6c2VuZE1lc3NhZ2UoTWVzc2FnZUlEIG1lc3NhZ2VJRCwgUGFzc093blB0cjxNZXNzYWdl RW5jb2Rlcj4gZW5jCiAKICAgICB7CiAgICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX291dGdv aW5nTWVzc2FnZXNMb2NrKTsKLSAgICAgICAgbV9vdXRnb2luZ01lc3NhZ2VzLmFwcGVuZChPdXRn b2luZ01lc3NhZ2UobWVzc2FnZUlELCBlbmNvZGVyKSk7CisgICAgICAgIG1fb3V0Z29pbmdNZXNz YWdlcy5hcHBlbmQoT3V0Z29pbmdNZXNzYWdlKE1lc3NhZ2VJRCgpLCBlbmNvZGVyKSk7CiAgICAg fQogICAgIAogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgYWRkIGEgYm9vbGVhbiBmbGFnIHNvIHdl IGRvbid0IGNhbGwgdGhpcyB3aGVuIHdvcmsgaGFzIGFscmVhZHkgYmVlbiBzY2hlZHVsZWQuCkBA IC0zMzcsNyArMzM3LDcgQEAgYm9vbCBDb25uZWN0aW9uOjpzZW5kTWVzc2FnZShNZXNzYWdlSUQg bWVzc2FnZUlELCBQYXNzT3duUHRyPE1lc3NhZ2VFbmNvZGVyPiBlbmMKIAogYm9vbCBDb25uZWN0 aW9uOjpzZW5kU3luY1JlcGx5KFBhc3NPd25QdHI8TWVzc2FnZUVuY29kZXI+IGVuY29kZXIpCiB7 Ci0gICAgcmV0dXJuIHNlbmRNZXNzYWdlKE1lc3NhZ2VJRCgpLCBlbmNvZGVyKTsKKyAgICByZXR1 cm4gc2VuZE1lc3NhZ2UoZW5jb2Rlcik7CiB9CiAKIFBhc3NPd25QdHI8TWVzc2FnZURlY29kZXI+ IENvbm5lY3Rpb246OndhaXRGb3JNZXNzYWdlKFN0cmluZ1JlZmVyZW5jZSBtZXNzYWdlUmVjZWl2 ZXJOYW1lLCBTdHJpbmdSZWZlcmVuY2UgbWVzc2FnZU5hbWUsIHVpbnQ2NF90IGRlc3RpbmF0aW9u SUQsIGRvdWJsZSB0aW1lb3V0KQpAQCAtMzk2LDEyICszOTYsMTIgQEAgUGFzc093blB0cjxNZXNz YWdlRGVjb2Rlcj4gQ29ubmVjdGlvbjo6d2FpdEZvck1lc3NhZ2UoU3RyaW5nUmVmZXJlbmNlIG1l c3NhZ2VSZWMKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAotUGFzc093blB0cjxNZXNzYWdlRGVj b2Rlcj4gQ29ubmVjdGlvbjo6c2VuZFN5bmNNZXNzYWdlKE1lc3NhZ2VJRCBtZXNzYWdlSUQsIHVp bnQ2NF90IHN5bmNSZXF1ZXN0SUQsIFBhc3NPd25QdHI8TWVzc2FnZUVuY29kZXI+IGVuY29kZXIs IGRvdWJsZSB0aW1lb3V0LCB1bnNpZ25lZCBzeW5jU2VuZEZsYWdzKQorUGFzc093blB0cjxNZXNz YWdlRGVjb2Rlcj4gQ29ubmVjdGlvbjo6c2VuZFN5bmNNZXNzYWdlKHVpbnQ2NF90IHN5bmNSZXF1 ZXN0SUQsIFBhc3NPd25QdHI8TWVzc2FnZUVuY29kZXI+IGVuY29kZXIsIGRvdWJsZSB0aW1lb3V0 LCB1bnNpZ25lZCBzeW5jU2VuZEZsYWdzKQogewogICAgIGlmIChSdW5Mb29wOjpjdXJyZW50KCkg IT0gbV9jbGllbnRSdW5Mb29wKSB7CiAgICAgICAgIC8vIE5vIGZsYWdzIGFyZSBzdXBwb3J0ZWQg Zm9yIHN5bmNocm9ub3VzIG1lc3NhZ2VzIHNlbnQgZnJvbSBzZWNvbmRhcnkgdGhyZWFkcy4KICAg ICAgICAgQVNTRVJUKCFzeW5jU2VuZEZsYWdzKTsKLSAgICAgICAgcmV0dXJuIHNlbmRTeW5jTWVz c2FnZUZyb21TZWNvbmRhcnlUaHJlYWQobWVzc2FnZUlELCBzeW5jUmVxdWVzdElELCBlbmNvZGVy LCB0aW1lb3V0KTsKKyAgICAgICAgcmV0dXJuIHNlbmRTeW5jTWVzc2FnZUZyb21TZWNvbmRhcnlU aHJlYWQoc3luY1JlcXVlc3RJRCwgZW5jb2RlciwgdGltZW91dCk7CiAgICAgfQogCiAgICAgaWYg KCFpc1ZhbGlkKCkpIHsKQEAgLTQyMSw3ICs0MjEsNyBAQCBQYXNzT3duUHRyPE1lc3NhZ2VEZWNv ZGVyPiBDb25uZWN0aW9uOjpzZW5kU3luY01lc3NhZ2UoTWVzc2FnZUlEIG1lc3NhZ2VJRCwgdWlu dAogICAgIH0KIAogICAgIC8vIEZpcnN0IHNlbmQgdGhlIG1lc3NhZ2UuCi0gICAgc2VuZE1lc3Nh Z2UobWVzc2FnZUlELCBlbmNvZGVyLCBEaXNwYXRjaE1lc3NhZ2VFdmVuV2hlbldhaXRpbmdGb3JT eW5jUmVwbHkpOworICAgIHNlbmRNZXNzYWdlKGVuY29kZXIsIERpc3BhdGNoTWVzc2FnZUV2ZW5X aGVuV2FpdGluZ0ZvclN5bmNSZXBseSk7CiAKICAgICAvLyBUaGVuIHdhaXQgZm9yIGEgcmVwbHku IFdhaXRpbmcgZm9yIGEgcmVwbHkgY291bGQgaW52b2x2ZSBkaXNwYXRjaGluZyBpbmNvbWluZyBz eW5jIG1lc3NhZ2VzLCBzbwogICAgIC8vIGtlZXAgYW4gZXh0cmEgcmVmZXJlbmNlIHRvIHRoZSBj b25uZWN0aW9uIGhlcmUgaW4gY2FzZSBpdCdzIGludmFsaWRhdGVkLgpAQCAtNDQxLDcgKzQ0MSw3 IEBAIFBhc3NPd25QdHI8TWVzc2FnZURlY29kZXI+IENvbm5lY3Rpb246OnNlbmRTeW5jTWVzc2Fn ZShNZXNzYWdlSUQgbWVzc2FnZUlELCB1aW50CiAgICAgcmV0dXJuIHJlcGx5LnJlbGVhc2UoKTsK IH0KIAotUGFzc093blB0cjxNZXNzYWdlRGVjb2Rlcj4gQ29ubmVjdGlvbjo6c2VuZFN5bmNNZXNz YWdlRnJvbVNlY29uZGFyeVRocmVhZChNZXNzYWdlSUQgbWVzc2FnZUlELCB1aW50NjRfdCBzeW5j UmVxdWVzdElELCBQYXNzT3duUHRyPE1lc3NhZ2VFbmNvZGVyPiBlbmNvZGVyLCBkb3VibGUgdGlt ZW91dCkKK1Bhc3NPd25QdHI8TWVzc2FnZURlY29kZXI+IENvbm5lY3Rpb246OnNlbmRTeW5jTWVz c2FnZUZyb21TZWNvbmRhcnlUaHJlYWQodWludDY0X3Qgc3luY1JlcXVlc3RJRCwgUGFzc093blB0 cjxNZXNzYWdlRW5jb2Rlcj4gZW5jb2RlciwgZG91YmxlIHRpbWVvdXQpCiB7CiAgICAgQVNTRVJU KFJ1bkxvb3A6OmN1cnJlbnQoKSAhPSBtX2NsaWVudFJ1bkxvb3ApOwogCkBAIC00NjAsNyArNDYw LDcgQEAgUGFzc093blB0cjxNZXNzYWdlRGVjb2Rlcj4gQ29ubmVjdGlvbjo6c2VuZFN5bmNNZXNz YWdlRnJvbVNlY29uZGFyeVRocmVhZChNZXNzYWcKICAgICAgICAgbV9zZWNvbmRhcnlUaHJlYWRQ ZW5kaW5nU3luY1JlcGx5TWFwLmFkZChzeW5jUmVxdWVzdElELCAmcGVuZGluZ1JlcGx5KTsKICAg ICB9CiAKLSAgICBzZW5kTWVzc2FnZShtZXNzYWdlSUQsIGVuY29kZXIsIDApOworICAgIHNlbmRN ZXNzYWdlKGVuY29kZXIsIDApOwogCiAgICAgLy8gVXNlIGEgcmVhbGx5IGxvbmcgdGltZW91dC4K ICAgICBpZiAodGltZW91dCA9PSBOb1RpbWVvdXQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9QbGF0Zm9ybS9Db3JlSVBDL0Nvbm5lY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3Jt L0NvcmVJUEMvQ29ubmVjdGlvbi5oCmluZGV4IGQ5ZjcxYjc1MDFkYzIzOWI4NTFkYWYwMjc3MTBm ZGQ0NmVkNDFlOTguLmI0OGJhNDNmNTIwNDU1NDgxODIyNzBkMGJiNDAyMTk1MmU0NTEzZjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQ29ubmVjdGlvbi5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQ29ubmVjdGlvbi5oCkBAIC0xODAs OSArMTgwLDkgQEAgcHVibGljOgogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGJvb2wgd2FpdEZv ckFuZERpc3BhdGNoSW1tZWRpYXRlbHkodWludDY0X3QgZGVzdGluYXRpb25JRCwgZG91YmxlIHRp bWVvdXQpOwogCiAgICAgUGFzc093blB0cjxNZXNzYWdlRW5jb2Rlcj4gY3JlYXRlU3luY01lc3Nh Z2VFbmNvZGVyKFN0cmluZ1JlZmVyZW5jZSBtZXNzYWdlUmVjZWl2ZXJOYW1lLCBTdHJpbmdSZWZl cmVuY2UgbWVzc2FnZU5hbWUsIHVpbnQ2NF90IGRlc3RpbmF0aW9uSUQsIHVpbnQ2NF90JiBzeW5j UmVxdWVzdElEKTsKLSAgICBib29sIHNlbmRNZXNzYWdlKE1lc3NhZ2VJRCwgUGFzc093blB0cjxN ZXNzYWdlRW5jb2Rlcj4sIHVuc2lnbmVkIG1lc3NhZ2VTZW5kRmxhZ3MgPSAwKTsKLSAgICBQYXNz T3duUHRyPE1lc3NhZ2VEZWNvZGVyPiBzZW5kU3luY01lc3NhZ2UoTWVzc2FnZUlELCB1aW50NjRf dCBzeW5jUmVxdWVzdElELCBQYXNzT3duUHRyPE1lc3NhZ2VFbmNvZGVyPiwgZG91YmxlIHRpbWVv dXQsIHVuc2lnbmVkIHN5bmNTZW5kRmxhZ3MgPSAwKTsKLSAgICBQYXNzT3duUHRyPE1lc3NhZ2VE ZWNvZGVyPiBzZW5kU3luY01lc3NhZ2VGcm9tU2Vjb25kYXJ5VGhyZWFkKE1lc3NhZ2VJRCwgdWlu dDY0X3Qgc3luY1JlcXVlc3RJRCwgUGFzc093blB0cjxNZXNzYWdlRW5jb2Rlcj4sIGRvdWJsZSB0 aW1lb3V0KTsKKyAgICBib29sIHNlbmRNZXNzYWdlKFBhc3NPd25QdHI8TWVzc2FnZUVuY29kZXI+ LCB1bnNpZ25lZCBtZXNzYWdlU2VuZEZsYWdzID0gMCk7CisgICAgUGFzc093blB0cjxNZXNzYWdl RGVjb2Rlcj4gc2VuZFN5bmNNZXNzYWdlKHVpbnQ2NF90IHN5bmNSZXF1ZXN0SUQsIFBhc3NPd25Q dHI8TWVzc2FnZUVuY29kZXI+LCBkb3VibGUgdGltZW91dCwgdW5zaWduZWQgc3luY1NlbmRGbGFn cyA9IDApOworICAgIFBhc3NPd25QdHI8TWVzc2FnZURlY29kZXI+IHNlbmRTeW5jTWVzc2FnZUZy b21TZWNvbmRhcnlUaHJlYWQodWludDY0X3Qgc3luY1JlcXVlc3RJRCwgUGFzc093blB0cjxNZXNz YWdlRW5jb2Rlcj4sIGRvdWJsZSB0aW1lb3V0KTsKICAgICBib29sIHNlbmRTeW5jUmVwbHkoUGFz c093blB0cjxNZXNzYWdlRW5jb2Rlcj4pOwogCiAgICAgdm9pZCB3YWtlVXBSdW5Mb29wKCk7CkBA IC00MDUsNyArNDA1LDcgQEAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gYm9vbCBDb25uZWN0aW9uOjpz ZW5kKGNvbnN0IFQmIG1lc3NhZ2UsIHVpbnQ2NF90IGRlc3RpbmF0aW8KICAgICBPd25QdHI8TWVz c2FnZUVuY29kZXI+IGVuY29kZXIgPSBNZXNzYWdlRW5jb2Rlcjo6Y3JlYXRlKFQ6OnJlY2VpdmVy TmFtZSgpLCBUOjpuYW1lKCksIGRlc3RpbmF0aW9uSUQpOwogICAgIGVuY29kZXItPmVuY29kZSht ZXNzYWdlKTsKICAgICAKLSAgICByZXR1cm4gc2VuZE1lc3NhZ2UoTWVzc2FnZUlEKCksIGVuY29k ZXIucmVsZWFzZSgpLCBtZXNzYWdlU2VuZEZsYWdzKTsKKyAgICByZXR1cm4gc2VuZE1lc3NhZ2Uo ZW5jb2Rlci5yZWxlYXNlKCksIG1lc3NhZ2VTZW5kRmxhZ3MpOwogfQogCiB0ZW1wbGF0ZTx0eXBl bmFtZSBUPiBib29sIENvbm5lY3Rpb246OnNlbmRTeW5jKGNvbnN0IFQmIG1lc3NhZ2UsIGNvbnN0 IHR5cGVuYW1lIFQ6OlJlcGx5JiByZXBseSwgdWludDY0X3QgZGVzdGluYXRpb25JRCwgZG91Ymxl IHRpbWVvdXQsIHVuc2lnbmVkIHN5bmNTZW5kRmxhZ3MpCkBAIC00MTksNyArNDE5LDcgQEAgdGVt cGxhdGU8dHlwZW5hbWUgVD4gYm9vbCBDb25uZWN0aW9uOjpzZW5kU3luYyhjb25zdCBUJiBtZXNz YWdlLCBjb25zdCB0eXBlbmFtZQogICAgIGVuY29kZXItPmVuY29kZShtZXNzYWdlKTsKIAogICAg IC8vIE5vdyBzZW5kIHRoZSBtZXNzYWdlIGFuZCB3YWl0IGZvciBhIHJlcGx5LgotICAgIE93blB0 cjxNZXNzYWdlRGVjb2Rlcj4gcmVwbHlEZWNvZGVyID0gc2VuZFN5bmNNZXNzYWdlKE1lc3NhZ2VJ RCgpLCBzeW5jUmVxdWVzdElELCBlbmNvZGVyLnJlbGVhc2UoKSwgdGltZW91dCwgc3luY1NlbmRG bGFncyk7CisgICAgT3duUHRyPE1lc3NhZ2VEZWNvZGVyPiByZXBseURlY29kZXIgPSBzZW5kU3lu Y01lc3NhZ2Uoc3luY1JlcXVlc3RJRCwgZW5jb2Rlci5yZWxlYXNlKCksIHRpbWVvdXQsIHN5bmNT ZW5kRmxhZ3MpOwogICAgIGlmICghcmVwbHlEZWNvZGVyKQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvTWVzc2FnZVNl bmRlci5oIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9NZXNzYWdlU2VuZGVyLmgK aW5kZXggODBkMzFjZDEzMDZiZWZmM2ZkYzZiZTM0NzcxNWQ1NjUwODc3YWY0Ni4uMTMxMjJjM2Zk NzRlZjMyZDg1YWVlM2UxYWM2OWY0YTRlMTYxZGVhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvUGxhdGZvcm0vQ29yZUlQQy9NZXNzYWdlU2VuZGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIv UGxhdGZvcm0vQ29yZUlQQy9NZXNzYWdlU2VuZGVyLmgKQEAgLTQ0LDE1ICs0NCwxNSBAQCBwdWJs aWM6CiAgICAgICAgIE93blB0cjxNZXNzYWdlRW5jb2Rlcj4gZW5jb2RlciA9IE1lc3NhZ2VFbmNv ZGVyOjpjcmVhdGUoVTo6cmVjZWl2ZXJOYW1lKCksIFU6Om5hbWUoKSwgZGVzdGluYXRpb25JRCk7 CiAgICAgICAgIGVuY29kZXItPmVuY29kZShtZXNzYWdlKTsKICAgICAgICAgCi0gICAgICAgIHJl dHVybiBzdGF0aWNfY2FzdDxUKj4odGhpcyktPnNlbmRNZXNzYWdlKE1lc3NhZ2VJRCgpLCBlbmNv ZGVyLnJlbGVhc2UoKSk7CisgICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxUKj4odGhpcyktPnNl bmRNZXNzYWdlKGVuY29kZXIucmVsZWFzZSgpKTsKICAgICB9CiAgICAgCi0gICAgYm9vbCBzZW5k TWVzc2FnZShNZXNzYWdlSUQgbWVzc2FnZUlELCBQYXNzT3duUHRyPE1lc3NhZ2VFbmNvZGVyPiBl bmNvZGVyKQorICAgIGJvb2wgc2VuZE1lc3NhZ2UoUGFzc093blB0cjxNZXNzYWdlRW5jb2Rlcj4g ZW5jb2RlcikKICAgICB7CiAgICAgICAgIENvbm5lY3Rpb24qIGNvbm5lY3Rpb24gPSBzdGF0aWNf Y2FzdDxUKj4odGhpcyktPmNvbm5lY3Rpb24oKTsKICAgICAgICAgQVNTRVJUKGNvbm5lY3Rpb24p OwogCi0gICAgICAgIHJldHVybiBjb25uZWN0aW9uLT5zZW5kTWVzc2FnZShtZXNzYWdlSUQsIGVu Y29kZXIpOworICAgICAgICByZXR1cm4gY29ubmVjdGlvbi0+c2VuZE1lc3NhZ2UoZW5jb2Rlcik7 CiAgICAgfQogCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVT4gYm9vbCBzZW5kU3luYyhjb25zdCBV JiBtZXNzYWdlLCBjb25zdCB0eXBlbmFtZSBVOjpSZXBseSYgcmVwbHksIGRvdWJsZSB0aW1lb3V0 ID0gQ29ubmVjdGlvbjo6Tm9UaW1lb3V0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGxh dGZvcm0vQ29yZUlQQy9tYWMvQ29ubmVjdGlvbk1hYy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0 Zm9ybS9Db3JlSVBDL21hYy9Db25uZWN0aW9uTWFjLmNwcAppbmRleCBlMjZkMmY3NzY2ZjI2ZGNl NThjOGI0NGIxYzRiYjhlMDcyOGIxM2JkLi4wNDkyMGQyMzViNWMxYjc4YTdkMGM1MTMyZmQ2NzYz YmIyOTVmMWExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL21h Yy9Db25uZWN0aW9uTWFjLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBD L21hYy9Db25uZWN0aW9uTWFjLmNwcApAQCAtMTM1LDcgKzEzNSw3IEBAIGJvb2wgQ29ubmVjdGlv bjo6b3BlbigpCiAgICAgICAgIE93blB0cjxNZXNzYWdlRW5jb2Rlcj4gZW5jb2RlciA9IE1lc3Nh Z2VFbmNvZGVyOjpjcmVhdGUoIklQQyIsICJJbml0aWFsaXplQ29ubmVjdGlvbiIsIDApOwogICAg ICAgICBlbmNvZGVyLT5lbmNvZGUoTWFjaFBvcnQobV9yZWNlaXZlUG9ydCwgTUFDSF9NU0dfVFlQ RV9NQUtFX1NFTkQpKTsKIAotICAgICAgICBzZW5kTWVzc2FnZShNZXNzYWdlSUQoKSwgZW5jb2Rl ci5yZWxlYXNlKCkpOworICAgICAgICBzZW5kTWVzc2FnZShlbmNvZGVyLnJlbGVhc2UoKSk7CiAK ICAgICAgICAgLy8gU2V0IHRoZSBkZWFkIG5hbWUgaGFuZGxlciBmb3Igb3VyIHNlbmQgcG9ydC4K ICAgICAgICAgaW5pdGlhbGl6ZURlYWROYW1lU291cmNlKCk7CkBAIC0xNTYsNyArMTU2LDcgQEAg Ym9vbCBDb25uZWN0aW9uOjpvcGVuKCkKICAgICAgICAgT3duUHRyPE1lc3NhZ2VFbmNvZGVyPiBl bmNvZGVyID0gTWVzc2FnZUVuY29kZXI6OmNyZWF0ZSgiSVBDIiwgIlNldEV4Y2VwdGlvblBvcnQi LCAwKTsKICAgICAgICAgZW5jb2Rlci0+ZW5jb2RlKE1hY2hQb3J0KG1fZXhjZXB0aW9uUG9ydCwg TUFDSF9NU0dfVFlQRV9NQUtFX1NFTkQpKTsKIAotICAgICAgICBzZW5kTWVzc2FnZShNZXNzYWdl SUQoKSwgZW5jb2Rlci5yZWxlYXNlKCkpOworICAgICAgICBzZW5kTWVzc2FnZShlbmNvZGVyLnJl bGVhc2UoKSk7CiAgICAgfQogCiAgICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvQ2hpbGRQcm9jZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvU2hh cmVkL0NoaWxkUHJvY2Vzc1Byb3h5LmNwcAppbmRleCAzNzcyZmMwZjZiMjhlYWMzOWQ4NGUxY2Ux NzE1ODk3ZDVlZDRmYjI1Li5jZjYzOGEwZGZiNDFmNGIwMDJlMTk2ODFlZDUxZmQyN2Q1ZTUxYTc5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ2hpbGRQcm9jZXNzUHJveHkuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9DaGlsZFByb2Nlc3NQcm94eS5jcHAKQEAgLTg4 LDcgKzg4LDcgQEAgYm9vbCBDaGlsZFByb2Nlc3NQcm94eTo6c2VuZE1lc3NhZ2UoQ29yZUlQQzo6 TWVzc2FnZUlEIG1lc3NhZ2VJRCwgUGFzc093blB0cjxDb3IKICAgICBpZiAoIW1fY29ubmVjdGlv bikKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgcmV0dXJuIGNvbm5lY3Rpb24oKS0+c2Vu ZE1lc3NhZ2UobWVzc2FnZUlELCBlbmNvZGVyLCBtZXNzYWdlU2VuZEZsYWdzKTsKKyAgICByZXR1 cm4gY29ubmVjdGlvbigpLT5zZW5kTWVzc2FnZShlbmNvZGVyLCBtZXNzYWdlU2VuZEZsYWdzKTsK IH0KIAogYm9vbCBDaGlsZFByb2Nlc3NQcm94eTo6aXNMYXVuY2hpbmcoKSBjb25zdApAQCAtMTE3 LDcgKzExNyw3IEBAIHZvaWQgQ2hpbGRQcm9jZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZyhQ cm9jZXNzTGF1bmNoZXIqLCBDb3JlSVBDOjpDb25uZWN0aW9uCiAgICAgZm9yIChzaXplX3QgaSA9 IDA7IGkgPCBtX3BlbmRpbmdNZXNzYWdlcy5zaXplKCk7ICsraSkgewogICAgICAgICBDb3JlSVBD OjpDb25uZWN0aW9uOjpPdXRnb2luZ01lc3NhZ2UmIG91dGdvaW5nTWVzc2FnZSA9IG1fcGVuZGlu Z01lc3NhZ2VzW2ldLmZpcnN0OwogICAgICAgICB1bnNpZ25lZCBtZXNzYWdlU2VuZEZsYWdzID0g bV9wZW5kaW5nTWVzc2FnZXNbaV0uc2Vjb25kOwotICAgICAgICBtX2Nvbm5lY3Rpb24tPnNlbmRN ZXNzYWdlKG91dGdvaW5nTWVzc2FnZS5tZXNzYWdlSUQoKSwgYWRvcHRQdHIob3V0Z29pbmdNZXNz YWdlLmFyZ3VtZW50cygpKSwgbWVzc2FnZVNlbmRGbGFncyk7CisgICAgICAgIG1fY29ubmVjdGlv bi0+c2VuZE1lc3NhZ2UoYWRvcHRQdHIob3V0Z29pbmdNZXNzYWdlLmFyZ3VtZW50cygpKSwgbWVz c2FnZVNlbmRGbGFncyk7CiAgICAgfQogCiAgICAgbV9wZW5kaW5nTWVzc2FnZXMuY2xlYXIoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb25uZWN0aW9uLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb25uZWN0aW9uLmNwcAppbmRleCBkM2Y2ZDNlMTliMjY2 MDA2ZmRmNGRlNjI4ZGFlNTBkNDc3Njc2N2U0Li5iZTZjZTI4YTc4ODc1MGZkNTU2ZjhhODg5YzEw NjYxNzBjNjIxMzUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViQ29ubmVj dGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkNvbm5lY3Rpb24uY3BwCkBA IC01NSw3ICs1NSw3IEBAIHZvaWQgV2ViQ29ubmVjdGlvbjo6cG9zdE1lc3NhZ2UoY29uc3QgU3Ry aW5nJiBtZXNzYWdlTmFtZSwgQVBJT2JqZWN0KiBtZXNzYWdlQm9kCiAgICAgZW5jb2Rlci0+ZW5j b2RlKG1lc3NhZ2VOYW1lKTsKICAgICBlbmNvZGVNZXNzYWdlQm9keSgqZW5jb2RlciwgbWVzc2Fn ZUJvZHkpOwogCi0gICAgc2VuZE1lc3NhZ2UoQ29yZUlQQzo6TWVzc2FnZUlEKCksIGVuY29kZXIu cmVsZWFzZSgpKTsKKyAgICBzZW5kTWVzc2FnZShlbmNvZGVyLnJlbGVhc2UoKSk7CiB9CiAKIHZv aWQgV2ViQ29ubmVjdGlvbjo6ZGlkQ2xvc2UoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcAppbmRleCA1 N2M1YjM5NDI0MzNmN2E1YTdhOGNiYmE3ZmYzMTgzY2M1YjRhOWNmLi4wNjYxNWUwMTE4MTBhN2Q1 Y2Q1NzBiOGJhMDQ3M2I4MDFmOTAxZjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcApAQCAtMTEy LDcgKzExMiw3IEBAIHZvaWQgSW5qZWN0ZWRCdW5kbGU6OnBvc3RNZXNzYWdlKGNvbnN0IFN0cmlu ZyYgbWVzc2FnZU5hbWUsIEFQSU9iamVjdCogbWVzc2FnZUJvCiAgICAgZW5jb2Rlci0+ZW5jb2Rl KG1lc3NhZ2VOYW1lKTsKICAgICBlbmNvZGVyLT5lbmNvZGUoSW5qZWN0ZWRCdW5kbGVVc2VyTWVz c2FnZUVuY29kZXIobWVzc2FnZUJvZHkpKTsKIAotICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLmNv bm5lY3Rpb24oKS0+c2VuZE1lc3NhZ2UoQ29yZUlQQzo6TWVzc2FnZUlEKFdlYkNvbnRleHRMZWdh Y3lNZXNzYWdlOjpQb3N0TWVzc2FnZSksIGVuY29kZXIucmVsZWFzZSgpKTsKKyAgICBXZWJQcm9j ZXNzOjpzaGFyZWQoKS5jb25uZWN0aW9uKCktPnNlbmRNZXNzYWdlKGVuY29kZXIucmVsZWFzZSgp KTsKIH0KIAogdm9pZCBJbmplY3RlZEJ1bmRsZTo6cG9zdFN5bmNocm9ub3VzTWVzc2FnZShjb25z dCBTdHJpbmcmIG1lc3NhZ2VOYW1lLCBBUElPYmplY3QqIG1lc3NhZ2VCb2R5LCBSZWZQdHI8QVBJ T2JqZWN0PiYgcmV0dXJuRGF0YSkKQEAgLTEyNCw3ICsxMjQsNyBAQCB2b2lkIEluamVjdGVkQnVu ZGxlOjpwb3N0U3luY2hyb25vdXNNZXNzYWdlKGNvbnN0IFN0cmluZyYgbWVzc2FnZU5hbWUsIEFQ SU9iamVjdAogICAgIGVuY29kZXItPmVuY29kZShtZXNzYWdlTmFtZSk7CiAgICAgZW5jb2Rlci0+ ZW5jb2RlKEluamVjdGVkQnVuZGxlVXNlck1lc3NhZ2VFbmNvZGVyKG1lc3NhZ2VCb2R5KSk7CiAK LSAgICBPd25QdHI8Q29yZUlQQzo6TWVzc2FnZURlY29kZXI+IHJlcGx5RGVjb2RlciA9IFdlYlBy b2Nlc3M6OnNoYXJlZCgpLmNvbm5lY3Rpb24oKS0+c2VuZFN5bmNNZXNzYWdlKENvcmVJUEM6Ok1l c3NhZ2VJRChXZWJDb250ZXh0TGVnYWN5TWVzc2FnZTo6UG9zdFN5bmNocm9ub3VzTWVzc2FnZSks IHN5bmNSZXF1ZXN0SUQsIGVuY29kZXIucmVsZWFzZSgpLCBDb3JlSVBDOjpDb25uZWN0aW9uOjpO b1RpbWVvdXQpOworICAgIE93blB0cjxDb3JlSVBDOjpNZXNzYWdlRGVjb2Rlcj4gcmVwbHlEZWNv ZGVyID0gV2ViUHJvY2Vzczo6c2hhcmVkKCkuY29ubmVjdGlvbigpLT5zZW5kU3luY01lc3NhZ2Uo c3luY1JlcXVlc3RJRCwgZW5jb2Rlci5yZWxlYXNlKCksIENvcmVJUEM6OkNvbm5lY3Rpb246Ok5v VGltZW91dCk7CiAgICAgaWYgKCFyZXBseURlY29kZXIgfHwgIXJlcGx5RGVjb2Rlci0+ZGVjb2Rl KG1lc3NhZ2VEZWNvZGVyKSkgewogICAgICAgICByZXR1cm5EYXRhID0gbnVsbHB0cjsKICAgICAg ICAgcmV0dXJuOwo=