158076 2016-05-25 10:50:28 -0700 Simplify a few lambda captures in the network cache code 2016-05-25 12:16:56 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez cgarcia commit-queue koivisto oldest_to_newest 1196381 0 cdumez 2016-05-25 10:50:28 -0700 Simplify a few lambda captures in the network cache code by WTFMoving upon capture. 1196384 1 279785 cdumez 2016-05-25 10:52:41 -0700 Created attachment 279785 Patch 1196385 2 commit-queue 2016-05-25 10:54:44 -0700 Attachment 279785 did not pass style-queue: ERROR: Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h:65: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:351: More than one command on the same line [whitespace/newline] [4] ERROR: Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:531: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 3 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1196409 3 279785 cdumez 2016-05-25 12:16:50 -0700 Comment on attachment 279785 Patch Clearing flags on attachment: 279785 Committed r201395: <http://trac.webkit.org/changeset/201395> 1196410 4 cdumez 2016-05-25 12:16:56 -0700 All reviewed patches have been landed. Closing bug. 279785 2016-05-25 10:52:41 -0700 2016-05-25 12:16:50 -0700 Patch bug-158076-20160525105349.patch text/plain 13787 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxMzg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODhlMmM0MmYwNmVmNjlk OTYyN2I4NGEwYmM4OTRkMzk3YzRjNzQ3Ny4uNDg1NTk1NWUwMzE2ZWJmYWE0Zjg3MWY4YTVlY2Uz Mzg3NzM0NTI5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE2LTA1LTI1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxpZnkgYSBmZXcgbGFt YmRhIGNhcHR1cmVzIGluIHRoZSBuZXR3b3JrIGNhY2hlIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODA3NgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNpbXBsaWZ5IGEgZmV3IGxhbWJkYSBjYXB0 dXJlcyBpbiB0aGUgbmV0d29yayBjYWNoZSBjb2RlIGJ5IFdURk1vdmluZworICAgICAgICB1cG9u IGNhcHR1cmUuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVT cGVjdWxhdGl2ZUxvYWRNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hl OjpTcGVjdWxhdGl2ZUxvYWRNYW5hZ2VyOjpyZXRyaWV2ZSk6CisgICAgICAgIChXZWJLaXQ6Ok5l dHdvcmtDYWNoZTo6U3BlY3VsYXRpdmVMb2FkTWFuYWdlcjo6cmV0cmlldmVFbnRyeUZyb21TdG9y YWdlKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpTcGVjdWxhdGl2ZUxvYWRNYW5h Z2VyOjpyZXRyaWV2ZVN1YnJlc291cmNlc0VudHJ5KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZUxvYWRNYW5hZ2VyLmg6CisgICAgICAgICog TmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RhdGlzdGljcy5jcHA6CisgICAgICAg IChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3RhdGlzdGljczo6Ym9vdHN0cmFwRnJvbU5ldHdvcmtD YWNoZSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3RhdGlzdGljczo6cmVjb3Jk Tm90VXNpbmdDYWNoZUZvclJlcXVlc3QpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6 OlN0YXRpc3RpY3M6OnJlY29yZFJldHJpZXZhbEZhaWx1cmUpOgorICAgICAgICAoV2ViS2l0OjpO ZXR3b3JrQ2FjaGU6OlN0YXRpc3RpY3M6OndyaXRlVGltZXJGaXJlZCk6CisgICAgICAgIChXZWJL aXQ6Ok5ldHdvcmtDYWNoZTo6U3RhdGlzdGljczo6YWRkSGFzaGVzVG9EYXRhYmFzZSk6CisgICAg ICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3RhdGlzdGljczo6YWRkU3RvcmVEZWNpc2lvbnNU b0RhdGFiYXNlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVT dGF0aXN0aWNzLmg6CisKIDIwMTYtMDUtMjUgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVq aWlAc29ueS5jb20+CiAKICAgICAgICAgW1VuaXhdIFBvdGVudGlhbCBidWZmZXIgb3ZlcnJ1biBv ZiBtX2ZpbGVEZXNjcmlwdG9ycyBpbiByZWFkQnl0ZXNGcm9tU29ja2V0IG9mIENvbm5lY3Rpb25V bml4LmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUv TmV0d29ya0NhY2hlU3BlY3VsYXRpdmVMb2FkTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9O ZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZUxvYWRNYW5hZ2VyLmNw cAppbmRleCBmZTM2ODZkMGZkMmJlYmM0OWQ3ODY2MTMzY2Y0ZWU1NjIwNDllOWNkLi5kYzBmMWEw MTBmZWVlMjQ0YTg2OTIxZGEyY2VjMGFiZjYxMTY2OTk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZUxvYWRNYW5h Z2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3Jr Q2FjaGVTcGVjdWxhdGl2ZUxvYWRNYW5hZ2VyLmNwcApAQCAtMzExLDcgKzMxMSw3IEBAIGJvb2wg U3BlY3VsYXRpdmVMb2FkTWFuYWdlcjo6Y2FuVXNlUGVuZGluZ1ByZWxvYWQoY29uc3QgU3BlY3Vs YXRpdmVMb2FkJiBsb2FkLCBjCiAgICAgcmV0dXJuIHJlcXVlc3RzSGVhZGVyc01hdGNoKGxvYWQu b3JpZ2luYWxSZXF1ZXN0KCksIGFjdHVhbFJlcXVlc3QpOwogfQogCi1ib29sIFNwZWN1bGF0aXZl TG9hZE1hbmFnZXI6OnJldHJpZXZlKGNvbnN0IEdsb2JhbEZyYW1lSUQmIGZyYW1lSUQsIGNvbnN0 IEtleSYgc3RvcmFnZUtleSwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0 LCBjb25zdCBSZXRyaWV2ZUNvbXBsZXRpb25IYW5kbGVyJiBjb21wbGV0aW9uSGFuZGxlcikKK2Jv b2wgU3BlY3VsYXRpdmVMb2FkTWFuYWdlcjo6cmV0cmlldmUoY29uc3QgR2xvYmFsRnJhbWVJRCYg ZnJhbWVJRCwgY29uc3QgS2V5JiBzdG9yYWdlS2V5LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJl cXVlc3QmIHJlcXVlc3QsIFJldHJpZXZlQ29tcGxldGlvbkhhbmRsZXImJiBjb21wbGV0aW9uSGFu ZGxlcikKIHsKICAgICAvLyBDaGVjayBhbHJlYWR5IHByZWxvYWRlZCBlbnRyaWVzLgogICAgIGlm IChhdXRvIHByZWxvYWRlZEVudHJ5ID0gbV9wcmVsb2FkZWRFbnRyaWVzLnRha2Uoc3RvcmFnZUtl eSkpIHsKQEAgLTM0OCwxMCArMzQ4LDggQEAgYm9vbCBTcGVjdWxhdGl2ZUxvYWRNYW5hZ2VyOjpy ZXRyaWV2ZShjb25zdCBHbG9iYWxGcmFtZUlEJiBmcmFtZUlELCBjb25zdCBLZXkmIHMKICAgICBM T0coTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVQcmVsb2FkaW5nLCAiKE5ldHdvcmtQcm9jZXNzKSBS ZXRyaWV2YWw6IHJldmFsaWRhdGlvbiBhbHJlYWR5IGluIHByb2dyZXNzIGZvciAnJXMnOiIsIHN0 b3JhZ2VLZXkuaWRlbnRpZmllcigpLnV0ZjgoKS5kYXRhKCkpOwogCiAgICAgLy8gRklYTUU6IFRo aXMgYnJlYWtzIGluY3JlbWVudGFsIGxvYWRpbmcgd2hlbiB0aGUgcmV2YWxpZGF0aW9uIGlzIG5v dCBzdWNjZXNzZnVsLgotICAgIGF1dG8gYWRkUmVzdWx0ID0gbV9wZW5kaW5nUmV0cmlldmVSZXF1 ZXN0cy5hZGQoc3RvcmFnZUtleSwgbnVsbHB0cik7Ci0gICAgaWYgKGFkZFJlc3VsdC5pc05ld0Vu dHJ5KQotICAgICAgICBhZGRSZXN1bHQuaXRlcmF0b3ItPnZhbHVlID0gc3RkOjptYWtlX3VuaXF1 ZTxWZWN0b3I8UmV0cmlldmVDb21wbGV0aW9uSGFuZGxlcj4+KCk7Ci0gICAgYWRkUmVzdWx0Lml0 ZXJhdG9yLT52YWx1ZS0+YXBwZW5kKGNvbXBsZXRpb25IYW5kbGVyKTsKKyAgICBhdXRvIGFkZFJl c3VsdCA9IG1fcGVuZGluZ1JldHJpZXZlUmVxdWVzdHMuZW5zdXJlKHN0b3JhZ2VLZXksIFtdIHsg cmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8VmVjdG9yPFJldHJpZXZlQ29tcGxldGlvbkhhbmRsZXI+ PigpOyB9KTsKKyAgICBhZGRSZXN1bHQuaXRlcmF0b3ItPnZhbHVlLT5hcHBlbmQoV1RGTW92ZShj b21wbGV0aW9uSGFuZGxlcikpOwogICAgIHJldHVybiB0cnVlOwogfQogCkBAIC00MDcsOSArNDA1 LDkgQEAgdm9pZCBTcGVjdWxhdGl2ZUxvYWRNYW5hZ2VyOjphZGRQcmVsb2FkZWRFbnRyeShzdGQ6 OnVuaXF1ZV9wdHI8RW50cnk+IGVudHJ5LCBjb24KICAgICB9KSk7CiB9CiAKLXZvaWQgU3BlY3Vs YXRpdmVMb2FkTWFuYWdlcjo6cmV0cmlldmVFbnRyeUZyb21TdG9yYWdlKGNvbnN0IEtleSYga2V5 LCBjb25zdCBSZXRyaWV2ZUNvbXBsZXRpb25IYW5kbGVyJiBjb21wbGV0aW9uSGFuZGxlcikKK3Zv aWQgU3BlY3VsYXRpdmVMb2FkTWFuYWdlcjo6cmV0cmlldmVFbnRyeUZyb21TdG9yYWdlKGNvbnN0 IEtleSYga2V5LCBSZXRyaWV2ZUNvbXBsZXRpb25IYW5kbGVyJiYgY29tcGxldGlvbkhhbmRsZXIp CiB7Ci0gICAgbV9zdG9yYWdlLnJldHJpZXZlKGtleSwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KFJl c291cmNlTG9hZFByaW9yaXR5OjpNZWRpdW0pLCBbY29tcGxldGlvbkhhbmRsZXJdKGF1dG8gcmVj b3JkKSB7CisgICAgbV9zdG9yYWdlLnJldHJpZXZlKGtleSwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+ KFJlc291cmNlTG9hZFByaW9yaXR5OjpNZWRpdW0pLCBbY29tcGxldGlvbkhhbmRsZXIgPSBXVEZN b3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oYXV0byByZWNvcmQpIHsKICAgICAgICAgaWYgKCFyZWNv cmQpIHsKICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKG51bGxwdHIpOwogICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwpAQCAtNTMwLDExICs1MjgsMTEgQEAgdm9pZCBTcGVjdWxhdGl2ZUxv YWRNYW5hZ2VyOjpzdGFydFNwZWN1bGF0aXZlUmV2YWxpZGF0aW9uKGNvbnN0IEdsb2JhbEZyYW1l SUQmIGYKICAgICB9CiB9CiAKLXZvaWQgU3BlY3VsYXRpdmVMb2FkTWFuYWdlcjo6cmV0cmlldmVT dWJyZXNvdXJjZXNFbnRyeShjb25zdCBLZXkmIHN0b3JhZ2VLZXksIHN0ZDo6ZnVuY3Rpb248dm9p ZCAoc3RkOjp1bmlxdWVfcHRyPFN1YnJlc291cmNlc0VudHJ5Pik+IGNvbXBsZXRpb25IYW5kbGVy KQordm9pZCBTcGVjdWxhdGl2ZUxvYWRNYW5hZ2VyOjpyZXRyaWV2ZVN1YnJlc291cmNlc0VudHJ5 KGNvbnN0IEtleSYgc3RvcmFnZUtleSwgc3RkOjpmdW5jdGlvbjx2b2lkIChzdGQ6OnVuaXF1ZV9w dHI8U3VicmVzb3VyY2VzRW50cnk+KT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBBU1NF UlQoc3RvcmFnZUtleS50eXBlKCkgPT0gInJlc291cmNlIik7CiAgICAgYXV0byBzdWJyZXNvdXJj ZXNTdG9yYWdlS2V5ID0gbWFrZVN1YnJlc291cmNlc0tleShzdG9yYWdlS2V5KTsKLSAgICBtX3N0 b3JhZ2UucmV0cmlldmUoc3VicmVzb3VyY2VzU3RvcmFnZUtleSwgc3RhdGljX2Nhc3Q8dW5zaWdu ZWQ+KFJlc291cmNlTG9hZFByaW9yaXR5OjpNZWRpdW0pLCBbY29tcGxldGlvbkhhbmRsZXJdKGF1 dG8gcmVjb3JkKSB7CisgICAgbV9zdG9yYWdlLnJldHJpZXZlKHN1YnJlc291cmNlc1N0b3JhZ2VL ZXksIHN0YXRpY19jYXN0PHVuc2lnbmVkPihSZXNvdXJjZUxvYWRQcmlvcml0eTo6TWVkaXVtKSwg W2NvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKGF1dG8gcmVj b3JkKSB7CiAgICAgICAgIGlmICghcmVjb3JkKSB7CiAgICAgICAgICAgICBjb21wbGV0aW9uSGFu ZGxlcihudWxscHRyKTsKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZl TG9hZE1hbmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv cmtDYWNoZVNwZWN1bGF0aXZlTG9hZE1hbmFnZXIuaAppbmRleCBiMGU2YjRjMjk3NTk3ZWQzZTg0 ZGY4ZDBkMDk5YmQ3N2FkNzg4Y2YzLi42ZWZkZTIyZWU5ZmVjYjRlMDI0Y2I5ZDMxY2UyYmU5ZTFj NmZmZWI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9O ZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZUxvYWRNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdDIv TmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVMb2FkTWFuYWdlci5o CkBAIC01MiwxNyArNTIsMTcgQEAgcHVibGljOgogICAgIHZvaWQgcmVnaXN0ZXJMb2FkKGNvbnN0 IEdsb2JhbEZyYW1lSUQmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBL ZXkmIHJlc291cmNlS2V5KTsKIAogICAgIHR5cGVkZWYgc3RkOjpmdW5jdGlvbjx2b2lkIChzdGQ6 OnVuaXF1ZV9wdHI8RW50cnk+KT4gUmV0cmlldmVDb21wbGV0aW9uSGFuZGxlcjsKLSAgICBib29s IHJldHJpZXZlKGNvbnN0IEdsb2JhbEZyYW1lSUQmLCBjb25zdCBLZXkmIHN0b3JhZ2VLZXksIGNv bnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFJldHJpZXZlQ29tcGxldGlvbkhh bmRsZXImKTsKKyAgICBib29sIHJldHJpZXZlKGNvbnN0IEdsb2JhbEZyYW1lSUQmLCBjb25zdCBL ZXkmIHN0b3JhZ2VLZXksIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIFJldHJpZXZl Q29tcGxldGlvbkhhbmRsZXImJik7CiAKIHByaXZhdGU6CiAgICAgY2xhc3MgUHJlbG9hZGVkRW50 cnk7CiAKICAgICB2b2lkIGFkZFByZWxvYWRlZEVudHJ5KHN0ZDo6dW5pcXVlX3B0cjxFbnRyeT4s IGNvbnN0IEdsb2JhbEZyYW1lSUQmLCBPcHRpb25hbDxXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q+ JiYgcmV2YWxpZGF0aW9uUmVxdWVzdCA9IE51bGxvcHQpOwogICAgIHZvaWQgcHJlbG9hZEVudHJ5 KGNvbnN0IEtleSYsIGNvbnN0IFN1YnJlc291cmNlSW5mbyYsIGNvbnN0IEdsb2JhbEZyYW1lSUQm KTsKLSAgICB2b2lkIHJldHJpZXZlRW50cnlGcm9tU3RvcmFnZShjb25zdCBLZXkmLCBjb25zdCBS ZXRyaWV2ZUNvbXBsZXRpb25IYW5kbGVyJik7CisgICAgdm9pZCByZXRyaWV2ZUVudHJ5RnJvbVN0 b3JhZ2UoY29uc3QgS2V5JiwgUmV0cmlldmVDb21wbGV0aW9uSGFuZGxlciYmKTsKICAgICB2b2lk IHJldmFsaWRhdGVFbnRyeShzdGQ6OnVuaXF1ZV9wdHI8RW50cnk+LCBjb25zdCBTdWJyZXNvdXJj ZUluZm8mLCBjb25zdCBHbG9iYWxGcmFtZUlEJik7CiAgICAgYm9vbCBzYXRpc2Z5UGVuZGluZ1Jl cXVlc3RzKGNvbnN0IEtleSYsIEVudHJ5Kik7Ci0gICAgdm9pZCByZXRyaWV2ZVN1YnJlc291cmNl c0VudHJ5KGNvbnN0IEtleSYgc3RvcmFnZUtleSwgc3RkOjpmdW5jdGlvbjx2b2lkIChzdGQ6OnVu aXF1ZV9wdHI8U3VicmVzb3VyY2VzRW50cnk+KT4pOworICAgIHZvaWQgcmV0cmlldmVTdWJyZXNv dXJjZXNFbnRyeShjb25zdCBLZXkmIHN0b3JhZ2VLZXksIHN0ZDo6ZnVuY3Rpb248dm9pZCAoc3Rk Ojp1bmlxdWVfcHRyPFN1YnJlc291cmNlc0VudHJ5Pik+JiYpOwogICAgIHZvaWQgc3RhcnRTcGVj dWxhdGl2ZVJldmFsaWRhdGlvbihjb25zdCBHbG9iYWxGcmFtZUlEJiwgU3VicmVzb3VyY2VzRW50 cnkmKTsKIAogICAgIHN0YXRpYyBib29sIGNhblVzZVByZWxvYWRlZEVudHJ5KGNvbnN0IFByZWxv YWRlZEVudHJ5JiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBhY3R1YWxSZXF1ZXN0 KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv cmtDYWNoZVN0YXRpc3RpY3MuY3BwIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2Fj aGUvTmV0d29ya0NhY2hlU3RhdGlzdGljcy5jcHAKaW5kZXggY2JmMzU2YWU0ODU0MTQyZjZjNzY4 ZTlkNDVkNjBlNjFkYzgwNzczYy4uNjE5MDY2Yzg2Mzc5NzI4OGRlMDU2NzRiODE1Nzg0ODQ0MmEw ZGRlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0 d29ya0NhY2hlU3RhdGlzdGljcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nl c3MvY2FjaGUvTmV0d29ya0NhY2hlU3RhdGlzdGljcy5jcHAKQEAgLTE0Myw3ICsxNDMsNyBAQCB2 b2lkIFN0YXRpc3RpY3M6OmJvb3RzdHJhcEZyb21OZXR3b3JrQ2FjaGUoY29uc3QgU3RyaW5nJiBu ZXR3b3JrQ2FjaGVQYXRoKQogCiAgICAgTE9HKE5ldHdvcmtDYWNoZSwgIihOZXR3b3JrUHJvY2Vz cykgQm9vdHN0cmFwcGluZyB0aGUgbmV0d29yayBjYWNoZSBzdGF0aXN0aWNzIGRhdGFiYXNlIGZy b20gdGhlIG5ldHdvcmsgY2FjaGUuLi4iKTsKIAotICAgIFZlY3RvcjxTdHJpbmdDYXB0dXJlPiBo YXNoZXM7CisgICAgSGFzaFNldDxTdHJpbmc+IGhhc2hlczsKICAgICB0cmF2ZXJzZVJlY29yZHNG aWxlcyhuZXR3b3JrQ2FjaGVQYXRoLCBBU0NJSUxpdGVyYWwoInJlc291cmNlIiksIFsmaGFzaGVz XShjb25zdCBTdHJpbmcmIGZpbGVOYW1lLCBjb25zdCBTdHJpbmcmIGhhc2hTdHJpbmcsIGNvbnN0 IFN0cmluZyYgdHlwZSwgYm9vbCBpc0JvZHlCbG9iLCBjb25zdCBTdHJpbmcmIHJlY29yZERpcmVj dG9yeVBhdGgpIHsKICAgICAgICAgaWYgKGlzQm9keUJsb2IpCiAgICAgICAgICAgICByZXR1cm47 CkBAIC0xNTIsNyArMTUyLDcgQEAgdm9pZCBTdGF0aXN0aWNzOjpib290c3RyYXBGcm9tTmV0d29y a0NhY2hlKGNvbnN0IFN0cmluZyYgbmV0d29ya0NhY2hlUGF0aCkKICAgICAgICAgaWYgKCFLZXk6 OnN0cmluZ1RvSGFzaChoYXNoU3RyaW5nLCBoYXNoKSkKICAgICAgICAgICAgIHJldHVybjsKIAot ICAgICAgICBoYXNoZXMuYXBwZW5kKGhhc2hTdHJpbmcpOworICAgICAgICBoYXNoZXMuYWRkKGhh c2hTdHJpbmcpOwogICAgIH0pOwogCiAgICAgV2ViQ29yZTo6U1FMaXRlVHJhbnNhY3Rpb25JblBy b2dyZXNzQXV0b0NvdW50ZXIgdHJhbnNhY3Rpb25Db3VudGVyOwpAQCAtMjE5LDkgKzIxOSw4IEBA IHZvaWQgU3RhdGlzdGljczo6cmVjb3JkTm90VXNpbmdDYWNoZUZvclJlcXVlc3QodWludDY0X3Qg d2ViUGFnZUlELCBjb25zdCBLZXkmIGtlCiB7CiAgICAgQVNTRVJUKHJldHJpZXZlRGVjaXNpb24g IT0gUmV0cmlldmVEZWNpc2lvbjo6WWVzKTsKIAotICAgIFN0cmluZyBoYXNoID0ga2V5Lmhhc2hB c1N0cmluZygpOwotICAgIFdlYkNvcmU6OlVSTCByZXF1ZXN0VVJMID0gcmVxdWVzdC51cmwoKTsK LSAgICBxdWVyeVdhc0V2ZXJSZXF1ZXN0ZWQoaGFzaCwgTmVlZFVuY2FjaGVkUmVhc29uOjpObywg W3RoaXMsIGhhc2gsIHJlcXVlc3RVUkwsIHdlYlBhZ2VJRCwgcmV0cmlldmVEZWNpc2lvbl0oYm9v bCB3YXNFdmVyUmVxdWVzdGVkLCBjb25zdCBPcHRpb25hbDxTdG9yZURlY2lzaW9uPiYpIHsKKyAg ICBhdXRvIGhhc2ggPSBrZXkuaGFzaEFzU3RyaW5nKCk7CisgICAgcXVlcnlXYXNFdmVyUmVxdWVz dGVkKGhhc2gsIE5lZWRVbmNhY2hlZFJlYXNvbjo6Tm8sIFt0aGlzLCBoYXNoLCByZXF1ZXN0VVJM ID0gcmVxdWVzdC51cmwoKSwgd2ViUGFnZUlELCByZXRyaWV2ZURlY2lzaW9uXShib29sIHdhc0V2 ZXJSZXF1ZXN0ZWQsIGNvbnN0IE9wdGlvbmFsPFN0b3JlRGVjaXNpb24+JikgewogICAgICAgICBp ZiAod2FzRXZlclJlcXVlc3RlZCkgewogICAgICAgICAgICAgU3RyaW5nIGRpYWdub3N0aWNLZXkg PSByZXRyaWV2ZURlY2lzaW9uVG9EaWFnbm9zdGljS2V5KHJldHJpZXZlRGVjaXNpb24pOwogICAg ICAgICAgICAgTE9HKE5ldHdvcmtDYWNoZSwgIihOZXR3b3JrUHJvY2Vzcykgd2ViUGFnZUlEICUi IFBSSXU2NCAiOiAlcyB3YXMgcHJldmlvdXNseSByZXF1ZXN0ZWQgYnV0IHdlIGFyZSBub3QgdXNp bmcgdGhlIGNhY2hlLCByZWFzb246ICVzIiwgd2ViUGFnZUlELCByZXF1ZXN0VVJMLnN0cmluZygp LmFzY2lpKCkuZGF0YSgpLCBkaWFnbm9zdGljS2V5LnV0ZjgoKS5kYXRhKCkpOwpAQCAtMjYwLDkg KzI1OSw4IEBAIHN0YXRpYyBTdHJpbmcgc3RvcmVEZWNpc2lvblRvRGlhZ25vc3RpY0tleShTdG9y ZURlY2lzaW9uIHN0b3JlRGVjaXNpb24pCiAKIHZvaWQgU3RhdGlzdGljczo6cmVjb3JkUmV0cmll dmFsRmFpbHVyZSh1aW50NjRfdCB3ZWJQYWdlSUQsIGNvbnN0IEtleSYga2V5LCBjb25zdCBXZWJD b3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCiB7Ci0gICAgU3RyaW5nIGhhc2ggPSBrZXku aGFzaEFzU3RyaW5nKCk7Ci0gICAgV2ViQ29yZTo6VVJMIHJlcXVlc3RVUkwgPSByZXF1ZXN0LnVy bCgpOwotICAgIHF1ZXJ5V2FzRXZlclJlcXVlc3RlZChoYXNoLCBOZWVkVW5jYWNoZWRSZWFzb246 OlllcywgW3RoaXMsIGhhc2gsIHJlcXVlc3RVUkwsIHdlYlBhZ2VJRF0oYm9vbCB3YXNQcmV2aW91 c2x5UmVxdWVzdGVkLCBjb25zdCBPcHRpb25hbDxTdG9yZURlY2lzaW9uPiYgc3RvcmVEZWNpc2lv bikgeworICAgIGF1dG8gaGFzaCA9IGtleS5oYXNoQXNTdHJpbmcoKTsKKyAgICBxdWVyeVdhc0V2 ZXJSZXF1ZXN0ZWQoaGFzaCwgTmVlZFVuY2FjaGVkUmVhc29uOjpZZXMsIFt0aGlzLCBoYXNoLCBy ZXF1ZXN0VVJMID0gcmVxdWVzdC51cmwoKSwgd2ViUGFnZUlEXShib29sIHdhc1ByZXZpb3VzbHlS ZXF1ZXN0ZWQsIGNvbnN0IE9wdGlvbmFsPFN0b3JlRGVjaXNpb24+JiBzdG9yZURlY2lzaW9uKSB7 CiAgICAgICAgIGlmICh3YXNQcmV2aW91c2x5UmVxdWVzdGVkKSB7CiAgICAgICAgICAgICBTdHJp bmcgZGlhZ25vc3RpY0tleSA9IHN0b3JlRGVjaXNpb25Ub0RpYWdub3N0aWNLZXkoc3RvcmVEZWNp c2lvbi52YWx1ZSgpKTsKICAgICAgICAgICAgIExPRyhOZXR3b3JrQ2FjaGUsICIoTmV0d29ya1By b2Nlc3MpIHdlYlBhZ2VJRCAlIiBQUkl1NjQgIjogJXMgd2FzIHByZXZpb3VzbHkgcmVxdWVzdCBi dXQgaXMgbm90IGluIHRoZSBjYWNoZSwgcmVhc29uOiAlcyIsIHdlYlBhZ2VJRCwgcmVxdWVzdFVS TC5zdHJpbmcoKS5hc2NpaSgpLmRhdGEoKSwgZGlhZ25vc3RpY0tleS51dGY4KCkuZGF0YSgpKTsK QEAgLTMzMywxNyArMzMxLDcgQEAgdm9pZCBTdGF0aXN0aWNzOjp3cml0ZVRpbWVyRmlyZWQoKQog ewogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CiAKLSAgICBWZWN0b3I8U3RyaW5nQ2Fw dHVyZT4gaGFzaGVzVG9BZGQ7Ci0gICAgY29weVRvVmVjdG9yKG1faGFzaGVzVG9BZGQsIGhhc2hl c1RvQWRkKTsKLSAgICBtX2hhc2hlc1RvQWRkLmNsZWFyKCk7Ci0KLSAgICBWZWN0b3I8c3RkOjpw YWlyPFN0cmluZ0NhcHR1cmUsIFN0b3JlRGVjaXNpb24+PiBzdG9yZURlY2lzaW9uc1RvQWRkOwot ICAgIGNvcHlUb1ZlY3RvcihtX3N0b3JlRGVjaXNpb25zVG9BZGQsIHN0b3JlRGVjaXNpb25zVG9B ZGQpOwotICAgIG1fc3RvcmVEZWNpc2lvbnNUb0FkZC5jbGVhcigpOwotCi0gICAgc2hyaW5rSWZO ZWVkZWQoKTsKLQotICAgIHNlcmlhbEJhY2tncm91bmRJT1F1ZXVlKCkuZGlzcGF0Y2goW3RoaXMs IGhhc2hlc1RvQWRkLCBzdG9yZURlY2lzaW9uc1RvQWRkXSB7CisgICAgc2VyaWFsQmFja2dyb3Vu ZElPUXVldWUoKS5kaXNwYXRjaChbdGhpcywgaGFzaGVzVG9BZGQgPSBXVEZNb3ZlKG1faGFzaGVz VG9BZGQpLCBzdG9yZURlY2lzaW9uc1RvQWRkID0gV1RGTW92ZShtX3N0b3JlRGVjaXNpb25zVG9B ZGQpXSB7CiAgICAgICAgIGlmICghbV9kYXRhYmFzZS5pc09wZW4oKSkKICAgICAgICAgICAgIHJl dHVybjsKIApAQCAtMzU2LDYgKzM0NCw4IEBAIHZvaWQgU3RhdGlzdGljczo6d3JpdGVUaW1lckZp cmVkKCkKIAogICAgICAgICB3cml0ZVRyYW5zYWN0aW9uLmNvbW1pdCgpOwogICAgIH0pOworCisg ICAgc2hyaW5rSWZOZWVkZWQoKTsKIH0KIAogdm9pZCBTdGF0aXN0aWNzOjpxdWVyeVdhc0V2ZXJS ZXF1ZXN0ZWQoY29uc3QgU3RyaW5nJiBoYXNoLCBOZWVkVW5jYWNoZWRSZWFzb24gbmVlZFVuY2Fj aGVkUmVhc29uLCBjb25zdCBSZXF1ZXN0ZWRDb21wbGV0aW9uSGFuZGxlciYgY29tcGxldGlvbkhh bmRsZXIpCkBAIC00MjIsNyArNDEyLDcgQEAgdm9pZCBTdGF0aXN0aWNzOjpjbGVhcigpCiAgICAg fSk7CiB9CiAKLXZvaWQgU3RhdGlzdGljczo6YWRkSGFzaGVzVG9EYXRhYmFzZShjb25zdCBWZWN0 b3I8U3RyaW5nQ2FwdHVyZT4mIGhhc2hlcykKK3ZvaWQgU3RhdGlzdGljczo6YWRkSGFzaGVzVG9E YXRhYmFzZShjb25zdCBIYXNoU2V0PFN0cmluZz4mIGhhc2hlcykKIHsKICAgICBBU1NFUlQoIVJ1 bkxvb3A6OmlzTWFpbigpKTsKICAgICBBU1NFUlQoV2ViQ29yZTo6U1FMaXRlRGF0YWJhc2VUcmFj a2VyOjpoYXNUcmFuc2FjdGlvbkluUHJvZ3Jlc3MoKSk7CkBAIC00MzMsMTQgKzQyMywxNCBAQCB2 b2lkIFN0YXRpc3RpY3M6OmFkZEhhc2hlc1RvRGF0YWJhc2UoY29uc3QgVmVjdG9yPFN0cmluZ0Nh cHR1cmU+JiBoYXNoZXMpCiAgICAgICAgIHJldHVybjsKIAogICAgIGZvciAoYXV0byYgaGFzaCA6 IGhhc2hlcykgewotICAgICAgICBzdGF0ZW1lbnQuYmluZFRleHQoMSwgaGFzaC5zdHJpbmcoKSk7 CisgICAgICAgIHN0YXRlbWVudC5iaW5kVGV4dCgxLCBoYXNoKTsKICAgICAgICAgaWYgKGV4ZWN1 dGVTUUxTdGF0ZW1lbnQoc3RhdGVtZW50KSkKICAgICAgICAgICAgICsrbV9hcHByb3hpbWF0ZUVu dHJ5Q291bnQ7CiAgICAgICAgIHN0YXRlbWVudC5yZXNldCgpOwogICAgIH0KIH0KIAotdm9pZCBT dGF0aXN0aWNzOjphZGRTdG9yZURlY2lzaW9uc1RvRGF0YWJhc2UoY29uc3QgVmVjdG9yPHN0ZDo6 cGFpcjxTdHJpbmdDYXB0dXJlLCBTdG9yZURlY2lzaW9uPj4mIHN0b3JlRGVjaXNpb25zKQordm9p ZCBTdGF0aXN0aWNzOjphZGRTdG9yZURlY2lzaW9uc1RvRGF0YWJhc2UoY29uc3QgSGFzaE1hcDxT dHJpbmcsIE5ldHdvcmtDYWNoZTo6U3RvcmVEZWNpc2lvbj4mIHN0b3JlRGVjaXNpb25zKQogewog ICAgIEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOwogICAgIEFTU0VSVChXZWJDb3JlOjpTUUxp dGVEYXRhYmFzZVRyYWNrZXI6Omhhc1RyYW5zYWN0aW9uSW5Qcm9ncmVzcygpKTsKQEAgLTQ1MSw4 ICs0NDEsOCBAQCB2b2lkIFN0YXRpc3RpY3M6OmFkZFN0b3JlRGVjaXNpb25zVG9EYXRhYmFzZShj b25zdCBWZWN0b3I8c3RkOjpwYWlyPFN0cmluZ0NhcHR1cgogICAgICAgICByZXR1cm47CiAKICAg ICBmb3IgKGF1dG8mIHBhaXIgOiBzdG9yZURlY2lzaW9ucykgewotICAgICAgICBzdGF0ZW1lbnQu YmluZFRleHQoMSwgcGFpci5maXJzdC5zdHJpbmcoKSk7Ci0gICAgICAgIHN0YXRlbWVudC5iaW5k SW50KDIsIHN0YXRpY19jYXN0PGludD4ocGFpci5zZWNvbmQpKTsKKyAgICAgICAgc3RhdGVtZW50 LmJpbmRUZXh0KDEsIHBhaXIua2V5KTsKKyAgICAgICAgc3RhdGVtZW50LmJpbmRJbnQoMiwgc3Rh dGljX2Nhc3Q8aW50PihwYWlyLnZhbHVlKSk7CiAgICAgICAgIGV4ZWN1dGVTUUxTdGF0ZW1lbnQo c3RhdGVtZW50KTsKICAgICAgICAgc3RhdGVtZW50LnJlc2V0KCk7CiAgICAgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RhdGlz dGljcy5oIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hl U3RhdGlzdGljcy5oCmluZGV4IGVjMjYzOGQyYmU1YzdlNGY2M2ZhY2NjYmM0YWIyMWYyMzU5Zjhk MzMuLjNmOThlM2NmODU0NGQyZDY5NTZlNWExMzlkMzI1MzRiOGNhY2IzYzEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0YXRpc3Rp Y3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2Fj aGVTdGF0aXN0aWNzLmgKQEAgLTYyLDggKzYyLDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGJvb3Rz dHJhcEZyb21OZXR3b3JrQ2FjaGUoY29uc3QgU3RyaW5nJiBuZXR3b3JrQ2FjaGVQYXRoKTsKICAg ICB2b2lkIHNocmlua0lmTmVlZGVkKCk7CiAKLSAgICB2b2lkIGFkZEhhc2hlc1RvRGF0YWJhc2Uo Y29uc3QgVmVjdG9yPFN0cmluZ0NhcHR1cmU+JiBoYXNoZXMpOwotICAgIHZvaWQgYWRkU3RvcmVE ZWNpc2lvbnNUb0RhdGFiYXNlKGNvbnN0IFZlY3RvcjxzdGQ6OnBhaXI8U3RyaW5nQ2FwdHVyZSwg TmV0d29ya0NhY2hlOjpTdG9yZURlY2lzaW9uPj4mKTsKKyAgICB2b2lkIGFkZEhhc2hlc1RvRGF0 YWJhc2UoY29uc3QgSGFzaFNldDxTdHJpbmc+JiBoYXNoZXMpOworICAgIHZvaWQgYWRkU3RvcmVE ZWNpc2lvbnNUb0RhdGFiYXNlKGNvbnN0IEhhc2hNYXA8U3RyaW5nLCBOZXR3b3JrQ2FjaGU6OlN0 b3JlRGVjaXNpb24+Jik7CiAgICAgdm9pZCB3cml0ZVRpbWVyRmlyZWQoKTsKIAogICAgIHR5cGVk ZWYgc3RkOjpmdW5jdGlvbjx2b2lkIChib29sIHdhc0V2ZXJSZXF1ZXN0ZWQsIGNvbnN0IE9wdGlv bmFsPFN0b3JlRGVjaXNpb24+Jik+IFJlcXVlc3RlZENvbXBsZXRpb25IYW5kbGVyOwo=