188922 2018-08-24 11:10:23 -0700 [Curl] Match the interface used in NetworkDataTask and ResourceHandle. 2018-08-24 12:15:16 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 basuke basuke achristensen basuke commit-queue webkit-bug-importer oldest_to_newest 1453494 0 basuke 2018-08-24 11:10:23 -0700 Both uses different set of enum for same meaning. 1453504 1 348028 basuke 2018-08-24 11:29:42 -0700 Created attachment 348028 PATCH 1453505 2 348028 basuke 2018-08-24 11:31:11 -0700 Comment on attachment 348028 PATCH View in context: https://bugs.webkit.org/attachment.cgi?id=348028&action=review > Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h:54 > + ReusedRequest This enum class is the one used in ResourceHandle. This one is more meaningful than ShouldProcess which is just a boolean equivalent. 1453510 3 348028 achristensen 2018-08-24 11:37:32 -0700 Comment on attachment 348028 PATCH This is nice. I think it would be even nicer to remove this new/reused nonsense unless there is a measurable performance improvement to make the code complexity and risk of forgetting to update things worth it. 1453514 4 348028 basuke 2018-08-24 11:48:23 -0700 Comment on attachment 348028 PATCH Thanks for r+. We think about removing this flag. I remember this relate to not only cookie, but diskcache on ResourceHandle. 1453525 5 348028 commit-queue 2018-08-24 12:14:43 -0700 Comment on attachment 348028 PATCH Clearing flags on attachment: 348028 Committed r235326: <https://trac.webkit.org/changeset/235326> 1453526 6 commit-queue 2018-08-24 12:14:45 -0700 All reviewed patches have been landed. Closing bug. 1453527 7 webkit-bug-importer 2018-08-24 12:15:16 -0700 <rdar://problem/43693070> 348028 2018-08-24 11:29:42 -0700 2018-08-24 12:14:43 -0700 PATCH 188922.diff text/plain 4795 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggMTAwZjEyY2U2MDQuLmFkZTQ3OGE1NTBkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDIyIEBACisyMDE4LTA4LTI0ICBCYXN1a2UgU3V6dWtpICA8QmFzdWtlLlN1enVraUBzb255LmNv bT4KKworICAgICAgICBbQ3VybF0gTWF0Y2ggdGhlIGludGVyZmFjZSB1c2VkIGluIE5ldHdvcmtE YXRhVGFzayBhbmQgUmVzb3VyY2VIYW5kbGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xODg5MjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGUgaW50ZXJmYWNlcyBmb3IgTmV0d29ya0RhdGFUYXNrIGFu ZCBSZXNvdXJjZUhhbmRsZSBhcmUgZGl2ZXJnZWQuCisgICAgICAgIEl0IHNob3VsZCBiZSBzYW1l IGZvciB0aGUgc2FtZSBwdXJwb3NlIGJlY2F1c2UgdGhleSBkbyBzYW1lIHRoaW5nLgorCisgICAg ICAgIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2N1 cmwvTmV0d29ya0RhdGFUYXNrQ3VybC5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtEYXRh VGFza0N1cmw6Ok5ldHdvcmtEYXRhVGFza0N1cmwpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3Jr RGF0YVRhc2tDdXJsOjpjcmVhdGVDdXJsUmVxdWVzdCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdv cmtEYXRhVGFza0N1cmw6OndpbGxQZXJmb3JtSFRUUFJlZGlyZWN0aW9uKToKKyAgICAgICAgKFdl YktpdDo6TmV0d29ya0RhdGFUYXNrQ3VybDo6cmVzdGFydFdpdGhDcmVkZW50aWFsKToKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtEYXRhVGFza0N1cmwuaDoKKwogMjAxOC0w OC0yMCAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0NNYWtlXSBTeW5jIHVuaWZpZWQgYnVpbGQgd2l0aCBDb2NvYSBwb3J0cwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtEYXRhVGFza0N1cmwu Y3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtEYXRhVGFza0N1 cmwuY3BwCmluZGV4IDRjZjcwZWM1OWQ4Li5iMDYyM2UzNzMzZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtEYXRhVGFza0N1cmwuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrRGF0YVRhc2tDdXJsLmNw cApAQCAtNjEsNyArNjEsNyBAQCBOZXR3b3JrRGF0YVRhc2tDdXJsOjpOZXR3b3JrRGF0YVRhc2tD dXJsKE5ldHdvcmtTZXNzaW9uJiBzZXNzaW9uLCBOZXR3b3JrRGF0YVRhcwogICAgICAgICB9CiAg ICAgfQogCi0gICAgbV9jdXJsUmVxdWVzdCA9IGNyZWF0ZUN1cmxSZXF1ZXN0KHJlcXVlc3QsIFNo b3VsZFByZXByb2Nlc3M6Olllcyk7CisgICAgbV9jdXJsUmVxdWVzdCA9IGNyZWF0ZUN1cmxSZXF1 ZXN0KHJlcXVlc3QpOwogICAgIGlmICghbV9pbml0aWFsQ3JlZGVudGlhbC5pc0VtcHR5KCkpCiAg ICAgICAgIG1fY3VybFJlcXVlc3QtPnNldFVzZXJQYXNzKG1faW5pdGlhbENyZWRlbnRpYWwudXNl cigpLCBtX2luaXRpYWxDcmVkZW50aWFsLnBhc3N3b3JkKCkpOwogICAgIG1fY3VybFJlcXVlc3Qt PnN0YXJ0KCk7CkBAIC0xMjYsMTEgKzEyNiwxMSBAQCBOZXR3b3JrRGF0YVRhc2s6OlN0YXRlIE5l dHdvcmtEYXRhVGFza0N1cmw6OnN0YXRlKCkgY29uc3QKICAgICByZXR1cm4gbV9zdGF0ZTsKIH0K IAotUmVmPEN1cmxSZXF1ZXN0PiBOZXR3b3JrRGF0YVRhc2tDdXJsOjpjcmVhdGVDdXJsUmVxdWVz dChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFNob3VsZFByZXByb2Nlc3Mgc2hvdWxk UHJlcHJvY2VzcykKK1JlZjxDdXJsUmVxdWVzdD4gTmV0d29ya0RhdGFUYXNrQ3VybDo6Y3JlYXRl Q3VybFJlcXVlc3QoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBSZXF1ZXN0U3RhdHVz IHN0YXR1cykKIHsKICAgICBtX2N1cnJlbnRSZXF1ZXN0ID0gcmVxdWVzdDsKIAotICAgIGlmIChz aG91bGRQcmVwcm9jZXNzID09IFNob3VsZFByZXByb2Nlc3M6OlllcykKKyAgICBpZiAoc3RhdHVz ID09IFJlcXVlc3RTdGF0dXM6Ok5ld1JlcXVlc3QpCiAgICAgICAgIGFwcGVuZENvb2tpZUhlYWRl cihtX2N1cnJlbnRSZXF1ZXN0KTsKIAogICAgIC8vIENyZWF0ZXMgYSBDdXJsUmVxdWVzdCBpbiBz dXNwZW5kZWQgc3RhdGUuCkBAIC0yOTUsNyArMjk1LDcgQEAgdm9pZCBOZXR3b3JrRGF0YVRhc2tD dXJsOjp3aWxsUGVyZm9ybUhUVFBSZWRpcmVjdGlvbigpCiAgICAgICAgIGlmIChtX2N1cmxSZXF1 ZXN0KQogICAgICAgICAgICAgbV9jdXJsUmVxdWVzdC0+Y2FuY2VsKCk7CiAKLSAgICAgICAgbV9j dXJsUmVxdWVzdCA9IGNyZWF0ZUN1cmxSZXF1ZXN0KG5ld1JlcXVlc3QsIFNob3VsZFByZXByb2Nl c3M6Olllcyk7CisgICAgICAgIG1fY3VybFJlcXVlc3QgPSBjcmVhdGVDdXJsUmVxdWVzdChuZXdS ZXF1ZXN0KTsKICAgICAgICAgaWYgKGRpZENoYW5nZUNyZWRlbnRpYWwgJiYgIW1faW5pdGlhbENy ZWRlbnRpYWwuaXNFbXB0eSgpKQogICAgICAgICAgICAgbV9jdXJsUmVxdWVzdC0+c2V0VXNlclBh c3MobV9pbml0aWFsQ3JlZGVudGlhbC51c2VyKCksIG1faW5pdGlhbENyZWRlbnRpYWwucGFzc3dv cmQoKSk7CiAgICAgICAgIG1fY3VybFJlcXVlc3QtPnN0YXJ0KCk7CkBAIC0zNjUsNyArMzY1LDcg QEAgdm9pZCBOZXR3b3JrRGF0YVRhc2tDdXJsOjpyZXN0YXJ0V2l0aENyZWRlbnRpYWwoY29uc3Qg Q3JlZGVudGlhbCYgY3JlZGVudGlhbCkKICAgICBpZiAobV9jdXJsUmVxdWVzdCkKICAgICAgICAg bV9jdXJsUmVxdWVzdC0+Y2FuY2VsKCk7CiAKLSAgICBtX2N1cmxSZXF1ZXN0ID0gY3JlYXRlQ3Vy bFJlcXVlc3QobV9jdXJyZW50UmVxdWVzdCwgU2hvdWxkUHJlcHJvY2Vzczo6Tm8pOworICAgIG1f Y3VybFJlcXVlc3QgPSBjcmVhdGVDdXJsUmVxdWVzdChtX2N1cnJlbnRSZXF1ZXN0LCBSZXF1ZXN0 U3RhdHVzOjpSZXVzZWRSZXF1ZXN0KTsKICAgICBpZiAoIWNyZWRlbnRpYWwuaXNFbXB0eSgpKQog ICAgICAgICBtX2N1cmxSZXF1ZXN0LT5zZXRVc2VyUGFzcyhjcmVkZW50aWFsLnVzZXIoKSwgY3Jl ZGVudGlhbC5wYXNzd29yZCgpKTsKICAgICBtX2N1cmxSZXF1ZXN0LT5zdGFydCgpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtEYXRhVGFza0N1 cmwuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrRGF0YVRhc2tD dXJsLmgKaW5kZXggODQzMmU0Y2JmODAuLmQ5NTVmOWEwODM2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL2N1cmwvTmV0d29ya0RhdGFUYXNrQ3VybC5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrRGF0YVRhc2tDdXJsLmgKQEAg LTQ5LDkgKzQ5LDkgQEAgcHVibGljOgogICAgIHZvaWQgZGVyZWYoKSBvdmVycmlkZSB7IFJlZkNv dW50ZWQ8TmV0d29ya0RhdGFUYXNrPjo6ZGVyZWYoKTsgfQogCiBwcml2YXRlOgotICAgIGVudW0g Y2xhc3MgU2hvdWxkUHJlcHJvY2VzcyA6IGJvb2wgewotICAgICAgICBObyA9IGZhbHNlLAotICAg ICAgICBZZXMgPSB0cnVlCisgICAgZW51bSBjbGFzcyBSZXF1ZXN0U3RhdHVzIHsKKyAgICAgICAg TmV3UmVxdWVzdCwKKyAgICAgICAgUmV1c2VkUmVxdWVzdAogICAgIH07CiAKICAgICBOZXR3b3Jr RGF0YVRhc2tDdXJsKE5ldHdvcmtTZXNzaW9uJiwgTmV0d29ya0RhdGFUYXNrQ2xpZW50JiwgY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQ b2xpY3ksIFdlYkNvcmU6OkNvbnRlbnRTbmlmZmluZ1BvbGljeSwgV2ViQ29yZTo6Q29udGVudEVu Y29kaW5nU25pZmZpbmdQb2xpY3ksIGJvb2wgc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hU VFBSZWRpcmVjdCwgYm9vbCBkYXRhVGFza0lzRm9yTWFpbkZyYW1lTmF2aWdhdGlvbik7CkBAIC02 Miw3ICs2Miw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBpbnZhbGlkYXRlQW5kQ2FuY2VsKCkgb3Zl cnJpZGU7CiAgICAgTmV0d29ya0RhdGFUYXNrOjpTdGF0ZSBzdGF0ZSgpIGNvbnN0IG92ZXJyaWRl OwogCi0gICAgUmVmPFdlYkNvcmU6OkN1cmxSZXF1ZXN0PiBjcmVhdGVDdXJsUmVxdWVzdChjb25z dCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBTaG91bGRQcmVwcm9jZXNzKTsKKyAgICBSZWY8 V2ViQ29yZTo6Q3VybFJlcXVlc3Q+IGNyZWF0ZUN1cmxSZXF1ZXN0KGNvbnN0IFdlYkNvcmU6OlJl c291cmNlUmVxdWVzdCYsIFJlcXVlc3RTdGF0dXMgPSBSZXF1ZXN0U3RhdHVzOjpOZXdSZXF1ZXN0 KTsKICAgICB2b2lkIGN1cmxEaWRTZW5kRGF0YShXZWJDb3JlOjpDdXJsUmVxdWVzdCYsIHVuc2ln bmVkIGxvbmcgbG9uZywgdW5zaWduZWQgbG9uZyBsb25nKSBvdmVycmlkZTsKICAgICB2b2lkIGN1 cmxEaWRSZWNlaXZlUmVzcG9uc2UoV2ViQ29yZTo6Q3VybFJlcXVlc3QmLCBjb25zdCBXZWJDb3Jl OjpDdXJsUmVzcG9uc2UmKSBvdmVycmlkZTsKICAgICB2b2lkIGN1cmxEaWRSZWNlaXZlQnVmZmVy KFdlYkNvcmU6OkN1cmxSZXF1ZXN0JiwgUmVmPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4mJikgb3Zl cnJpZGU7Cg==