152467 2015-12-20 11:46:18 -0800 Factor NetworkResourceLoader code for storing a cache entry into a function 2015-12-21 12:02:25 -0800 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned achristensen beidson cdumez oldest_to_newest 1150652 0 koivisto 2015-12-20 11:46:18 -0800 Cleanup 1150654 1 267722 koivisto 2015-12-20 11:57:56 -0800 Created attachment 267722 patch 1150772 2 267722 kling 2015-12-21 11:10:58 -0800 Comment on attachment 267722 patch r=me 1150781 3 koivisto 2015-12-21 12:02:25 -0800 https://trac.webkit.org/r194338 267722 2015-12-20 11:57:56 -0800 2015-12-21 11:10:58 -0800 patch cache-store-refactor.patch text/plain 5414 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NDMxOSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE1LTEyLTIwICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBGYWN0b3IgTmV0d29ya1Jlc291 cmNlTG9hZGVyIGNvZGUgZm9yIHN0b3JpbmcgYSBjYWNoZSBlbnRyeSBpbnRvIGEgZnVuY3Rpb24K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjQ2Nwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0 d29ya1Jlc291cmNlTG9hZGVyOjpkaWRGaW5pc2hMb2FkaW5nKToKKworICAgICAgICAgICAgSGF2 aW5nIG1fY2FjaGVFbnRyeUZvclZhbGlkYXRpb24gYWxyZWFkeSBpbXBsaWVzIGNhblVzZUNhY2hl KCkgc28gcmVtb3ZlIHRoZSB0ZXN0IGZyb20gdGhpcyBwYXRoLgorICAgICAgICAgICAgTW92ZSBz dG9yaW5nIHRvIHRoZSBlbmQgb2YgdGhlIGZ1bmN0aW9uIHNvIHdlIGRvbid0IGRlbGF5IERpZEZp bmlzaFJlc291cmNlTG9hZCBtZXNzYWdlIG9uIGl0LgorCisgICAgICAgIChXZWJLaXQ6Ok5ldHdv cmtSZXNvdXJjZUxvYWRlcjo6c2VuZEJ1ZmZlck1heWJlQWJvcnRpbmcpOgorICAgICAgICAoV2Vi S2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnRyeVN0b3JlQXNDYWNoZUVudHJ5KToKKworICAg ICAgICAgICAgRmFjdG9yIHRvIGEgZnVuY3Rpb24uCisgICAgICAgICAgICBSZW1vdmUgbV9yZXNw b25zZS5pc0hUVFAoKSB0ZXN0IGFzIGl0IGlzIGNvdmVyZWQgYnkgTmV0d29ya0NhY2hlOjpzdG9y ZSgpLgorICAgICAgICAgICAgUmVtb3ZlICFpc1ByaXZhdGVTZXNzaW9uIHRlc3QgYXMgaXQgaXMg Y292ZXJlZCBieSBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmNhblVzZUNhY2hlKCkuCisKKyAgICAg ICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpkaWRSZXRyaWV2ZUNhY2hlRW50cnkp OgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5oOgorCiAy MDE1LTEyLTE5ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgW01h Y10gV2ViS2l0IGNvbnRhaW5zIGRlYWQgc291cmNlIGNvZGUgZm9yIE9TIFggTWF2ZXJpY2tzIGFu ZCBlYXJsaWVyCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVz b3VyY2VMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9j ZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAJKHJldmlzaW9uIDE5NDMxOSkKKysrIFNvdXJj ZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTMyNCwyOSArMzI0LDEyIEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVy OjpkaWRSZWNlaXZlQnUKIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpkaWRGaW5pc2hMb2Fk aW5nKGRvdWJsZSBmaW5pc2hUaW1lKQogewogI2lmIEVOQUJMRShORVRXT1JLX0NBQ0hFKQotICAg IGlmIChjYW5Vc2VDYWNoZShtX25ldHdvcmtMb2FkLT5jdXJyZW50UmVxdWVzdCgpKSkgewotICAg ICAgICBpZiAobV9jYWNoZUVudHJ5Rm9yVmFsaWRhdGlvbikgewotICAgICAgICAgICAgLy8gMzA0 IE5vdCBNb2RpZmllZAotICAgICAgICAgICAgQVNTRVJUKG1fcmVzcG9uc2UuaHR0cFN0YXR1c0Nv ZGUoKSA9PSAzMDQpOwotICAgICAgICAgICAgTE9HKE5ldHdvcmtDYWNoZSwgIihOZXR3b3JrUHJv Y2VzcykgcmV2YWxpZGF0ZWQiKTsKLSAgICAgICAgICAgIGRpZFJldHJpZXZlQ2FjaGVFbnRyeShX VEY6Om1vdmUobV9jYWNoZUVudHJ5Rm9yVmFsaWRhdGlvbikpOwotICAgICAgICAgICAgcmV0dXJu OwotICAgICAgICB9Ci0KLSAgICAgICAgYm9vbCBpc1ByaXZhdGVTZXNzaW9uID0gc2Vzc2lvbklE KCkuaXNFcGhlbWVyYWwoKTsKLSAgICAgICAgaWYgKG1fYnVmZmVyZWREYXRhRm9yQ2FjaGUgJiYg bV9yZXNwb25zZS5pc0hUVFAoKSAmJiAhaXNQcml2YXRlU2Vzc2lvbikgewotICAgICAgICAgICAg Ly8gS2VlcCB0aGUgY29ubmVjdGlvbiBhbGl2ZS4KLSAgICAgICAgICAgIFJlZlB0cjxOZXR3b3Jr Q29ubmVjdGlvblRvV2ViUHJvY2Vzcz4gY29ubmVjdGlvbigmY29ubmVjdGlvblRvV2ViUHJvY2Vz cygpKTsKLSAgICAgICAgICAgIFJlZlB0cjxOZXR3b3JrUmVzb3VyY2VMb2FkZXI+IGxvYWRlcih0 aGlzKTsKLSAgICAgICAgICAgIE5ldHdvcmtDYWNoZTo6c2luZ2xldG9uKCkuc3RvcmUobV9uZXR3 b3JrTG9hZC0+Y3VycmVudFJlcXVlc3QoKSwgbV9yZXNwb25zZSwgV1RGOjptb3ZlKG1fYnVmZmVy ZWREYXRhRm9yQ2FjaGUpLCBbbG9hZGVyLCBjb25uZWN0aW9uXShOZXR3b3JrQ2FjaGU6Ok1hcHBl ZEJvZHkmIG1hcHBlZEJvZHkpIHsKLSNpZiBFTkFCTEUoU0hBUkVBQkxFX1JFU09VUkNFKQotICAg ICAgICAgICAgICAgIGlmIChtYXBwZWRCb2R5LnNoYXJlYWJsZVJlc291cmNlSGFuZGxlLmlzTnVs bCgpKQotICAgICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICAgICAgTE9HKE5l dHdvcmtDYWNoZSwgIihOZXR3b3JrUHJvY2Vzcykgc2VuZGluZyBEaWRDYWNoZVJlc291cmNlIik7 Ci0gICAgICAgICAgICAgICAgbG9hZGVyLT5zZW5kKE1lc3NhZ2VzOjpOZXR3b3JrUHJvY2Vzc0Nv bm5lY3Rpb246OkRpZENhY2hlUmVzb3VyY2UobG9hZGVyLT5vcmlnaW5hbFJlcXVlc3QoKSwgbWFw cGVkQm9keS5zaGFyZWFibGVSZXNvdXJjZUhhbmRsZSwgbG9hZGVyLT5zZXNzaW9uSUQoKSkpOwot I2VuZGlmCi0gICAgICAgICAgICB9KTsKLSAgICAgICAgfQorICAgIGlmIChtX2NhY2hlRW50cnlG b3JWYWxpZGF0aW9uKSB7CisgICAgICAgIC8vIDMwNCBOb3QgTW9kaWZpZWQKKyAgICAgICAgQVNT RVJUKG1fcmVzcG9uc2UuaHR0cFN0YXR1c0NvZGUoKSA9PSAzMDQpOworICAgICAgICBMT0coTmV0 d29ya0NhY2hlLCAiKE5ldHdvcmtQcm9jZXNzKSByZXZhbGlkYXRlZCIpOworICAgICAgICBkaWRS ZXRyaWV2ZUNhY2hlRW50cnkoV1RGOjptb3ZlKG1fY2FjaGVFbnRyeUZvclZhbGlkYXRpb24pKTsK KyAgICAgICAgcmV0dXJuOwogICAgIH0KICNlbmRpZgogCkBAIC0zNjIsNiArMzQ1LDEwIEBAIHZv aWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpkaWRGaW5pc2hMb2EKICAgICAgICAgc2VuZChNZXNz YWdlczo6V2ViUmVzb3VyY2VMb2FkZXI6OkRpZEZpbmlzaFJlc291cmNlTG9hZChmaW5pc2hUaW1l KSk7CiAgICAgfQogCisjaWYgRU5BQkxFKE5FVFdPUktfQ0FDSEUpCisgICAgdHJ5U3RvcmVBc0Nh Y2hlRW50cnkoKTsKKyNlbmRpZgorCiAgICAgY2xlYW51cCgpOwogfQogCkBAIC00ODMsNiArNDcw LDI2IEBAIGJvb2wgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpzZW5kQnVmZmVyTWEKIH0KIAogI2lm IEVOQUJMRShORVRXT1JLX0NBQ0hFKQordm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnRyeVN0 b3JlQXNDYWNoZUVudHJ5KCkKK3sKKyAgICBpZiAoIWNhblVzZUNhY2hlKG1fbmV0d29ya0xvYWQt PmN1cnJlbnRSZXF1ZXN0KCkpKQorICAgICAgICByZXR1cm47CisgICAgaWYgKCFtX2J1ZmZlcmVk RGF0YUZvckNhY2hlKQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBLZWVwIHRoZSBjb25uZWN0 aW9uIGFsaXZlLgorICAgIFJlZlB0cjxOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcz4gY29u bmVjdGlvbigmY29ubmVjdGlvblRvV2ViUHJvY2VzcygpKTsKKyAgICBSZWZQdHI8TmV0d29ya1Jl c291cmNlTG9hZGVyPiBsb2FkZXIodGhpcyk7CisgICAgTmV0d29ya0NhY2hlOjpzaW5nbGV0b24o KS5zdG9yZShtX25ldHdvcmtMb2FkLT5jdXJyZW50UmVxdWVzdCgpLCBtX3Jlc3BvbnNlLCBXVEY6 Om1vdmUobV9idWZmZXJlZERhdGFGb3JDYWNoZSksIFtsb2FkZXIsIGNvbm5lY3Rpb25dKE5ldHdv cmtDYWNoZTo6TWFwcGVkQm9keSYgbWFwcGVkQm9keSkgeworI2lmIEVOQUJMRShTSEFSRUFCTEVf UkVTT1VSQ0UpCisgICAgICAgIGlmIChtYXBwZWRCb2R5LnNoYXJlYWJsZVJlc291cmNlSGFuZGxl LmlzTnVsbCgpKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBMT0coTmV0d29ya0NhY2hl LCAiKE5ldHdvcmtQcm9jZXNzKSBzZW5kaW5nIERpZENhY2hlUmVzb3VyY2UiKTsKKyAgICAgICAg bG9hZGVyLT5zZW5kKE1lc3NhZ2VzOjpOZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb246OkRpZENhY2hl UmVzb3VyY2UobG9hZGVyLT5vcmlnaW5hbFJlcXVlc3QoKSwgbWFwcGVkQm9keS5zaGFyZWFibGVS ZXNvdXJjZUhhbmRsZSwgbG9hZGVyLT5zZXNzaW9uSUQoKSkpOworI2VuZGlmCisgICAgfSk7Cit9 CisKIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpkaWRSZXRyaWV2ZUNhY2hlRW50cnkoc3Rk Ojp1bmlxdWVfcHRyPE5ldHdvcmtDYWNoZTo6RW50cnk+IGVudHJ5KQogewogICAgIGlmIChpc1N5 bmNocm9ub3VzKCkpIHsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdv cmtSZXNvdXJjZUxvYWRlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQ cm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5oCShyZXZpc2lvbiAxOTQzMTkpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaAkod29ya2lu ZyBjb3B5KQpAQCAtMTE2LDYgKzExNiw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB1aW50NjRf dCBtZXNzYWdlU2VuZGVyRGVzdGluYXRpb25JRCgpIG92ZXJyaWRlIHsgcmV0dXJuIG1fcGFyYW1l dGVycy5pZGVudGlmaWVyOyB9CiAKICNpZiBFTkFCTEUoTkVUV09SS19DQUNIRSkKKyAgICB2b2lk IHRyeVN0b3JlQXNDYWNoZUVudHJ5KCk7CiAgICAgdm9pZCByZXRyaWV2ZUNhY2hlRW50cnkoY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Jik7CiAgICAgdm9pZCBkaWRSZXRyaWV2ZUNhY2hl RW50cnkoc3RkOjp1bmlxdWVfcHRyPE5ldHdvcmtDYWNoZTo6RW50cnk+KTsKICAgICB2b2lkIHZh bGlkYXRlQ2FjaGVFbnRyeShzdGQ6OnVuaXF1ZV9wdHI8TmV0d29ya0NhY2hlOjpFbnRyeT4pOwo=