142995 2015-03-23 17:43:48 -0700 [WTF] Use adoptUniquePtr and leakUniquePtr until C++14 unique_ptr capture in Lambda becomes available 2019-05-03 06:56:03 -0700 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 1 jh718.park webkit-unassigned benjamin bfulgham cmarcelo commit-queue darin gyuyoung.kim japhet rniwa oldest_to_newest 1079526 0 jh718.park 2015-03-23 17:43:48 -0700 According to Mr.Adler's comment "It’s not nearly was easy to spot the explicit std::unique_ptr construction and see that it matches up with the release() call. Seems like we should make an adopt function for unique_ptr in WTF so this idiom is more readable.", add adoptUniquePtr and leakUniquePtr. 1079530 1 249306 jh718.park 2015-03-23 17:53:23 -0700 Created attachment 249306 Patch 1079534 2 249306 gyuyoung.kim 2015-03-23 19:16:44 -0700 Comment on attachment 249306 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=249306&action=review I would like to delegate this patch's review to Darin. > Source/WTF/ChangeLog:8 > + make an adopt function and leak function for unique_ptr so that the pair is more readable. Add a new line. > Source/WTF/wtf/StdLibExtras.h:401 > +namespace WTF { "namespace WTF" was already defined in 120 line. Looks like unnecessary namespace definition if this templates are moved into it. 1079574 3 249318 jh718.park 2015-03-24 00:46:33 -0700 Created attachment 249318 Patch 1173153 4 bfulgham 2016-03-10 10:43:53 -0800 I wonder if this patch is old enough (due to our neglect) that our C++14 support has made it obsolete? 1174580 5 249318 bfulgham 2016-03-14 11:47:54 -0700 Comment on attachment 249318 Patch This patch is almost a year old, and doesn't apply cleanly. I'm also not sure it's needed anymore due to the updated compilers in use this year. Can you please confirm it is still needed and upload a new patch if you feel it is still required? 249306 2015-03-23 17:53:23 -0700 2015-03-24 00:46:22 -0700 Patch bug-142995-20150324095247.patch text/plain 4913 jh718.park U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxODUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDdhZTQwM2YyZTgyMWU1OWNmY2Q4NDU1 ZDMzOTM5MjczZjZmODdhZjkuLjM1ZDJmYzM4MGYyZDJjZTZhMTMwZjM4ZmJhYTVkNzc3NDJhNDZl MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTUtMDMtMjMgIEpvb25naHVuIFBhcmsgIDxqaDcx OC5wYXJrQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtXVEZdIFVzZSBhZG9wdFVuaXF1ZVB0ciBh bmQgbGVha1VuaXF1ZVB0ciB1bnRpbCBDKysxNCB1bmlxdWVfcHRyIGNhcHR1cmUgaW4gTGFtYmRh IGJlY29tZSBhdmFpbGFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0Mjk5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIG1ha2UgYW4gYWRvcHQgZnVuY3Rpb24gYW5kIGxlYWsgZnVuY3Rpb24gZm9yIHVu aXF1ZV9wdHIgc28gdGhhdCB0aGUgcGFpciBpcyBtb3JlIHJlYWRhYmxlLgorICAgICAgICAqIHd0 Zi9TdGRMaWJFeHRyYXMuaDoKKyAgICAgICAgKFdURjo6YWRvcHRVbmlxdWVQdHIpOgorICAgICAg ICAoV1RGOjpsZWFrVW5pcXVlUHRyKToKKwogMjAxNS0wMy0yMiAgQmVuamFtaW4gUG91bGFpbiAg PGJlbmphbWluQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQ1NTIFNlbGVjdG9yczogZml4IGF0dHJp YnV0ZSBjYXNlLWluc2Vuc2l0aXZlIG1hdGNoaW5nIG9mIENvbnRhaW4gYW5kIExpc3QKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCA3ZTM2YmQzYzliM2VjOGU4OTNlNzVjYTU0ZTUyMTBiZGJjYTg4YmJhLi4wYjIyYjk2 YWIzM2ZjZjgyMmU1NDQ0YWViZjNjODQzZTdmNjVmYzUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTcgQEAKKzIwMTUtMDMtMjMgIEpvb25naHVuIFBhcmsgIDxqaDcxOC5wYXJrQHNhbXN1bmcuY29t PgorCisgICAgICAgIFtXVEZdIFVzZSBhZG9wdFVuaXF1ZVB0ciBhbmQgbGVha1VuaXF1ZVB0ciB1 bnRpbCBDKysxNCB1bmlxdWVfcHRyIGNhcHR1cmUgaW4gTGFtYmRhIGJlY29tZSBhdmFpbGFibGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0Mjk5NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cywgbm8gYmVoYXZpb3IgY2hhbmdlcy4KKworICAgICAgICAqIGxvYWRlci9Xb3JrZXJUaHJl YWRhYmxlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlclRocmVhZGFibGVMb2Fk ZXI6Ok1haW5UaHJlYWRCcmlkZ2U6Ok1haW5UaHJlYWRCcmlkZ2UpOgorICAgICAgICAqIGxvYWRl ci9jYWNoZS9NZW1vcnlDYWNoZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZW1vcnlDYWNoZTo6 cmVtb3ZlUmVxdWVzdEZyb21TZXNzaW9uQ2FjaGVzKToKKwogMjAxNS0wMy0yMyAgWW9hdiBXZWlz cyAgPHlvYXZAeW9hdi53cz4KIAogICAgICAgICBSZWZhY3RvciBJbWFnZUxvYWRlcidzIHNldHRp bmcgb2YgQ2FjaGVkSW1hZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL1N0ZExpYkV4dHJh cy5oIGIvU291cmNlL1dURi93dGYvU3RkTGliRXh0cmFzLmgKaW5kZXggYmFlNzg4NDAyYTM3ODhk Nzc2ZDBhMTZmNDAyYWM1OTRhNWU1NDRiYS4uNGY4NDAxZDc4MjI2NmMwNzljZTA3NWFiNDFkOGNh N2M4YTUzOTNhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvU3RkTGliRXh0cmFzLmgKKysr IGIvU291cmNlL1dURi93dGYvU3RkTGliRXh0cmFzLmgKQEAgLTM5Niw2ICszOTYsMjIgQEAgbmFt ZXNwYWNlIGNocm9ub19saXRlcmFscyB7CiAjZW5kaWYKIH0KIAorLy8gRklYTUU6IFdoZW4gdGhl IHRpbWUgaW4gd2hpY2ggQysrMTQncyBjYXB0dXJpbmcgdW5pcXVlX3B0ciBpbiBhIGxhbWJkYSBl eHByZXNzaW9uIGlzIGJlaW5nIGF2YWlsYWJsZSBjb21lcywKKy8vIHRoZXNlIGZ1bmN0aW9ucyBh cmUgbmVlZGVkIG5vIG1vcmUuCituYW1lc3BhY2UgV1RGIHsKK3RlbXBsYXRlPHR5cGVuYW1lIFQ+ CitzdGQ6OnVuaXF1ZV9wdHI8VD4gYWRvcHRVbmlxdWVQdHIoVCogcHRyKQoreworICAgIHJldHVy biBzdGQ6OnVuaXF1ZV9wdHI8VD4ocHRyKTsKK30KKwordGVtcGxhdGU8dHlwZW5hbWUgVD4KK1Qq IGxlYWtVbmlxdWVQdHIoc3RkOjp1bmlxdWVfcHRyPFQ+IHB0cikKK3sKKyAgICByZXR1cm4gcHRy LnJlbGVhc2UoKTsKK30KK30KKwogdXNpbmcgV1RGOjpLQjsKIHVzaW5nIFdURjo6TUI7CiB1c2lu ZyBXVEY6OmlzQ29tcGlsYXRpb25UaHJlYWQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvV29ya2VyVGhyZWFkYWJsZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv V29ya2VyVGhyZWFkYWJsZUxvYWRlci5jcHAKaW5kZXggZWEyZGU2MjMzYmY5MGQ4YzE5NWJmYzg1 NDUxZDI5YTVlM2I5ODhmMy4uMWU5NWYyNDE2NjgzNmI3MDU4NWVmMTU2NTZlYTQ5YWRiYzRjMzk1 OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1dvcmtlclRocmVhZGFibGVMb2Fk ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Xb3JrZXJUaHJlYWRhYmxlTG9hZGVy LmNwcApAQCAtOTEsMTMgKzkxLDEzIEBAIFdvcmtlclRocmVhZGFibGVMb2FkZXI6Ok1haW5UaHJl YWRCcmlkZ2U6Ok1haW5UaHJlYWRCcmlkZ2UoUGFzc1JlZlB0cjxUaHJlYWRhYmxlCiB7CiAgICAg QVNTRVJUKG1fd29ya2VyQ2xpZW50V3JhcHBlci5nZXQoKSk7CiAKLSAgICBhdXRvIHJlcXVlc3RE YXRhID0gcmVxdWVzdC5jb3B5RGF0YSgpLnJlbGVhc2UoKTsKKyAgICBDcm9zc1RocmVhZFJlc291 cmNlUmVxdWVzdERhdGEqIHJlcXVlc3REYXRhID0gV1RGOjpsZWFrVW5pcXVlUHRyKHJlcXVlc3Qu Y29weURhdGEoKSk7CiAgICAgU3RyaW5nQ2FwdHVyZSBjYXB0dXJlZE91dGdvaW5nUmVmZXJyZXIo b3V0Z29pbmdSZWZlcnJlcik7CiAgICAgbV9sb2FkZXJQcm94eS5wb3N0VGFza1RvTG9hZGVyKFt0 aGlzLCByZXF1ZXN0RGF0YSwgb3B0aW9ucywgY2FwdHVyZWRPdXRnb2luZ1JlZmVycmVyXShTY3Jp cHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0KSB7CiAgICAgICAgIEFTU0VSVChpc01haW5UaHJl YWQoKSk7CiAgICAgICAgIERvY3VtZW50JiBkb2N1bWVudCA9IGRvd25jYXN0PERvY3VtZW50Pihj b250ZXh0KTsKIAotICAgICAgICBhdXRvIHJlcXVlc3QgPSBSZXNvdXJjZVJlcXVlc3Q6OmFkb3B0 KHN0ZDo6dW5pcXVlX3B0cjxDcm9zc1RocmVhZFJlc291cmNlUmVxdWVzdERhdGE+KHJlcXVlc3RE YXRhKSk7CisgICAgICAgIGF1dG8gcmVxdWVzdCA9IFJlc291cmNlUmVxdWVzdDo6YWRvcHQoV1RG OjphZG9wdFVuaXF1ZVB0cihyZXF1ZXN0RGF0YSkpOwogICAgICAgICByZXF1ZXN0LT5zZXRIVFRQ UmVmZXJyZXIoY2FwdHVyZWRPdXRnb2luZ1JlZmVycmVyLnN0cmluZygpKTsKIAogICAgICAgICAv LyBGSVhNRTogSWYgdGhlIGEgc2l0ZSByZXF1ZXN0cyBhIGxvY2FsIHJlc291cmNlLCB0aGVuIHRo aXMgd2lsbCByZXR1cm4gYSBub24temVybyB2YWx1ZSBidXQgdGhlIHN5bmMgcGF0aApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9NZW1vcnlDYWNoZS5jcHAKaW5kZXggODA0ODZkNDFkNWJk MzMzYjU2NDA2ODAwNjU1NGY2ZjlhZTg5NDVlNy4uMDA5ZWVlNGFmYzk5MzkyNzZjYWRhZjdmMDJk NWRjOWI2YWU3MDFjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL01l bW9yeUNhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5Q2Fj aGUuY3BwCkBAIC02NTQsOSArNjU0LDkgQEAgdm9pZCBNZW1vcnlDYWNoZTo6YWRqdXN0U2l6ZShi b29sIGxpdmUsIGludCBkZWx0YSkKIHZvaWQgTWVtb3J5Q2FjaGU6OnJlbW92ZVJlcXVlc3RGcm9t U2Vzc2lvbkNhY2hlcyhTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBjb25zdCBSZXNv dXJjZVJlcXVlc3QmIHJlcXVlc3QpCiB7CiAgICAgaWYgKGlzPFdvcmtlckdsb2JhbFNjb3BlPihj b250ZXh0KSkgewotICAgICAgICBDcm9zc1RocmVhZFJlc291cmNlUmVxdWVzdERhdGEqIHJlcXVl c3REYXRhID0gcmVxdWVzdC5jb3B5RGF0YSgpLnJlbGVhc2UoKTsKKyAgICAgICAgQ3Jvc3NUaHJl YWRSZXNvdXJjZVJlcXVlc3REYXRhKiByZXF1ZXN0RGF0YSA9IFdURjo6bGVha1VuaXF1ZVB0cihy ZXF1ZXN0LmNvcHlEYXRhKCkpOwogICAgICAgICBkb3duY2FzdDxXb3JrZXJHbG9iYWxTY29wZT4o Y29udGV4dCkudGhyZWFkKCkud29ya2VyTG9hZGVyUHJveHkoKS5wb3N0VGFza1RvTG9hZGVyKFty ZXF1ZXN0RGF0YV0gKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQpIHsKLSAgICAgICAg ICAgIGF1dG8gcmVxdWVzdChSZXNvdXJjZVJlcXVlc3Q6OmFkb3B0KHN0ZDo6dW5pcXVlX3B0cjxD cm9zc1RocmVhZFJlc291cmNlUmVxdWVzdERhdGE+KHJlcXVlc3REYXRhKSkpOworICAgICAgICAg ICAgYXV0byByZXF1ZXN0KFJlc291cmNlUmVxdWVzdDo6YWRvcHQoV1RGOjphZG9wdFVuaXF1ZVB0 cihyZXF1ZXN0RGF0YSkpKTsKICAgICAgICAgICAgIE1lbW9yeUNhY2hlOjpyZW1vdmVSZXF1ZXN0 RnJvbVNlc3Npb25DYWNoZXMoY29udGV4dCwgKnJlcXVlc3QpOwogICAgICAgICB9KTsKICAgICAg ICAgcmV0dXJuOwo= 249318 2015-03-24 00:46:33 -0700 2016-03-14 11:47:54 -0700 Patch bug-142995-20150324164604.patch text/plain 5117 jh718.park U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxODg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDE5NTdmZGMxZjU5MTk1ZTQ4MzZkNGQ5 NmZkODllMzQyZWFhZTY0MDEuLmQwYjVmMGM3YzFjMmZlZmQzMmNkM2IwZWM5ZjU3ZTAwMjRjZDBm YzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTUtMDMtMjMgIEpvb25naHVuIFBhcmsgIDxqaDcx OC5wYXJrQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtXVEZdIFVzZSBhZG9wdFVuaXF1ZVB0ciBh bmQgbGVha1VuaXF1ZVB0ciB1bnRpbCBDKysxNCB1bmlxdWVfcHRyIGNhcHR1cmUgaW4gTGFtYmRh IGJlY29tZXMgYXZhaWxhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDI5OTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBtYWtlIGFuIGFkb3B0IGZ1bmN0aW9uIGFuZCBsZWFrIGZ1bmN0aW9uIGZvciB1 bmlxdWVfcHRyIHNvIHRoYXQgdGhlIHBhaXIgaXMgbW9yZSByZWFkYWJsZS4KKworICAgICAgICAq IHd0Zi9TdGRMaWJFeHRyYXMuaDoKKyAgICAgICAgKFdURjo6YWRvcHRVbmlxdWVQdHIpOgorICAg ICAgICAoV1RGOjpsZWFrVW5pcXVlUHRyKToKKwogMjAxNS0wMy0yMyAgRmlsaXAgUGl6bG8gIDxm cGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIEpTQyBzaG91bGQgaGF2ZSBhIGxvdy1jb3N0IGFz eW5jaHJvbm91cyBkaXNhc3NlbWJsZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3NTBmOTk2NWIyNmE0ZjBjNWEw NzNjZTFhN2ZiZWY1YzY0MTU1NzQ2Li5hZDUxMWYxY2Q0MzgxNGQ0MmFmMmVkNWE5Mzc1MzgzYmMx YWM1NGY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTUtMDMtMjMgIEpvb25naHVu IFBhcmsgIDxqaDcxOC5wYXJrQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtXVEZdIFVzZSBhZG9w dFVuaXF1ZVB0ciBhbmQgbGVha1VuaXF1ZVB0ciB1bnRpbCBDKysxNCB1bmlxdWVfcHRyIGNhcHR1 cmUgaW4gTGFtYmRhIGJlY29tZXMgYXZhaWxhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDI5OTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZXMu CisKKyAgICAgICAgKiBsb2FkZXIvV29ya2VyVGhyZWFkYWJsZUxvYWRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpXb3JrZXJUaHJlYWRhYmxlTG9hZGVyOjpNYWluVGhyZWFkQnJpZGdlOjpNYWlu VGhyZWFkQnJpZGdlKToKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TWVtb3J5Q2FjaGU6OnJlbW92ZVJlcXVlc3RGcm9tU2Vzc2lvbkNh Y2hlcyk6CisKIDIwMTUtMDMtMjMgWW9hdiBXZWlzcyAgPHlvYXZAeW9hdi53cz4KIAogICAgICAg ICBVcGRhdGUgZW1wdHkgaW1hZ2UgY2FudmFzIHRlc3RzIGFuZCBmaXggYSByZWxhdGVkIGJ1Zwpk aWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvU3RkTGliRXh0cmFzLmggYi9Tb3VyY2UvV1RGL3d0 Zi9TdGRMaWJFeHRyYXMuaAppbmRleCBiYWU3ODg0MDJhMzc4OGQ3NzZkMGExNmY0MDJhYzU5NGE1 ZTU0NGJhLi44NWFkNzkzNDFjMzFjM2FlMTEyNjg3NzExYjBmNDUyZDJkYWNjNzY5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV1RGL3d0Zi9TdGRMaWJFeHRyYXMuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9T dGRMaWJFeHRyYXMuaApAQCAtMjkwLDYgKzI5MCwyMCBAQCBpbmxpbmUgdm9pZCBpbnNlcnRJbnRv Qm91bmRlZFZlY3RvcihWZWN0b3JUeXBlJiB2ZWN0b3IsIHNpemVfdCBzaXplLCBjb25zdCBFbGVt ZQogICAgIHZlY3RvcltpbmRleF0gPSBlbGVtZW50OwogfQogCisvLyBGSVhNRTogV2hlbiB0aGUg dGltZSBpbiB3aGljaCBDKysxNCdzIGNhcHR1cmluZyB1bmlxdWVfcHRyIGluIGEgbGFtYmRhIGV4 cHJlc3Npb24gaXMgYmVpbmcgYXZhaWxhYmxlIGNvbWVzLAorLy8gdGhlc2UgZnVuY3Rpb25zIGFy ZSBuZWVkZWQgbm8gbW9yZS4KK3RlbXBsYXRlPHR5cGVuYW1lIFQ+CitzdGQ6OnVuaXF1ZV9wdHI8 VD4gYWRvcHRVbmlxdWVQdHIoVCogcHRyKQoreworICAgIHJldHVybiBzdGQ6OnVuaXF1ZV9wdHI8 VD4ocHRyKTsKK30KKwordGVtcGxhdGU8dHlwZW5hbWUgVD4KK1QqIGxlYWtVbmlxdWVQdHIoc3Rk Ojp1bmlxdWVfcHRyPFQ+IHB0cikKK3sKKyAgICByZXR1cm4gcHRyLnJlbGVhc2UoKTsKK30KKwog Ly8gVGhpcyBpcyBoZXJlIGluc3RlYWQgb2YgQ29tcGlsYXRpb25UaHJlYWQuaCB0byBwcmV2ZW50 IHRoYXQgaGVhZGVyIGZyb20gYmVpbmcgaW5jbHVkZWQKIC8vIGV2ZXJ5d2hlcmUuIFRoZSBmYWN0 IHRoYXQgdGhpcyBtZXRob2QsIGFuZCB0aGF0IGhlYWRlciwgZXhpc3Qgb3V0c2lkZSBvZiBKU0Mg aXMgYSBidWcuCiAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMx ODE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvV29ya2VyVGhyZWFkYWJsZUxv YWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvV29ya2VyVGhyZWFkYWJsZUxvYWRlci5j cHAKaW5kZXggZWEyZGU2MjMzYmY5MGQ4YzE5NWJmYzg1NDUxZDI5YTVlM2I5ODhmMy4uMWU5NWYy NDE2NjgzNmI3MDU4NWVmMTU2NTZlYTQ5YWRiYzRjMzk1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL1dvcmtlclRocmVhZGFibGVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9Xb3JrZXJUaHJlYWRhYmxlTG9hZGVyLmNwcApAQCAtOTEsMTMgKzkxLDEzIEBA IFdvcmtlclRocmVhZGFibGVMb2FkZXI6Ok1haW5UaHJlYWRCcmlkZ2U6Ok1haW5UaHJlYWRCcmlk Z2UoUGFzc1JlZlB0cjxUaHJlYWRhYmxlCiB7CiAgICAgQVNTRVJUKG1fd29ya2VyQ2xpZW50V3Jh cHBlci5nZXQoKSk7CiAKLSAgICBhdXRvIHJlcXVlc3REYXRhID0gcmVxdWVzdC5jb3B5RGF0YSgp LnJlbGVhc2UoKTsKKyAgICBDcm9zc1RocmVhZFJlc291cmNlUmVxdWVzdERhdGEqIHJlcXVlc3RE YXRhID0gV1RGOjpsZWFrVW5pcXVlUHRyKHJlcXVlc3QuY29weURhdGEoKSk7CiAgICAgU3RyaW5n Q2FwdHVyZSBjYXB0dXJlZE91dGdvaW5nUmVmZXJyZXIob3V0Z29pbmdSZWZlcnJlcik7CiAgICAg bV9sb2FkZXJQcm94eS5wb3N0VGFza1RvTG9hZGVyKFt0aGlzLCByZXF1ZXN0RGF0YSwgb3B0aW9u cywgY2FwdHVyZWRPdXRnb2luZ1JlZmVycmVyXShTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250 ZXh0KSB7CiAgICAgICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAgICAgICAgIERvY3VtZW50 JiBkb2N1bWVudCA9IGRvd25jYXN0PERvY3VtZW50Pihjb250ZXh0KTsKIAotICAgICAgICBhdXRv IHJlcXVlc3QgPSBSZXNvdXJjZVJlcXVlc3Q6OmFkb3B0KHN0ZDo6dW5pcXVlX3B0cjxDcm9zc1Ro cmVhZFJlc291cmNlUmVxdWVzdERhdGE+KHJlcXVlc3REYXRhKSk7CisgICAgICAgIGF1dG8gcmVx dWVzdCA9IFJlc291cmNlUmVxdWVzdDo6YWRvcHQoV1RGOjphZG9wdFVuaXF1ZVB0cihyZXF1ZXN0 RGF0YSkpOwogICAgICAgICByZXF1ZXN0LT5zZXRIVFRQUmVmZXJyZXIoY2FwdHVyZWRPdXRnb2lu Z1JlZmVycmVyLnN0cmluZygpKTsKIAogICAgICAgICAvLyBGSVhNRTogSWYgdGhlIGEgc2l0ZSBy ZXF1ZXN0cyBhIGxvY2FsIHJlc291cmNlLCB0aGVuIHRoaXMgd2lsbCByZXR1cm4gYSBub24temVy byB2YWx1ZSBidXQgdGhlIHN5bmMgcGF0aApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9N ZW1vcnlDYWNoZS5jcHAKaW5kZXggODA0ODZkNDFkNWJkMzMzYjU2NDA2ODAwNjU1NGY2ZjlhZTg5 NDVlNy4uMDA5ZWVlNGFmYzk5MzkyNzZjYWRhZjdmMDJkNWRjOWI2YWU3MDFjOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuY3BwCkBAIC02NTQsOSArNjU0LDkg QEAgdm9pZCBNZW1vcnlDYWNoZTo6YWRqdXN0U2l6ZShib29sIGxpdmUsIGludCBkZWx0YSkKIHZv aWQgTWVtb3J5Q2FjaGU6OnJlbW92ZVJlcXVlc3RGcm9tU2Vzc2lvbkNhY2hlcyhTY3JpcHRFeGVj dXRpb25Db250ZXh0JiBjb250ZXh0LCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCiB7 CiAgICAgaWYgKGlzPFdvcmtlckdsb2JhbFNjb3BlPihjb250ZXh0KSkgewotICAgICAgICBDcm9z c1RocmVhZFJlc291cmNlUmVxdWVzdERhdGEqIHJlcXVlc3REYXRhID0gcmVxdWVzdC5jb3B5RGF0 YSgpLnJlbGVhc2UoKTsKKyAgICAgICAgQ3Jvc3NUaHJlYWRSZXNvdXJjZVJlcXVlc3REYXRhKiBy ZXF1ZXN0RGF0YSA9IFdURjo6bGVha1VuaXF1ZVB0cihyZXF1ZXN0LmNvcHlEYXRhKCkpOwogICAg ICAgICBkb3duY2FzdDxXb3JrZXJHbG9iYWxTY29wZT4oY29udGV4dCkudGhyZWFkKCkud29ya2Vy TG9hZGVyUHJveHkoKS5wb3N0VGFza1RvTG9hZGVyKFtyZXF1ZXN0RGF0YV0gKFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQmIGNvbnRleHQpIHsKLSAgICAgICAgICAgIGF1dG8gcmVxdWVzdChSZXNvdXJj ZVJlcXVlc3Q6OmFkb3B0KHN0ZDo6dW5pcXVlX3B0cjxDcm9zc1RocmVhZFJlc291cmNlUmVxdWVz dERhdGE+KHJlcXVlc3REYXRhKSkpOworICAgICAgICAgICAgYXV0byByZXF1ZXN0KFJlc291cmNl UmVxdWVzdDo6YWRvcHQoV1RGOjphZG9wdFVuaXF1ZVB0cihyZXF1ZXN0RGF0YSkpKTsKICAgICAg ICAgICAgIE1lbW9yeUNhY2hlOjpyZW1vdmVSZXF1ZXN0RnJvbVNlc3Npb25DYWNoZXMoY29udGV4 dCwgKnJlcXVlc3QpOwogICAgICAgICB9KTsKICAgICAgICAgcmV0dXJuOwo=