171526 2017-05-01 17:14:17 -0700 Simplify Resource Timing handling of cached resource 2017-05-01 18:16:31 -0700 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck joepeck beidson buildbot cdumez commit-queue dbates japhet joepeck youennf oldest_to_newest 1303511 0 joepeck 2017-05-01 17:14:17 -0700 * Summary: Simplify Resource Timing handling of cached resource. The ASSERT and related condition checking should not be necessary inside CachedResourceLoader::requestResource. Removing it allows us to simplify a bit of the code. 1303513 1 308791 joepeck 2017-05-01 17:16:45 -0700 Created attachment 308791 [PATCH] Proposed Fix 1303532 2 308791 commit-queue 2017-05-01 18:16:30 -0700 Comment on attachment 308791 [PATCH] Proposed Fix Clearing flags on attachment: 308791 Committed r216051: <http://trac.webkit.org/changeset/216051> 1303533 3 commit-queue 2017-05-01 18:16:31 -0700 All reviewed patches have been landed. Closing bug. 308791 2017-05-01 17:16:45 -0700 2017-05-01 18:16:30 -0700 [PATCH] Proposed Fix c-1.patch text/plain 4909 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3Njg3ZDBhYTY4ZS4uNWQ0MGYwZGQ4NjUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAxNy0wNS0wMSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUu Y29tPgorCisgICAgICAgIFNpbXBsaWZ5IFJlc291cmNlIFRpbWluZyBoYW5kbGluZyBvZiBjYWNo ZWQgcmVzb3VyY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE3MTUyNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpEb2N1bWVudFRocmVhZGFibGVMb2FkZXI6OmxvYWRSZXF1ZXN0KToKKyAgICAgICAgKiBs b2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3VicmVzb3Vy Y2VMb2FkZXI6OmluaXQpOgorICAgICAgICAoV2ViQ29yZTo6U3VicmVzb3VyY2VMb2FkZXI6OnJl cG9ydFJlc291cmNlVGltaW5nKToKKyAgICAgICAgVXNlIGF1dG8gaW4gUmVzb3VyY2VUaW1pbmcg Y29uc3RydWN0aW9uLgorICAgICAgICBFbGltaW5hdGUgYW4gb3V0ZGF0ZWQgY29tbWVudC4KKwor ICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJlc291cmNlKToKKyAgICAg ICAgV2UgY2FuIGF2b2lkIHRoZSBjaGVja3MgYXJvdW5kIHRoZSByZXF1ZXN0Lm9yaWdpbi4gSXQg c2hvdWxkIGFscmVhZHkKKyAgICAgICAgYmUgdGhlIGNhc2VzIHdlIHdlcmUgY2hlY2tpbmcgYW5k IGFzc2VydGluZyBiZWNhdXNlIG9mIGxvZ2luIGluCisgICAgICAgIENhY2hlZFJlc291cmNlTG9h ZGVyOjpwcmVwYXJlRmV0Y2guCisKIDIwMTctMDUtMDEgIEplciBOb2JsZSAgPGplci5ub2JsZUBh cHBsZS5jb20+CiAKICAgICAgICAgVXNlIEFWQXVkaW9TZXNzaW9uIHRvIGVudW1lcmF0ZSBhdWRp byBjYXB0dXJlIGRldmljZXMgb24gaU9TCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9E b2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3BwCmluZGV4IDM0ZWE1YWY5NTgyLi41YTBiZjQxN2Y5 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxv YWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxv YWRlci5jcHAKQEAgLTUwNCw3ICs1MDQsNyBAQCB2b2lkIERvY3VtZW50VGhyZWFkYWJsZUxvYWRl cjo6bG9hZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgU2VjdXJpdHlDaAogCiAj aWYgRU5BQkxFKFdFQl9USU1JTkcpCiAgICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNo YXJlZEZlYXR1cmVzKCkucmVzb3VyY2VUaW1pbmdFbmFibGVkKCkpIHsKLSAgICAgICAgUmVzb3Vy Y2VUaW1pbmcgcmVzb3VyY2VUaW1pbmcgPSBSZXNvdXJjZVRpbWluZzo6ZnJvbVN5bmNocm9ub3Vz TG9hZChyZXF1ZXN0VVJMLCBtX29wdGlvbnMuaW5pdGlhdG9yLCBsb2FkVGltaW5nLCByZXNwb25z ZS5kZXByZWNhdGVkTmV0d29ya0xvYWRNZXRyaWNzKCksIHJlc3BvbnNlLCBzZWN1cml0eU9yaWdp bigpKTsKKyAgICAgICAgYXV0byByZXNvdXJjZVRpbWluZyA9IFJlc291cmNlVGltaW5nOjpmcm9t U3luY2hyb25vdXNMb2FkKHJlcXVlc3RVUkwsIG1fb3B0aW9ucy5pbml0aWF0b3IsIGxvYWRUaW1p bmcsIHJlc3BvbnNlLmRlcHJlY2F0ZWROZXR3b3JrTG9hZE1ldHJpY3MoKSwgcmVzcG9uc2UsIHNl Y3VyaXR5T3JpZ2luKCkpOwogICAgICAgICBpZiAob3B0aW9ucygpLmluaXRpYXRvckNvbnRleHQg PT0gSW5pdGlhdG9yQ29udGV4dDo6V29ya2VyKQogICAgICAgICAgICAgZmluaXNoZWRUaW1pbmdG b3JXb3JrZXJMb2FkKHJlc291cmNlVGltaW5nKTsKICAgICAgICAgZWxzZSB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcAppbmRleCAyNzViMDZhNTQyMi4uNzdi MTIxMTE3ZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxv YWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNw cApAQCAtMTUzLDkgKzE1Myw2IEBAIGJvb2wgU3VicmVzb3VyY2VMb2FkZXI6OmluaXQoY29uc3Qg UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQogICAgIG1fc3RhdGUgPSBJbml0aWFsaXplZDsKICAg ICBtX2RvY3VtZW50TG9hZGVyLT5hZGRTdWJyZXNvdXJjZUxvYWRlcih0aGlzKTsKIAotICAgIC8v IEZJWE1FOiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1NjMzLgot ICAgIC8vIFN1YnJlc291cmNlTG9hZGVyIGNvdWxkIHVzZSB0aGUgZG9jdW1lbnQgb3JpZ2luIGFz IGEgZGVmYXVsdCBhbmQgc2V0IFBvdGVudGlhbGx5Q3Jvc3NPcmlnaW5FbmFibGVkIHJlcXVlc3Rz IGFjY29yZGluZ2x5LgotICAgIC8vIFRoaXMgd291bGQgc2ltcGxpZnkgcmVzb3VyY2UgbG9hZGVy IHVzZXJzIGFzIHRoZXkgd291bGQgb25seSBuZWVkIHRvIHNldCBmZXRjaCBtb2RlIHRvIENvcnMu CiAgICAgbV9vcmlnaW4gPSBtX3Jlc291cmNlLT5vcmlnaW4oKTsKIAogICAgIHJldHVybiB0cnVl OwpAQCAtNjk4LDcgKzY5NSw3IEBAIHZvaWQgU3VicmVzb3VyY2VMb2FkZXI6OnJlcG9ydFJlc291 cmNlVGltaW5nKGNvbnN0IE5ldHdvcmtMb2FkTWV0cmljcyYgbmV0d29ya0xvCiAgICAgICAgIHJl dHVybjsKIAogICAgIFNlY3VyaXR5T3JpZ2luJiBvcmlnaW4gPSBtX29yaWdpbiA/ICptX29yaWdp biA6IGRvY3VtZW50LT5zZWN1cml0eU9yaWdpbigpOwotICAgIFJlc291cmNlVGltaW5nIHJlc291 cmNlVGltaW5nID0gUmVzb3VyY2VUaW1pbmc6OmZyb21Mb2FkKCptX3Jlc291cmNlLCBtX3Jlc291 cmNlLT5pbml0aWF0b3JOYW1lKCksIG1fbG9hZFRpbWluZywgbmV0d29ya0xvYWRNZXRyaWNzLCBv cmlnaW4pOworICAgIGF1dG8gcmVzb3VyY2VUaW1pbmcgPSBSZXNvdXJjZVRpbWluZzo6ZnJvbUxv YWQoKm1fcmVzb3VyY2UsIG1fcmVzb3VyY2UtPmluaXRpYXRvck5hbWUoKSwgbV9sb2FkVGltaW5n LCBuZXR3b3JrTG9hZE1ldHJpY3MsIG9yaWdpbik7CiAKICAgICAvLyBXb3JrZXIgcmVzb3VyY2Vz IGxvYWRlZCBoZXJlIGFyZSBhbGwgQ2FjaGVkUmF3UmVzb3VyY2VzIGxvYWRlZCB0aHJvdWdoIFdv cmtlclRocmVhZGFibGVMb2FkZXIuCiAgICAgLy8gUGFzcyB0aGUgUmVzb3VyY2VUaW1pbmcgaW5m b3JtYXRpb24gb24gc28gdGhhdCBXb3JrZXJUaHJlYWRhYmxlTG9hZGVyIG1heSBhZGQgdGhlbSB0 byB0aGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNv dXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3Vy Y2VMb2FkZXIuY3BwCmluZGV4IGVmZGNhMjRkYjhhLi5mNTRkMDQxZjdkMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCkBA IC03NzcsMTAgKzc3Nyw4IEBAIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFJlc291cmNlPiBD YWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJlc291cmNlKENhY2hlCiAgICAgICAgICAgICBs b2FkVGltaW5nLnNldFJlc3BvbnNlRW5kKE1vbm90b25pY1RpbWU6Om5vdygpKTsKIAogICAgICAg ICAgICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkucmVzb3Vy Y2VUaW1pbmdFbmFibGVkKCkgJiYgZG9jdW1lbnQoKSAmJiAhcmVzb3VyY2UtPmlzTG9hZGluZygp KSB7Ci0gICAgICAgICAgICAgICAgY29uc3QgU2VjdXJpdHlPcmlnaW4mIG9yaWdpbiA9IHJlcXVl c3Qub3JpZ2luKCkgPyAqcmVxdWVzdC5vcmlnaW4oKSA6IGRvY3VtZW50KCktPnNlY3VyaXR5T3Jp Z2luKCk7Ci0gICAgICAgICAgICAgICAgUmVzb3VyY2VUaW1pbmcgcmVzb3VyY2VUaW1pbmcgPSBS ZXNvdXJjZVRpbWluZzo6ZnJvbUNhY2hlKHVybCwgcmVxdWVzdC5pbml0aWF0b3JOYW1lKCksIGxv YWRUaW1pbmcsIHJlc291cmNlLT5yZXNwb25zZSgpLCBvcmlnaW4pOworICAgICAgICAgICAgICAg IGF1dG8gcmVzb3VyY2VUaW1pbmcgPSBSZXNvdXJjZVRpbWluZzo6ZnJvbUNhY2hlKHVybCwgcmVx dWVzdC5pbml0aWF0b3JOYW1lKCksIGxvYWRUaW1pbmcsIHJlc291cmNlLT5yZXNwb25zZSgpLCAq cmVxdWVzdC5vcmlnaW4oKSk7CiAgICAgICAgICAgICAgICAgaWYgKGluaXRpYXRvckNvbnRleHQg PT0gSW5pdGlhdG9yQ29udGV4dDo6V29ya2VyKSB7Ci0gICAgICAgICAgICAgICAgICAgIEFTU0VS VChyZXF1ZXN0Lm9yaWdpbigpKTsKICAgICAgICAgICAgICAgICAgICAgQVNTRVJUKGlzPENhY2hl ZFJhd1Jlc291cmNlPihyZXNvdXJjZS5nZXQoKSkpOwogICAgICAgICAgICAgICAgICAgICBkb3du Y2FzdDxDYWNoZWRSYXdSZXNvdXJjZT4ocmVzb3VyY2UuZ2V0KCkpLT5maW5pc2hlZFRpbWluZ0Zv cldvcmtlckxvYWQoV1RGTW92ZShyZXNvdXJjZVRpbWluZykpOwogICAgICAgICAgICAgICAgIH0g ZWxzZSB7Cg==