158179 2016-05-27 23:58:25 -0700 Modernize lambda captures in the network disk cache implementation 2016-05-28 09:53:28 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez beidson cgarcia commit-queue darin koivisto oldest_to_newest 1197335 0 cdumez 2016-05-27 23:58:25 -0700 Modernize lambda captures in the network disk cache implementation. 1197337 1 280025 cdumez 2016-05-28 00:00:14 -0700 Created attachment 280025 Patch 1197338 2 commit-queue 2016-05-28 00:02:45 -0700 Attachment 280025 did not pass style-queue: ERROR: Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp:348: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp:425: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp:523: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/NetworkProcess/cache/NetworkCache.h:107: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/NetworkProcess/cache/NetworkCache.h:108: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/NetworkProcess/cache/NetworkCache.h:116: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 6 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1197384 3 280025 commit-queue 2016-05-28 09:53:23 -0700 Comment on attachment 280025 Patch Clearing flags on attachment: 280025 Committed r201484: <http://trac.webkit.org/changeset/201484> 1197385 4 commit-queue 2016-05-28 09:53:28 -0700 All reviewed patches have been landed. Closing bug. 280025 2016-05-28 00:00:14 -0700 2016-05-28 09:53:23 -0700 Patch bug-158179-20160528000125.patch text/plain 17060 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxNDgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZWEwY2M5MDIxODQ1OTdh NzI3NWIxNDNmMjRlYWU3MThkYTBlM2QwOC4uY2NiNmZjYTgxNWZmM2MwZWRlNDZiZjAwMTBjNmRi YmYxMGRhYTM5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE2LTA1LTI4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW9kZXJuaXplIGxhbWJkYSBj YXB0dXJlcyBpbiB0aGUgbmV0d29yayBkaXNrIGNhY2hlIGltcGxlbWVudGF0aW9uCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTgxNzkKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb2Rlcm5pemUgbGFtYmRh IGNhcHR1cmVzIGluIHRoZSBuZXR3b3JrIGRpc2sgY2FjaGUgaW1wbGVtZW50YXRpb24uCisKKyAg ICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwOgorICAgICAgICAo V2ViS2l0OjpOZXR3b3JrQ2FjaGU6OkNhY2hlOjpyZXRyaWV2ZSk6CisgICAgICAgIChXZWJLaXQ6 Ok5ldHdvcmtDYWNoZTo6Q2FjaGU6OnN0b3JlKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0Nh Y2hlOjpDYWNoZTo6dHJhdmVyc2UpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05l dHdvcmtDYWNoZS5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNo ZUlPQ2hhbm5lbFNvdXAuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OmlucHV0 U3RyZWFtUmVhZFJlYWR5Q2FsbGJhY2spOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6 Om91dHB1dFN0cmVhbVdyaXRlUmVhZHlDYWxsYmFjayk6CisgICAgICAgICogTmV0d29ya1Byb2Nl c3MvY2FjaGUvTmV0d29ya0NhY2hlU3RhdGlzdGljcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5l dHdvcmtDYWNoZTo6U3RhdGlzdGljczo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChXZWJLaXQ6Ok5l dHdvcmtDYWNoZTo6U3RhdGlzdGljczo6c2hyaW5rSWZOZWVkZWQpOgorICAgICAgICAoV2ViS2l0 OjpOZXR3b3JrQ2FjaGU6OlN0YXRpc3RpY3M6OnF1ZXJ5V2FzRXZlclJlcXVlc3RlZCk6CisgICAg ICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RhdGlzdGljcy5oOgorICAg ICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuY3BwOgorICAg ICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlN0b3JhZ2U6OnVwZGF0ZUZpbGVNb2RpZmljYXRp b25UaW1lKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpTdG9yYWdlOjpjbGVhcik6 CisKIDIwMTYtMDUtMjcgIENhaXRsaW4gUG90dGVyICA8Y2FpdHBAaWdhbGlhLmNvbT4KIAogICAg ICAgICBbSlNDXSBpbXBsZW1lbnQgYXN5bmMgZnVuY3Rpb25zIHByb3Bvc2FsCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwIGIv U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcAppbmRl eCBmNjlmZjAzMjYwYmYyOTFmZjM3YTFlNjdiNjcwYTBjZGQ1YmZhNjY4Li4xYWM0Y2M5ZWU0OWU1 ZGM3NDI1ZDc4ZWY3NDI0NTAxZTYzOTFiY2UwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9O ZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5jcHAKQEAgLTM0NSw3ICszNDUsNyBA QCBzdGF0aWMgU3RvcmVEZWNpc2lvbiBtYWtlU3RvcmVEZWNpc2lvbihjb25zdCBXZWJDb3JlOjpS ZXNvdXJjZVJlcXVlc3QmIG9yaWdpbmFsUgogICAgIHJldHVybiBTdG9yZURlY2lzaW9uOjpZZXM7 CiB9CiAKLXZvaWQgQ2FjaGU6OnJldHJpZXZlKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVz dCYgcmVxdWVzdCwgY29uc3QgR2xvYmFsRnJhbWVJRCYgZnJhbWVJRCwgc3RkOjpmdW5jdGlvbjx2 b2lkIChzdGQ6OnVuaXF1ZV9wdHI8RW50cnk+KT4gY29tcGxldGlvbkhhbmRsZXIpCit2b2lkIENh Y2hlOjpyZXRyaWV2ZShjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNv bnN0IEdsb2JhbEZyYW1lSUQmIGZyYW1lSUQsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoc3RkOjp1bmlx dWVfcHRyPEVudHJ5Pik+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgQVNTRVJUKGlzRW5h YmxlZCgpKTsKICAgICBBU1NFUlQocmVxdWVzdC51cmwoKS5wcm90b2NvbElzSW5IVFRQRmFtaWx5 KCkpOwpAQCAtMzg0LDcgKzM4NCw3IEBAIHZvaWQgQ2FjaGU6OnJldHJpZXZlKGNvbnN0IFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgR2xvYmFsRnJhbWVJCiAgICAgYXV0 byBzdGFydFRpbWUgPSBzdGQ6OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjpub3coKTsKICAgICBhdXRv IHByaW9yaXR5ID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHJlcXVlc3QucHJpb3JpdHkoKSk7CiAK LSAgICBtX3N0b3JhZ2UtPnJldHJpZXZlKHN0b3JhZ2VLZXksIHByaW9yaXR5LCBbdGhpcywgcmVx dWVzdCwgY29tcGxldGlvbkhhbmRsZXIsIHN0YXJ0VGltZSwgc3RvcmFnZUtleSwgZnJhbWVJRF0o c3RkOjp1bmlxdWVfcHRyPFN0b3JhZ2U6OlJlY29yZD4gcmVjb3JkKSB7CisgICAgbV9zdG9yYWdl LT5yZXRyaWV2ZShzdG9yYWdlS2V5LCBwcmlvcml0eSwgW3RoaXMsIHJlcXVlc3QsIGNvbXBsZXRp b25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlciksIHN0YXJ0VGltZSwgc3RvcmFn ZUtleSwgZnJhbWVJRF0oc3RkOjp1bmlxdWVfcHRyPFN0b3JhZ2U6OlJlY29yZD4gcmVjb3JkKSB7 CiAgICAgICAgIGlmICghcmVjb3JkKSB7CiAgICAgICAgICAgICBMT0coTmV0d29ya0NhY2hlLCAi KE5ldHdvcmtQcm9jZXNzKSBub3QgZm91bmQgaW4gc3RvcmFnZSIpOwogCkBAIC00MjIsNyArNDIy LDcgQEAgdm9pZCBDYWNoZTo6cmV0cmlldmUoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0 JiByZXF1ZXN0LCBjb25zdCBHbG9iYWxGcmFtZUkKICAgICB9KTsKIH0KIAotc3RkOjp1bmlxdWVf cHRyPEVudHJ5PiBDYWNoZTo6c3RvcmUoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBy ZXF1ZXN0LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgUmVmUHRy PFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4mJiByZXNwb25zZURhdGEsIHN0ZDo6ZnVuY3Rpb248dm9p ZCAoTWFwcGVkQm9keSYpPiBjb21wbGV0aW9uSGFuZGxlcikKK3N0ZDo6dW5pcXVlX3B0cjxFbnRy eT4gQ2FjaGU6OnN0b3JlKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwg Y29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UsIFJlZlB0cjxXZWJDb3Jl OjpTaGFyZWRCdWZmZXI+JiYgcmVzcG9uc2VEYXRhLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKE1hcHBl ZEJvZHkmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBBU1NFUlQoaXNFbmFibGVkKCkp OwogICAgIEFTU0VSVChyZXNwb25zZURhdGEpOwpAQCAtNDQ2LDExICs0NDYsMTAgQEAgc3RkOjp1 bmlxdWVfcHRyPEVudHJ5PiBDYWNoZTo6c3RvcmUoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0JiByZXF1ZXN0LCBjb24KICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCi0gICAg c3RkOjp1bmlxdWVfcHRyPEVudHJ5PiBjYWNoZUVudHJ5ID0gc3RkOjptYWtlX3VuaXF1ZTxFbnRy eT4obWFrZUNhY2hlS2V5KHJlcXVlc3QpLCByZXNwb25zZSwgV1RGTW92ZShyZXNwb25zZURhdGEp LCBjb2xsZWN0VmFyeWluZ1JlcXVlc3RIZWFkZXJzKHJlcXVlc3QsIHJlc3BvbnNlKSk7Ci0KKyAg ICBhdXRvIGNhY2hlRW50cnkgPSBzdGQ6Om1ha2VfdW5pcXVlPEVudHJ5PihtYWtlQ2FjaGVLZXko cmVxdWVzdCksIHJlc3BvbnNlLCBXVEZNb3ZlKHJlc3BvbnNlRGF0YSksIGNvbGxlY3RWYXJ5aW5n UmVxdWVzdEhlYWRlcnMocmVxdWVzdCwgcmVzcG9uc2UpKTsKICAgICBhdXRvIHJlY29yZCA9IGNh Y2hlRW50cnktPmVuY29kZUFzU3RvcmFnZVJlY29yZCgpOwogCi0gICAgbV9zdG9yYWdlLT5zdG9y ZShyZWNvcmQsIFtjb21wbGV0aW9uSGFuZGxlcl0oY29uc3QgRGF0YSYgYm9keURhdGEpIHsKKyAg ICBtX3N0b3JhZ2UtPnN0b3JlKHJlY29yZCwgW2NvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShj b21wbGV0aW9uSGFuZGxlcildKGNvbnN0IERhdGEmIGJvZHlEYXRhKSB7CiAgICAgICAgIE1hcHBl ZEJvZHkgbWFwcGVkQm9keTsKICNpZiBFTkFCTEUoU0hBUkVBQkxFX1JFU09VUkNFKQogICAgICAg ICBpZiAoUmVmUHRyPFNoYXJlZE1lbW9yeT4gc2hhcmVkTWVtb3J5ID0gYm9keURhdGEudHJ5Q3Jl YXRlU2hhcmVkTWVtb3J5KCkpIHsKQEAgLTUyMSw3ICs1MjAsNyBAQCB2b2lkIENhY2hlOjpyZW1v dmUoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQogICAgIHJlbW92ZSht YWtlQ2FjaGVLZXkocmVxdWVzdCkpOwogfQogCi12b2lkIENhY2hlOjp0cmF2ZXJzZShjb25zdCBz dGQ6OmZ1bmN0aW9uPHZvaWQgKGNvbnN0IFRyYXZlcnNhbEVudHJ5Kik+JiB0cmF2ZXJzZUhhbmRs ZXIpCit2b2lkIENhY2hlOjp0cmF2ZXJzZShzdGQ6OmZ1bmN0aW9uPHZvaWQgKGNvbnN0IFRyYXZl cnNhbEVudHJ5Kik+JiYgdHJhdmVyc2VIYW5kbGVyKQogewogICAgIEFTU0VSVChpc0VuYWJsZWQo KSk7CiAKQEAgLTUzMCw3ICs1MjksNyBAQCB2b2lkIENhY2hlOjp0cmF2ZXJzZShjb25zdCBzdGQ6 OmZ1bmN0aW9uPHZvaWQgKGNvbnN0IFRyYXZlcnNhbEVudHJ5Kik+JiB0cmF2ZXJzZQogICAgIGlm IChtX3RyYXZlcnNlQ291bnQgPj0gbWF4aW11bVRyYXZlcnNlQ291bnQpIHsKICAgICAgICAgV1RG TG9nQWx3YXlzKCJNYXhpbXVtIHBhcmFsbGVsIGNhY2hlIHRyYXZlcnNlIGNvdW50IGV4Y2VlZGVk LiBJZ25vcmluZyB0cmF2ZXJzYWwgcmVxdWVzdC4iKTsKIAotICAgICAgICBSdW5Mb29wOjptYWlu KCkuZGlzcGF0Y2goW3RyYXZlcnNlSGFuZGxlcl0geworICAgICAgICBSdW5Mb29wOjptYWluKCku ZGlzcGF0Y2goW3RyYXZlcnNlSGFuZGxlciA9IFdURk1vdmUodHJhdmVyc2VIYW5kbGVyKV0gewog ICAgICAgICAgICAgdHJhdmVyc2VIYW5kbGVyKG51bGxwdHIpOwogICAgICAgICB9KTsKICAgICAg ICAgcmV0dXJuOwpAQCAtNTM4LDcgKzUzNyw3IEBAIHZvaWQgQ2FjaGU6OnRyYXZlcnNlKGNvbnN0 IHN0ZDo6ZnVuY3Rpb248dm9pZCAoY29uc3QgVHJhdmVyc2FsRW50cnkqKT4mIHRyYXZlcnNlCiAK ICAgICArK21fdHJhdmVyc2VDb3VudDsKIAotICAgIG1fc3RvcmFnZS0+dHJhdmVyc2UocmVzb3Vy Y2VUeXBlKCksIDAsIFt0aGlzLCB0cmF2ZXJzZUhhbmRsZXJdKGNvbnN0IFN0b3JhZ2U6OlJlY29y ZCogcmVjb3JkLCBjb25zdCBTdG9yYWdlOjpSZWNvcmRJbmZvJiByZWNvcmRJbmZvKSB7CisgICAg bV9zdG9yYWdlLT50cmF2ZXJzZShyZXNvdXJjZVR5cGUoKSwgMCwgW3RoaXMsIHRyYXZlcnNlSGFu ZGxlciA9IFdURk1vdmUodHJhdmVyc2VIYW5kbGVyKV0oY29uc3QgU3RvcmFnZTo6UmVjb3JkKiBy ZWNvcmQsIGNvbnN0IFN0b3JhZ2U6OlJlY29yZEluZm8mIHJlY29yZEluZm8pIHsKICAgICAgICAg aWYgKCFyZWNvcmQpIHsKICAgICAgICAgICAgIC0tbV90cmF2ZXJzZUNvdW50OwogICAgICAgICAg ICAgdHJhdmVyc2VIYW5kbGVyKG51bGxwdHIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv TmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmggYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuaAppbmRleCBiYWQ2MWFkNTIzMzZlYzhjZjJl NTMzM2Y3MjBmM2IxMGI5ZTZlOTc1Li5hZWU1ZDJmYTMyMTdhYTk1ZWYyMDAwY2QzZmY5NmEyZjEz MzhlOGI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9O ZXR3b3JrQ2FjaGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9O ZXR3b3JrQ2FjaGUuaApAQCAtMTA0LDggKzEwNCw4IEBAIHB1YmxpYzoKICAgICBib29sIGlzRW5h YmxlZCgpIGNvbnN0IHsgcmV0dXJuICEhbV9zdG9yYWdlOyB9CiAKICAgICAvLyBDb21wbGV0aW9u IGhhbmRsZXIgbWF5IGdldCBjYWxsZWQgYmFjayBzeW5jaHJvbm91c2x5IG9uIGZhaWx1cmUuCi0g ICAgdm9pZCByZXRyaWV2ZShjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBH bG9iYWxGcmFtZUlEJiwgc3RkOjpmdW5jdGlvbjx2b2lkIChzdGQ6OnVuaXF1ZV9wdHI8RW50cnk+ KT4pOwotICAgIHN0ZDo6dW5pcXVlX3B0cjxFbnRyeT4gc3RvcmUoY29uc3QgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYsIFJlZlB0cjxX ZWJDb3JlOjpTaGFyZWRCdWZmZXI+JiYsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoTWFwcGVkQm9keSYp Pik7CisgICAgdm9pZCByZXRyaWV2ZShjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBj b25zdCBHbG9iYWxGcmFtZUlEJiwgc3RkOjpmdW5jdGlvbjx2b2lkIChzdGQ6OnVuaXF1ZV9wdHI8 RW50cnk+KT4mJik7CisgICAgc3RkOjp1bmlxdWVfcHRyPEVudHJ5PiBzdG9yZShjb25zdCBXZWJD b3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiwg UmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4mJiwgc3RkOjpmdW5jdGlvbjx2b2lkIChNYXBw ZWRCb2R5Jik+JiYpOwogICAgIHN0ZDo6dW5pcXVlX3B0cjxFbnRyeT4gc3RvcmVSZWRpcmVjdChj b25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJl c3BvbnNlJiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZWRpcmVjdFJlcXVlc3Qp OwogICAgIHN0ZDo6dW5pcXVlX3B0cjxFbnRyeT4gdXBkYXRlKGNvbnN0IFdlYkNvcmU6OlJlc291 cmNlUmVxdWVzdCYsIGNvbnN0IEdsb2JhbEZyYW1lSUQmLCBjb25zdCBFbnRyeSYsIGNvbnN0IFdl YkNvcmU6OlJlc291cmNlUmVzcG9uc2UmIHZhbGlkYXRpbmdSZXNwb25zZSk7CiAKQEAgLTExMyw3 ICsxMTMsNyBAQCBwdWJsaWM6CiAgICAgICAgIGNvbnN0IEVudHJ5JiBlbnRyeTsKICAgICAgICAg Y29uc3QgU3RvcmFnZTo6UmVjb3JkSW5mbyYgcmVjb3JkSW5mbzsKICAgICB9OwotICAgIHZvaWQg dHJhdmVyc2UoY29uc3Qgc3RkOjpmdW5jdGlvbjx2b2lkIChjb25zdCBUcmF2ZXJzYWxFbnRyeSop PiYpOworICAgIHZvaWQgdHJhdmVyc2Uoc3RkOjpmdW5jdGlvbjx2b2lkIChjb25zdCBUcmF2ZXJz YWxFbnRyeSopPiYmKTsKICAgICB2b2lkIHJlbW92ZShjb25zdCBLZXkmKTsKICAgICB2b2lkIHJl bW92ZShjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmKTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlSU9DaGFubmVsU291 cC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVJ T0NoYW5uZWxTb3VwLmNwcAppbmRleCA3YWQ0YzI4MTk1ZjU2MTlmYTJhMTE3Y2VhOGFlNDk3NzM2 YTg5OTVjLi4yYzNkMDM0YzJjZTU3ZDU5YjJkNmI5YTZkOThiM2ExZDFjMzI2MzBjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVJT0No YW5uZWxTb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9O ZXR3b3JrQ2FjaGVJT0NoYW5uZWxTb3VwLmNwcApAQCAtMTE0LDkgKzExNCw3IEBAIHN0YXRpYyB2 b2lkIGlucHV0U3RyZWFtUmVhZFJlYWR5Q2FsbGJhY2soR0lucHV0U3RyZWFtKiBzdHJlYW0sIEdB c3luY1Jlc3VsdCogcmVzCiAgICAgZ3NzaXplIGJ5dGVzUmVhZCA9IGdfaW5wdXRfc3RyZWFtX3Jl YWRfZmluaXNoKHN0cmVhbSwgcmVzdWx0LCBudWxscHRyKTsKICAgICBpZiAoYnl0ZXNSZWFkID09 IC0xKSB7CiAgICAgICAgIFdvcmtRdWV1ZSogcXVldWUgPSBhc3luY0RhdGEtPnF1ZXVlLmdldCgp OwotICAgICAgICBhdXRvKiBhc3luY0RhdGFQdHIgPSBhc3luY0RhdGEucmVsZWFzZSgpOwotICAg ICAgICBydW5UYXNrSW5RdWV1ZShbYXN5bmNEYXRhUHRyXSB7Ci0gICAgICAgICAgICBzdGQ6OnVu aXF1ZV9wdHI8UmVhZEFzeW5jRGF0YT4gYXN5bmNEYXRhKGFzeW5jRGF0YVB0cik7CisgICAgICAg IHJ1blRhc2tJblF1ZXVlKFthc3luY0RhdGEgPSBXVEZNb3ZlKGFzeW5jRGF0YSldIHsKICAgICAg ICAgICAgIGFzeW5jRGF0YS0+Y29tcGxldGlvbkhhbmRsZXIoYXN5bmNEYXRhLT5kYXRhLCAtMSk7 CiAgICAgICAgIH0sIHF1ZXVlKTsKICAgICAgICAgcmV0dXJuOwpAQCAtMTI0LDkgKzEyMiw3IEBA IHN0YXRpYyB2b2lkIGlucHV0U3RyZWFtUmVhZFJlYWR5Q2FsbGJhY2soR0lucHV0U3RyZWFtKiBz dHJlYW0sIEdBc3luY1Jlc3VsdCogcmVzCiAKICAgICBpZiAoIWJ5dGVzUmVhZCkgewogICAgICAg ICBXb3JrUXVldWUqIHF1ZXVlID0gYXN5bmNEYXRhLT5xdWV1ZS5nZXQoKTsKLSAgICAgICAgYXV0 byogYXN5bmNEYXRhUHRyID0gYXN5bmNEYXRhLnJlbGVhc2UoKTsKLSAgICAgICAgcnVuVGFza0lu UXVldWUoW2FzeW5jRGF0YVB0cl0gewotICAgICAgICAgICAgc3RkOjp1bmlxdWVfcHRyPFJlYWRB c3luY0RhdGE+IGFzeW5jRGF0YShhc3luY0RhdGFQdHIpOworICAgICAgICBydW5UYXNrSW5RdWV1 ZShbYXN5bmNEYXRhID0gV1RGTW92ZShhc3luY0RhdGEpXSB7CiAgICAgICAgICAgICBhc3luY0Rh dGEtPmNvbXBsZXRpb25IYW5kbGVyKGFzeW5jRGF0YS0+ZGF0YSwgMCk7CiAgICAgICAgIH0sIHF1 ZXVlKTsKICAgICAgICAgcmV0dXJuOwpAQCAtMTM4LDkgKzEzNCw3IEBAIHN0YXRpYyB2b2lkIGlu cHV0U3RyZWFtUmVhZFJlYWR5Q2FsbGJhY2soR0lucHV0U3RyZWFtKiBzdHJlYW0sIEdBc3luY1Jl c3VsdCogcmVzCiAgICAgc2l6ZV90IHBlbmRpbmdCeXRlc1RvUmVhZCA9IGFzeW5jRGF0YS0+Ynl0 ZXNUb1JlYWQgLSBhc3luY0RhdGEtPmRhdGEuc2l6ZSgpOwogICAgIGlmICghcGVuZGluZ0J5dGVz VG9SZWFkKSB7CiAgICAgICAgIFdvcmtRdWV1ZSogcXVldWUgPSBhc3luY0RhdGEtPnF1ZXVlLmdl dCgpOwotICAgICAgICBhdXRvKiBhc3luY0RhdGFQdHIgPSBhc3luY0RhdGEucmVsZWFzZSgpOwot ICAgICAgICBydW5UYXNrSW5RdWV1ZShbYXN5bmNEYXRhUHRyXSB7Ci0gICAgICAgICAgICBzdGQ6 OnVuaXF1ZV9wdHI8UmVhZEFzeW5jRGF0YT4gYXN5bmNEYXRhKGFzeW5jRGF0YVB0cik7CisgICAg ICAgIHJ1blRhc2tJblF1ZXVlKFthc3luY0RhdGEgPSBXVEZNb3ZlKGFzeW5jRGF0YSldIHsKICAg ICAgICAgICAgIGFzeW5jRGF0YS0+Y29tcGxldGlvbkhhbmRsZXIoYXN5bmNEYXRhLT5kYXRhLCAw KTsKICAgICAgICAgfSwgcXVldWUpOwogICAgICAgICByZXR1cm47CkBAIC0yMzQsOSArMjI4LDcg QEAgc3RhdGljIHZvaWQgb3V0cHV0U3RyZWFtV3JpdGVSZWFkeUNhbGxiYWNrKEdPdXRwdXRTdHJl YW0qIHN0cmVhbSwgR0FzeW5jUmVzdWx0KgogICAgIGdzc2l6ZSBieXRlc1dyaXR0ZW4gPSBnX291 dHB1dF9zdHJlYW1fd3JpdGVfZmluaXNoKHN0cmVhbSwgcmVzdWx0LCBudWxscHRyKTsKICAgICBp ZiAoYnl0ZXNXcml0dGVuID09IC0xKSB7CiAgICAgICAgIFdvcmtRdWV1ZSogcXVldWUgPSBhc3lu Y0RhdGEtPnF1ZXVlLmdldCgpOwotICAgICAgICBhdXRvKiBhc3luY0RhdGFQdHIgPSBhc3luY0Rh dGEucmVsZWFzZSgpOwotICAgICAgICBydW5UYXNrSW5RdWV1ZShbYXN5bmNEYXRhUHRyXSB7Ci0g ICAgICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8V3JpdGVBc3luY0RhdGE+IGFzeW5jRGF0YShhc3lu Y0RhdGFQdHIpOworICAgICAgICBydW5UYXNrSW5RdWV1ZShbYXN5bmNEYXRhID0gV1RGTW92ZShh c3luY0RhdGEpXSB7CiAgICAgICAgICAgICBhc3luY0RhdGEtPmNvbXBsZXRpb25IYW5kbGVyKC0x KTsKICAgICAgICAgfSwgcXVldWUpOwogICAgICAgICByZXR1cm47CkBAIC0yNDUsOSArMjM3LDcg QEAgc3RhdGljIHZvaWQgb3V0cHV0U3RyZWFtV3JpdGVSZWFkeUNhbGxiYWNrKEdPdXRwdXRTdHJl YW0qIHN0cmVhbSwgR0FzeW5jUmVzdWx0KgogICAgIGdzc2l6ZSBwZW5kaW5nQnl0ZXNUb1dyaXRl ID0gYXN5bmNEYXRhLT5idWZmZXItPmxlbmd0aCAtIGJ5dGVzV3JpdHRlbjsKICAgICBpZiAoIXBl bmRpbmdCeXRlc1RvV3JpdGUpIHsKICAgICAgICAgV29ya1F1ZXVlKiBxdWV1ZSA9IGFzeW5jRGF0 YS0+cXVldWUuZ2V0KCk7Ci0gICAgICAgIGF1dG8qIGFzeW5jRGF0YVB0ciA9IGFzeW5jRGF0YS5y ZWxlYXNlKCk7Ci0gICAgICAgIHJ1blRhc2tJblF1ZXVlKFthc3luY0RhdGFQdHJdIHsKLSAgICAg ICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxXcml0ZUFzeW5jRGF0YT4gYXN5bmNEYXRhKGFzeW5jRGF0 YVB0cik7CisgICAgICAgIHJ1blRhc2tJblF1ZXVlKFthc3luY0RhdGEgPSBXVEZNb3ZlKGFzeW5j RGF0YSldIHsKICAgICAgICAgICAgIGFzeW5jRGF0YS0+Y29tcGxldGlvbkhhbmRsZXIoMCk7CiAg ICAgICAgIH0sIHF1ZXVlKTsKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RhdGlzdGljcy5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdGF0aXN0aWNz LmNwcAppbmRleCA2MTkwNjZjODYzNzk3Mjg4ZGUwNTY3NGI4MTU3ODQ4NDQyYTBkZGVkLi4xZDA4 MjRkYTY4ZWExODI2NDU1MDJjNWJiMjY5Yzc0YTMzMzdhNGI3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdGF0aXN0aWNzLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdGF0 aXN0aWNzLmNwcApAQCAtOTQsMTIgKzk0LDkgQEAgdm9pZCBTdGF0aXN0aWNzOjppbml0aWFsaXpl KGNvbnN0IFN0cmluZyYgZGF0YWJhc2VQYXRoKQogCiAgICAgYXV0byBzdGFydFRpbWUgPSBzdGQ6 OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjpub3coKTsKIAotICAgIFN0cmluZ0NhcHR1cmUgZGF0YWJh c2VQYXRoQ2FwdHVyZShkYXRhYmFzZVBhdGgpOwotICAgIFN0cmluZ0NhcHR1cmUgbmV0d29ya0Nh Y2hlUGF0aENhcHR1cmUoc2luZ2xldG9uKCkucmVjb3Jkc1BhdGgoKSk7Ci0gICAgc2VyaWFsQmFj a2dyb3VuZElPUXVldWUoKS5kaXNwYXRjaChbdGhpcywgZGF0YWJhc2VQYXRoQ2FwdHVyZSwgbmV0 d29ya0NhY2hlUGF0aENhcHR1cmUsIHN0YXJ0VGltZV0geworICAgIHNlcmlhbEJhY2tncm91bmRJ T1F1ZXVlKCkuZGlzcGF0Y2goW3RoaXMsIGRhdGFiYXNlUGF0aCA9IGRhdGFiYXNlUGF0aC5pc29s YXRlZENvcHkoKSwgbmV0d29ya0NhY2hlUGF0aCA9IHNpbmdsZXRvbigpLnJlY29yZHNQYXRoKCku aXNvbGF0ZWRDb3B5KCksIHN0YXJ0VGltZV0gewogICAgICAgICBXZWJDb3JlOjpTUUxpdGVUcmFu c2FjdGlvbkluUHJvZ3Jlc3NBdXRvQ291bnRlciB0cmFuc2FjdGlvbkNvdW50ZXI7CiAKLSAgICAg ICAgU3RyaW5nIGRhdGFiYXNlUGF0aCA9IGRhdGFiYXNlUGF0aENhcHR1cmUuc3RyaW5nKCk7CiAg ICAgICAgIGlmICghV2ViQ29yZTo6bWFrZUFsbERpcmVjdG9yaWVzKFdlYkNvcmU6OmRpcmVjdG9y eU5hbWUoZGF0YWJhc2VQYXRoKSkpCiAgICAgICAgICAgICByZXR1cm47CiAKQEAgLTEyOCw3ICsx MjUsNyBAQCB2b2lkIFN0YXRpc3RpY3M6OmluaXRpYWxpemUoY29uc3QgU3RyaW5nJiBkYXRhYmFz ZVBhdGgpCiAgICAgICAgIExPRyhOZXR3b3JrQ2FjaGUsICIoTmV0d29ya1Byb2Nlc3MpIE5ldHdv cmsgY2FjaGUgc3RhdGlzdGljcyBkYXRhYmFzZSBsb2FkIGNvbXBsZXRlLCBlbnRyaWVzPSVsdSB0 aW1lPSUiIFBSSWk2NCAibXMiLCBzdGF0aWNfY2FzdDxzaXplX3Q+KG1fYXBwcm94aW1hdGVFbnRy eUNvdW50KSwgZWxhcHNlZE1TKTsKIAogICAgICAgICBpZiAoIW1fYXBwcm94aW1hdGVFbnRyeUNv dW50KSB7Ci0gICAgICAgICAgICBib290c3RyYXBGcm9tTmV0d29ya0NhY2hlKG5ldHdvcmtDYWNo ZVBhdGhDYXB0dXJlLnN0cmluZygpKTsKKyAgICAgICAgICAgIGJvb3RzdHJhcEZyb21OZXR3b3Jr Q2FjaGUobmV0d29ya0NhY2hlUGF0aCk7CiAjaWYgIUxPR19ESVNBQkxFRAogICAgICAgICAgICAg ZWxhcHNlZE1TID0gc3RhdGljX2Nhc3Q8aW50NjRfdD4oc3RkOjpjaHJvbm86OmR1cmF0aW9uX2Nh c3Q8c3RkOjpjaHJvbm86Om1pbGxpc2Vjb25kcz4oc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6 bm93KCkgLSBzdGFydFRpbWUpLmNvdW50KCkpOwogI2VuZGlmCkBAIC0xNzYsOSArMTczLDggQEAg dm9pZCBTdGF0aXN0aWNzOjpzaHJpbmtJZk5lZWRlZCgpCiAKICAgICBjbGVhcigpOwogCi0gICAg U3RyaW5nQ2FwdHVyZSBuZXR3b3JrQ2FjaGVQYXRoQ2FwdHVyZShzaW5nbGV0b24oKS5yZWNvcmRz UGF0aCgpKTsKLSAgICBzZXJpYWxCYWNrZ3JvdW5kSU9RdWV1ZSgpLmRpc3BhdGNoKFt0aGlzLCBu ZXR3b3JrQ2FjaGVQYXRoQ2FwdHVyZV0gewotICAgICAgICBib290c3RyYXBGcm9tTmV0d29ya0Nh Y2hlKG5ldHdvcmtDYWNoZVBhdGhDYXB0dXJlLnN0cmluZygpKTsKKyAgICBzZXJpYWxCYWNrZ3Jv dW5kSU9RdWV1ZSgpLmRpc3BhdGNoKFt0aGlzLCBuZXR3b3JrQ2FjaGVQYXRoID0gc2luZ2xldG9u KCkucmVjb3Jkc1BhdGgoKS5pc29sYXRlZENvcHkoKV0geworICAgICAgICBib290c3RyYXBGcm9t TmV0d29ya0NhY2hlKG5ldHdvcmtDYWNoZVBhdGgpOwogICAgICAgICBMT0coTmV0d29ya0NhY2hl LCAiKE5ldHdvcmtQcm9jZXNzKSBzdGF0aXN0aWNzIGNhY2hlIHNocmluayBjb21wbGV0ZWQgbV9h cHByb3hpbWF0ZUVudHJ5Q291bnQ9JWx1Iiwgc3RhdGljX2Nhc3Q8c2l6ZV90PihtX2FwcHJveGlt YXRlRW50cnlDb3VudCkpOwogICAgIH0pOwogfQpAQCAtMzQ4LDcgKzM0NCw3IEBAIHZvaWQgU3Rh dGlzdGljczo6d3JpdGVUaW1lckZpcmVkKCkKICAgICBzaHJpbmtJZk5lZWRlZCgpOwogfQogCi12 b2lkIFN0YXRpc3RpY3M6OnF1ZXJ5V2FzRXZlclJlcXVlc3RlZChjb25zdCBTdHJpbmcmIGhhc2gs IE5lZWRVbmNhY2hlZFJlYXNvbiBuZWVkVW5jYWNoZWRSZWFzb24sIGNvbnN0IFJlcXVlc3RlZENv bXBsZXRpb25IYW5kbGVyJiBjb21wbGV0aW9uSGFuZGxlcikKK3ZvaWQgU3RhdGlzdGljczo6cXVl cnlXYXNFdmVyUmVxdWVzdGVkKGNvbnN0IFN0cmluZyYgaGFzaCwgTmVlZFVuY2FjaGVkUmVhc29u IG5lZWRVbmNhY2hlZFJlYXNvbiwgUmVxdWVzdGVkQ29tcGxldGlvbkhhbmRsZXImJiBjb21wbGV0 aW9uSGFuZGxlcikKIHsKICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwogCkBAIC0zNjQs NyArMzYwLDcgQEAgdm9pZCBTdGF0aXN0aWNzOjpxdWVyeVdhc0V2ZXJSZXF1ZXN0ZWQoY29uc3Qg U3RyaW5nJiBoYXNoLCBOZWVkVW5jYWNoZWRSZWFzb24gbmUKICAgICB9CiAKICAgICAvLyBRdWVy eSB0aGUgZGF0YWJhc2UuCi0gICAgYXV0byBldmVyUmVxdWVzdGVkUXVlcnkgPSBzdGQ6Om1ha2Vf dW5pcXVlPEV2ZXJSZXF1ZXN0ZWRRdWVyeT4oRXZlclJlcXVlc3RlZFF1ZXJ5IHsgaGFzaCwgbmVl ZFVuY2FjaGVkUmVhc29uID09IE5lZWRVbmNhY2hlZFJlYXNvbjo6WWVzLCBjb21wbGV0aW9uSGFu ZGxlciB9KTsKKyAgICBhdXRvIGV2ZXJSZXF1ZXN0ZWRRdWVyeSA9IHN0ZDo6bWFrZV91bmlxdWU8 RXZlclJlcXVlc3RlZFF1ZXJ5PihFdmVyUmVxdWVzdGVkUXVlcnkgeyBoYXNoLCBuZWVkVW5jYWNo ZWRSZWFzb24gPT0gTmVlZFVuY2FjaGVkUmVhc29uOjpZZXMsIFdURk1vdmUoY29tcGxldGlvbkhh bmRsZXIpIH0pOwogICAgIGF1dG8mIHF1ZXJ5ID0gKmV2ZXJSZXF1ZXN0ZWRRdWVyeTsKICAgICBt X2FjdGl2ZVF1ZXJpZXMuYWRkKFdURk1vdmUoZXZlclJlcXVlc3RlZFF1ZXJ5KSk7CiAgICAgc2Vy aWFsQmFja2dyb3VuZElPUXVldWUoKS5kaXNwYXRjaChbdGhpcywgd2FzQWxyZWFkeVJlcXVlc3Rl ZCwgJnF1ZXJ5XSAoKSBtdXRhYmxlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdv cmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0YXRpc3RpY3MuaCBiL1NvdXJjZS9XZWJLaXQy L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0YXRpc3RpY3MuaAppbmRleCAzZjk4 ZTNjZjg1NDRkMmQ2OTU2ZTVhMTM5ZDMyNTM0YjhjYWNiM2MxLi5jYzI5ZmFlN2NmYjlmZTA2NDg3 ZTBiNjJiMTY2NWI0YzUwNWNlZmFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3Jr UHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdGF0aXN0aWNzLmgKKysrIGIvU291cmNlL1dlYktp dDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RhdGlzdGljcy5oCkBAIC02OCw3 ICs2OCw3IEBAIHByaXZhdGU6CiAKICAgICB0eXBlZGVmIHN0ZDo6ZnVuY3Rpb248dm9pZCAoYm9v bCB3YXNFdmVyUmVxdWVzdGVkLCBjb25zdCBPcHRpb25hbDxTdG9yZURlY2lzaW9uPiYpPiBSZXF1 ZXN0ZWRDb21wbGV0aW9uSGFuZGxlcjsKICAgICBlbnVtIGNsYXNzIE5lZWRVbmNhY2hlZFJlYXNv biB7IE5vLCBZZXMgfTsKLSAgICB2b2lkIHF1ZXJ5V2FzRXZlclJlcXVlc3RlZChjb25zdCBTdHJp bmcmLCBOZWVkVW5jYWNoZWRSZWFzb24sIGNvbnN0IFJlcXVlc3RlZENvbXBsZXRpb25IYW5kbGVy Jik7CisgICAgdm9pZCBxdWVyeVdhc0V2ZXJSZXF1ZXN0ZWQoY29uc3QgU3RyaW5nJiwgTmVlZFVu Y2FjaGVkUmVhc29uLCBSZXF1ZXN0ZWRDb21wbGV0aW9uSGFuZGxlciYmKTsKICAgICB2b2lkIG1h cmtBc1JlcXVlc3RlZChjb25zdCBTdHJpbmcmIGhhc2gpOwogCiAgICAgc3RydWN0IEV2ZXJSZXF1 ZXN0ZWRRdWVyeSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9j YWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9j ZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuY3BwCmluZGV4IDBiOThkOTk1ZjJlNTA4MWM5 OTJjZjkzNmY3OWNhNDY2N2ZhYmU4MWQuLjJiZjAzZWVjNTJlZWVkZTE5OWQzNWYyMTdmZjU0NTc3 NGI0MDc3ODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZVN0b3JhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9j ZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuY3BwCkBAIC01NTMsOSArNTUzLDggQEAgdm9p ZCBTdG9yYWdlOjpyZW1vdmUoY29uc3QgS2V5JiBrZXkpCiAKIHZvaWQgU3RvcmFnZTo6dXBkYXRl RmlsZU1vZGlmaWNhdGlvblRpbWUoY29uc3QgU3RyaW5nJiBwYXRoKQogewotICAgIFN0cmluZ0Nh cHR1cmUgZmlsZVBhdGhDYXB0dXJlKHBhdGgpOwotICAgIHNlcmlhbEJhY2tncm91bmRJT1F1ZXVl KCkuZGlzcGF0Y2goW2ZpbGVQYXRoQ2FwdHVyZV0gewotICAgICAgICB1cGRhdGVGaWxlTW9kaWZp Y2F0aW9uVGltZUlmTmVlZGVkKGZpbGVQYXRoQ2FwdHVyZS5zdHJpbmcoKSk7CisgICAgc2VyaWFs QmFja2dyb3VuZElPUXVldWUoKS5kaXNwYXRjaChbcGF0aCA9IHBhdGguaXNvbGF0ZWRDb3B5KCld IHsKKyAgICAgICAgdXBkYXRlRmlsZU1vZGlmaWNhdGlvblRpbWVJZk5lZWRlZChwYXRoKTsKICAg ICB9KTsKIH0KIApAQCAtODkzLDEwICs4OTIsOSBAQCB2b2lkIFN0b3JhZ2U6OmNsZWFyKGNvbnN0 IFN0cmluZyYgdHlwZSwgc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6dGltZV9wb2ludCBtbwog ICAgICAgICBtX2Jsb2JGaWx0ZXItPmNsZWFyKCk7CiAgICAgbV9hcHByb3hpbWF0ZVJlY29yZHNT aXplID0gMDsKIAotICAgIFN0cmluZ0NhcHR1cmUgdHlwZUNhcHR1cmUodHlwZSk7Ci0gICAgaW9R dWV1ZSgpLmRpc3BhdGNoKFt0aGlzLCBtb2RpZmllZFNpbmNlVGltZSwgY29tcGxldGlvbkhhbmRs ZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSwgdHlwZUNhcHR1cmVdICgpIG11dGFibGUg eworICAgIGlvUXVldWUoKS5kaXNwYXRjaChbdGhpcywgbW9kaWZpZWRTaW5jZVRpbWUsIGNvbXBs ZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlciksIHR5cGUgPSB0eXBlLmlz b2xhdGVkQ29weSgpXSAoKSBtdXRhYmxlIHsKICAgICAgICAgYXV0byByZWNvcmRzUGF0aCA9IHRo aXMtPnJlY29yZHNQYXRoKCk7Ci0gICAgICAgIHRyYXZlcnNlUmVjb3Jkc0ZpbGVzKHJlY29yZHNQ YXRoLCB0eXBlQ2FwdHVyZS5zdHJpbmcoKSwgW21vZGlmaWVkU2luY2VUaW1lXShjb25zdCBTdHJp bmcmIGZpbGVOYW1lLCBjb25zdCBTdHJpbmcmIGhhc2hTdHJpbmcsIGNvbnN0IFN0cmluZyYgdHlw ZSwgYm9vbCBpc0Jsb2IsIGNvbnN0IFN0cmluZyYgcmVjb3JkRGlyZWN0b3J5UGF0aCkgeworICAg ICAgICB0cmF2ZXJzZVJlY29yZHNGaWxlcyhyZWNvcmRzUGF0aCwgdHlwZSwgW21vZGlmaWVkU2lu Y2VUaW1lXShjb25zdCBTdHJpbmcmIGZpbGVOYW1lLCBjb25zdCBTdHJpbmcmIGhhc2hTdHJpbmcs IGNvbnN0IFN0cmluZyYgdHlwZSwgYm9vbCBpc0Jsb2IsIGNvbnN0IFN0cmluZyYgcmVjb3JkRGly ZWN0b3J5UGF0aCkgewogICAgICAgICAgICAgYXV0byBmaWxlUGF0aCA9IFdlYkNvcmU6OnBhdGhC eUFwcGVuZGluZ0NvbXBvbmVudChyZWNvcmREaXJlY3RvcnlQYXRoLCBmaWxlTmFtZSk7CiAgICAg ICAgICAgICBpZiAobW9kaWZpZWRTaW5jZVRpbWUgPiBzdGQ6OmNocm9ubzo6c3lzdGVtX2Nsb2Nr Ojp0aW1lX3BvaW50OjptaW4oKSkgewogICAgICAgICAgICAgICAgIGF1dG8gdGltZXMgPSBmaWxl VGltZXMoZmlsZVBhdGgpOwo=