158053 2016-05-24 20:48:20 -0700 Simplify a couple of lambda captures in the network cache code 2016-05-24 22:16:57 -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 1196121 0 cdumez 2016-05-24 20:48:20 -0700 Simplify a couple of lambda captures in the network cache code. 1196122 1 279738 cdumez 2016-05-24 20:51:13 -0700 Created attachment 279738 Patch 1196145 2 279738 beidson 2016-05-24 21:53:49 -0700 Comment on attachment 279738 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=279738&action=review > Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp:-902 > - // Avoid non-thread safe std::function copies. > - auto* completionHandlerPtr = completionHandler ? new std::function<void ()>(WTFMove(completionHandler)) : nullptr; I see this comment, and it makes me wonder - How much thread hopping does the NetworkCacheStorage code do? We have a mechanism for this called "createCrossThreadTask" that perhaps you should look in to going forward. 1196207 3 279738 commit-queue 2016-05-24 22:16:52 -0700 Comment on attachment 279738 Patch Clearing flags on attachment: 279738 Committed r201371: <http://trac.webkit.org/changeset/201371> 1196208 4 commit-queue 2016-05-24 22:16:57 -0700 All reviewed patches have been landed. Closing bug. 279738 2016-05-24 20:51:13 -0700 2016-05-24 22:16:52 -0700 Patch bug-158053-20160524205221.patch text/plain 4451 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxMzYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTY1OGIwNDY5NWRmYmM2 OTBiMjJmNmY3NWM0N2JmMzJmNjEwY2ExYS4uMDNiZjMwNTNkNDQ3MTNhNjM1MWFiN2IyODUzYWJm ZWQwYTFlY2Y5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE2LTA1LTI0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxpZnkgYSBjb3VwbGUg b2YgbGFtYmRhIGNhcHR1cmVzIGluIHRoZSBuZXR3b3JrIGNhY2hlIGNvZGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODA1MworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2Fj aGUvTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVMb2FkTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJL aXQ6Ok5ldHdvcmtDYWNoZTo6U3BlY3VsYXRpdmVMb2FkTWFuYWdlcjo6cHJlbG9hZEVudHJ5KToK KyAgICAgICAgSnVzdCBjYXB0dXJlIHN1YlJlc291cmNlSW5mbyBpbnN0ZWFkIG9mIGFsbG9jYXRp bmcgYSBuZXcgY29weQorICAgICAgICBvbiB0aGUgaGVhcC4gVGhlcmUgaXMgbm8gcmVhc29uIHdl IGNhbm5vdCBzaW1wbHkgY2FwdHVyZQorICAgICAgICBzdWJSZXNvdXJjZUluZm8gaGVyZS4KKwor ICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuY3BwOgor ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlN0b3JhZ2U6OmNsZWFyKToKKyAgICAgICAg VXNlIG5ldyBDKysxNCBjYXB0dXJlIHdpdGggaW5pdGlhbGl6YXRpb24gdG8gbWFrZSB0aGUgY29k ZSBhCisgICAgICAgIGJpdCBuaWNlci4KKwogMjAxNi0wNS0yNCAgUnlhbiBIYWRkYWQgIDxyeWFu aGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjAx MzQ5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0 d29ya0NhY2hlU3BlY3VsYXRpdmVMb2FkTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZUxvYWRNYW5hZ2VyLmNwcApp bmRleCBiZDllNTE2M2QyMjNkYTUwZjFiNGExNWFhNzg1MGZlZjU1YjllOGZiLi5mMzIzZjM2YjJh MGUwMjA5OTA3NmRlMjI3ZGU4ZmQzZWMwYzVjOGIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZUxvYWRNYW5hZ2Vy LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2Fj aGVTcGVjdWxhdGl2ZUxvYWRNYW5hZ2VyLmNwcApAQCAtNDkzLDkgKzQ5Myw3IEBAIHZvaWQgU3Bl Y3VsYXRpdmVMb2FkTWFuYWdlcjo6cHJlbG9hZEVudHJ5KGNvbnN0IEtleSYga2V5LCBjb25zdCBT dWJyZXNvdXJjZUluZm8mCiAgICAgICAgIHJldHVybjsKIAogICAgIG1fcGVuZGluZ1ByZWxvYWRz LmFkZChrZXksIG51bGxwdHIpOwotICAgIGF1dG8qIHN1YlJlc291cmNlSW5mb1B0ciA9IG5ldyBT dWJyZXNvdXJjZUluZm8oc3ViUmVzb3VyY2VJbmZvKTsKLSAgICByZXRyaWV2ZUVudHJ5RnJvbVN0 b3JhZ2Uoa2V5LCBbdGhpcywga2V5LCBzdWJSZXNvdXJjZUluZm9QdHIsIGZyYW1lSURdKHN0ZDo6 dW5pcXVlX3B0cjxFbnRyeT4gZW50cnkpIHsKLSAgICAgICAgYXV0byBzdWJSZXNvdXJjZUluZm8g PSBzdGQ6OnVuaXF1ZV9wdHI8U3VicmVzb3VyY2VJbmZvPihzdWJSZXNvdXJjZUluZm9QdHIpOwor ICAgIHJldHJpZXZlRW50cnlGcm9tU3RvcmFnZShrZXksIFt0aGlzLCBrZXksIHN1YlJlc291cmNl SW5mbywgZnJhbWVJRF0oc3RkOjp1bmlxdWVfcHRyPEVudHJ5PiBlbnRyeSkgewogICAgICAgICBB U1NFUlQoIW1fcGVuZGluZ1ByZWxvYWRzLmdldChrZXkpKTsKICAgICAgICAgYm9vbCByZW1vdmVk ID0gbV9wZW5kaW5nUHJlbG9hZHMucmVtb3ZlKGtleSk7CiAgICAgICAgIEFTU0VSVF9VTlVTRUQo cmVtb3ZlZCwgcmVtb3ZlZCk7CkBAIC01MTAsNyArNTA4LDcgQEAgdm9pZCBTcGVjdWxhdGl2ZUxv YWRNYW5hZ2VyOjpwcmVsb2FkRW50cnkoY29uc3QgS2V5JiBrZXksIGNvbnN0IFN1YnJlc291cmNl SW5mbyYKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBpZiAoZW50cnktPm5lZWRzVmFs aWRhdGlvbigpKQotICAgICAgICAgICAgcmV2YWxpZGF0ZUVudHJ5KFdURk1vdmUoZW50cnkpLCAq c3ViUmVzb3VyY2VJbmZvLCBmcmFtZUlEKTsKKyAgICAgICAgICAgIHJldmFsaWRhdGVFbnRyeShX VEZNb3ZlKGVudHJ5KSwgc3ViUmVzb3VyY2VJbmZvLCBmcmFtZUlEKTsKICAgICAgICAgZWxzZQog ICAgICAgICAgICAgYWRkUHJlbG9hZGVkRW50cnkoV1RGTW92ZShlbnRyeSksIGZyYW1lSUQpOwog ICAgIH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUv TmV0d29ya0NhY2hlU3RvcmFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9j YWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmNwcAppbmRleCBlYTZlMDk0NGNkZDg4ZjhmYjYyZDQz Y2Q5YTMzZWQ3ZDA3OTUyZWFiLi5kOTFlNjE2MDI5YmM3MWVjZGRlYTgwNjM3ZDIxMjQ2Yjk3N2Yz MDAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3 b3JrQ2FjaGVTdG9yYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9j YWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmNwcApAQCAtODk4LDEwICs4OTgsOCBAQCB2b2lkIFN0 b3JhZ2U6OmNsZWFyKGNvbnN0IFN0cmluZyYgdHlwZSwgc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9j azo6dGltZV9wb2ludCBtbwogICAgICAgICBtX2Jsb2JGaWx0ZXItPmNsZWFyKCk7CiAgICAgbV9h cHByb3hpbWF0ZVJlY29yZHNTaXplID0gMDsKIAotICAgIC8vIEF2b2lkIG5vbi10aHJlYWQgc2Fm ZSBzdGQ6OmZ1bmN0aW9uIGNvcGllcy4KLSAgICBhdXRvKiBjb21wbGV0aW9uSGFuZGxlclB0ciA9 IGNvbXBsZXRpb25IYW5kbGVyID8gbmV3IHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4oV1RGTW92ZShj b21wbGV0aW9uSGFuZGxlcikpIDogbnVsbHB0cjsKICAgICBTdHJpbmdDYXB0dXJlIHR5cGVDYXB0 dXJlKHR5cGUpOwotICAgIGlvUXVldWUoKS5kaXNwYXRjaChbdGhpcywgbW9kaWZpZWRTaW5jZVRp bWUsIGNvbXBsZXRpb25IYW5kbGVyUHRyLCB0eXBlQ2FwdHVyZV0geworICAgIGlvUXVldWUoKS5k aXNwYXRjaChbdGhpcywgbW9kaWZpZWRTaW5jZVRpbWUsIGNvbXBsZXRpb25IYW5kbGVyID0gV1RG TW92ZShjb21wbGV0aW9uSGFuZGxlciksIHR5cGVDYXB0dXJlXSAoKSBtdXRhYmxlIHsKICAgICAg ICAgYXV0byByZWNvcmRzUGF0aCA9IHRoaXMtPnJlY29yZHNQYXRoKCk7CiAgICAgICAgIHRyYXZl cnNlUmVjb3Jkc0ZpbGVzKHJlY29yZHNQYXRoLCB0eXBlQ2FwdHVyZS5zdHJpbmcoKSwgW21vZGlm aWVkU2luY2VUaW1lXShjb25zdCBTdHJpbmcmIGZpbGVOYW1lLCBjb25zdCBTdHJpbmcmIGhhc2hT dHJpbmcsIGNvbnN0IFN0cmluZyYgdHlwZSwgYm9vbCBpc0Jsb2IsIGNvbnN0IFN0cmluZyYgcmVj b3JkRGlyZWN0b3J5UGF0aCkgewogICAgICAgICAgICAgYXV0byBmaWxlUGF0aCA9IFdlYkNvcmU6 OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChyZWNvcmREaXJlY3RvcnlQYXRoLCBmaWxlTmFtZSk7 CkBAIC05MTgsMTAgKzkxNiw5IEBAIHZvaWQgU3RvcmFnZTo6Y2xlYXIoY29uc3QgU3RyaW5nJiB0 eXBlLCBzdGQ6OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjp0aW1lX3BvaW50IG1vCiAgICAgICAgIC8v IFRoaXMgY2xlYW5zIHVucmVmZXJlbmNlZCBibG9icy4KICAgICAgICAgbV9ibG9iU3RvcmFnZS5z eW5jaHJvbml6ZSgpOwogCi0gICAgICAgIGlmIChjb21wbGV0aW9uSGFuZGxlclB0cikgewotICAg ICAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtjb21wbGV0aW9uSGFuZGxlclB0cl0g ewotICAgICAgICAgICAgICAgICgqY29tcGxldGlvbkhhbmRsZXJQdHIpKCk7Ci0gICAgICAgICAg ICAgICAgZGVsZXRlIGNvbXBsZXRpb25IYW5kbGVyUHRyOworICAgICAgICBpZiAoY29tcGxldGlv bkhhbmRsZXIpIHsKKyAgICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbY29tcGxl dGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0geworICAgICAgICAgICAg ICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfQogICAg IH0pOwo=