116709 2013-05-24 01:13:48 -0700 Improve loader/go-back-cached-main-resource.html test 2013-05-24 10:16:05 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 rego webkit-unassigned ap commit-queue oldest_to_newest 893214 0 rego 2013-05-24 01:13:48 -0700 This bug is to improve the loader/go-back-cached-main-resource.html test with the ideas from the following comment by Alexey Proskuryakov in bug #116670#c2: > (From update of attachment 202708 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=202708&action=review > > Getting rid of the timeout is a very welcome improvement, so r=me. Please consider the suggestion below. > > > LayoutTests/loader/resources/first-page.html:21 > > +<body onpageshow="registerListeners();"> > > This is quite misleading. We only need to register listeners on first load, they are already present when restoring from cache. But the function does more than its name says, which is why it's necessary to call it every time! > > One way to clean this up would be to rename the function to "didShowPage", and use event.persisted property to check if we are handling the initial load. Or just use an anonymous function, and register it as window.onpageshow = function (event) { ... } 893216 1 202782 rego 2013-05-24 01:20:16 -0700 Created attachment 202782 Patch 893340 2 202782 ap 2013-05-24 09:54:33 -0700 Comment on attachment 202782 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=202782&action=review Thank you! > LayoutTests/loader/resources/first-page.html:11 > + if (!event.persisted) { > + // Our opener will tell us to perform various loads. Just for the information, WebKit style is to prefer early returns, not deep indentation. I don't think that it's worth changing for this test, it's an extremely minor point. 893356 3 202782 commit-queue 2013-05-24 10:16:03 -0700 Comment on attachment 202782 Patch Clearing flags on attachment: 202782 Committed r150645: <http://trac.webkit.org/changeset/150645> 893357 4 commit-queue 2013-05-24 10:16:05 -0700 All reviewed patches have been landed. Closing bug. 202782 2013-05-24 01:20:16 -0700 2013-05-24 10:16:03 -0700 Patch bug-116709-20130524101917.patch text/plain 4502 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwNDI3CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjZmNzljZmYzODAxMDZhNmVmMDM0 NTJmYzA0NGZmMmJkZmU1ZDgwNC4uYTQyMTE4MGFhZWUzYWYyYWM0MTM2ZDY5MjY0ZjFlMmRkN2I0 ZTMxZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA1LTI0ICBNYW51ZWwgUmVnbyBDYXNh c25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIEltcHJvdmUgbG9hZGVyL2dvLWJh Y2stY2FjaGVkLW1haW4tcmVzb3VyY2UuaHRtbCB0ZXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTY3MDkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJdCBpcyBvbmx5IG5lZWRlZCB0byByZWdpc3RlciB0 aGUgbGlzdGVuZXJzIG9uIHRoZSBpbml0aWFsIGxvYWQgYXMgdGhleQorICAgICAgICBhcmUgYWxy ZWFkeSBwcmVzZW50IHdoZW4gcmVzdG9yaW5nIGZyb20gcGFnZSBjYWNoZS4gTW9kaWZpZWQgdGhl IHRlc3QgdG8KKyAgICAgICAgdXNlIGV2ZW50LnBlcnNpc3RlZCBwcm9wZXJ0eSB0byBrbm93IGlm IHdlIGFyZSBoYW5kbGluZyB0aGUgZmlyc3QgbG9hZAorICAgICAgICBpbiBvcmRlciB0byByZWdp c3RlciB0aGUgbGlzdGVuZXJzIG9ubHkgb25jZS4KKworICAgICAgICAqIGxvYWRlci9yZXNvdXJj ZXMvZmlyc3QtcGFnZS5odG1sOiBSZW5hbWUgcmVnaXN0ZXJMaXN0ZW5lcnMoKSBmdW5jdGlvbgor ICAgICAgICB0byBhIG1vcmUgYWNjdXJhdGUgbmFtZSBkaWRTaG93UGFnZSgpIGFuZCB1c2UgZXZl bnQucGVyc2lzdGVkIHRvCisgICAgICAgIHJlZ2lzdGVyIHRoZSBsaXN0ZW5lcnMgb25seSBpbiB0 aGUgZmlyc3QgbG9hZC4KKyAgICAgICAgKiBsb2FkZXIvcmVzb3VyY2VzL290aGVyLXBhZ2UuaHRt bDogRGl0dG8uCisKIDIwMTMtMDUtMjMgIE1hbnVlbCBSZWdvIENhc2Fzbm92YXMgIDxyZWdvQGln YWxpYS5jb20+CiAKICAgICAgICAgRml4IGxvYWRlci9nby1iYWNrLWNhY2hlZC1tYWluLXJlc291 cmNlLmh0bWwgdGVzdApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbG9hZGVyL3Jlc291cmNlcy9m aXJzdC1wYWdlLmh0bWwgYi9MYXlvdXRUZXN0cy9sb2FkZXIvcmVzb3VyY2VzL2ZpcnN0LXBhZ2Uu aHRtbAppbmRleCA0ZDJjMmYzMGNhOGQyMjAxMmFmMGZkYTBiNGQwNDI4ZWQxNjIyOTAyLi5mZjVj ZTQ2YTVlMzEzNjIwN2M5YTcyODljYzRkN2ExMTY1MmMxYmQxIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9sb2FkZXIvcmVzb3VyY2VzL2ZpcnN0LXBhZ2UuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9s b2FkZXIvcmVzb3VyY2VzL2ZpcnN0LXBhZ2UuaHRtbApAQCAtMSwyMyArMSwyNyBAQAogPGh0bWw+ CiA8aGVhZD4KICAgICA8c2NyaXB0PgotICAgIGZ1bmN0aW9uIHJlZ2lzdGVyTGlzdGVuZXJzKCkg eworICAgIGZ1bmN0aW9uIGRpZFNob3dQYWdlKCkgewogICAgICAgICAvLyBOb3RpZnkgb3BlbmVy LgogICAgICAgICBvcGVuZXIucG9zdE1lc3NhZ2UoJ2ZpcnN0LXBhZ2UnLCAnKicpOwogCi0gICAg ICAgIC8vIE91ciBvcGVuZXIgd2lsbCB0ZWxsIHVzIHRvIHBlcmZvcm0gdmFyaW91cyBsb2Fkcy4K LSAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ21lc3NhZ2UnLCBmdW5jdGlvbihldmVu dCkgeworICAgICAgICAvLyBXZSByZWdpc3RlciB0aGUgbGlzdGVuZXJzIGluIHRoZSBpbml0aWFs IGxvYWQgKHRoaXMgaXMgbm90IG5lZWRlZAorICAgICAgICAvLyB3aGVuIHRoZSBwYWdlIGlzIHJl c3RvcmVkIGZyb20gY2FjaGUpLgorICAgICAgICBpZiAoIWV2ZW50LnBlcnNpc3RlZCkgeworICAg ICAgICAgICAgLy8gT3VyIG9wZW5lciB3aWxsIHRlbGwgdXMgdG8gcGVyZm9ybSB2YXJpb3VzIGxv YWRzLgorICAgICAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ21lc3NhZ2UnLCBmdW5j dGlvbihldmVudCkgewogCi0gICAgICAgICAgICAvLyBOYXZpZ2F0ZSB0byBvdGhlciBwYWdlLgot ICAgICAgICAgICAgaWYgKGV2ZW50LmRhdGEgPT09ICduYXZpZ2F0ZS1vdGhlci1wYWdlJykgewot ICAgICAgICAgICAgICAgIHdpbmRvdy5sb2NhdGlvbiA9ICdvdGhlci1wYWdlLmh0bWwnOwotICAg ICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAvLyBO YXZpZ2F0ZSB0byBvdGhlciBwYWdlLgorICAgICAgICAgICAgICAgIGlmIChldmVudC5kYXRhID09 PSAnbmF2aWdhdGUtb3RoZXItcGFnZScpIHsKKyAgICAgICAgICAgICAgICAgICAgd2luZG93Lmxv Y2F0aW9uID0gJ290aGVyLXBhZ2UuaHRtbCc7CisgICAgICAgICAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgICAgICAgICB9CiAKLSAgICAgICAgfSwgZmFsc2UpOworICAgICAgICAgICAgfSwg ZmFsc2UpOworICAgICAgICB9CiAgICAgfQogICAgIDwvc2NyaXB0PgogPC9oZWFkPgotPGJvZHkg b25wYWdlc2hvdz0icmVnaXN0ZXJMaXN0ZW5lcnMoKTsiPgorPGJvZHkgb25wYWdlc2hvdz0iZGlk U2hvd1BhZ2UoKTsiPgogPC9ib2R5PgogPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv bG9hZGVyL3Jlc291cmNlcy9vdGhlci1wYWdlLmh0bWwgYi9MYXlvdXRUZXN0cy9sb2FkZXIvcmVz b3VyY2VzL290aGVyLXBhZ2UuaHRtbAppbmRleCBjN2Y3NDZhMWIwMDM4YjAyYmJhOTJmMWJlY2Ri MTAyMWQ3ZDE0ZTZhLi44MjQ3OTVhMjYyNzgyZGExM2JmMzg2MmI3YTU1ZDU0Mzk0OWMwYjYxIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9sb2FkZXIvcmVzb3VyY2VzL290aGVyLXBhZ2UuaHRtbAor KysgYi9MYXlvdXRUZXN0cy9sb2FkZXIvcmVzb3VyY2VzL290aGVyLXBhZ2UuaHRtbApAQCAtMSwy OSArMSwzMyBAQAogPGh0bWw+CiA8aGVhZD4KICAgICA8c2NyaXB0PgotICAgIGZ1bmN0aW9uIHJl Z2lzdGVyTGlzdGVuZXJzKCkgeworICAgIGZ1bmN0aW9uIGRpZFNob3dQYWdlKCkgewogICAgICAg ICAvLyBOb3RpZnkgb3BlbmVyLgogICAgICAgICBvcGVuZXIucG9zdE1lc3NhZ2UoJ290aGVyLXBh Z2UnLCAnKicpOwogCi0gICAgICAgIC8vIE91ciBvcGVuZXIgd2lsbCB0ZWxsIHVzIHRvIHBlcmZv cm0gdmFyaW91cyBsb2Fkcy4KLSAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ21lc3Nh Z2UnLCBmdW5jdGlvbihldmVudCkgeworICAgICAgICAvLyBXZSByZWdpc3RlciB0aGUgbGlzdGVu ZXJzIGluIHRoZSBpbml0aWFsIGxvYWQgKHRoaXMgaXMgbm90IG5lZWRlZAorICAgICAgICAvLyB3 aGVuIHRoZSBwYWdlIGlzIHJlc3RvcmVkIGZyb20gY2FjaGUpLgorICAgICAgICBpZiAoIWV2ZW50 LnBlcnNpc3RlZCkgeworICAgICAgICAgICAgLy8gT3VyIG9wZW5lciB3aWxsIHRlbGwgdXMgdG8g cGVyZm9ybSB2YXJpb3VzIGxvYWRzLgorICAgICAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVu ZXIoJ21lc3NhZ2UnLCBmdW5jdGlvbihldmVudCkgewogCi0gICAgICAgICAgICAvLyBOYXZpZ2F0 ZSBmaXJzdCByZXNvdXJjZS4KLSAgICAgICAgICAgIGlmIChldmVudC5kYXRhID09PSAnbmF2aWdh dGUtZmlyc3QtcGFnZScpIHsKLSAgICAgICAgICAgICAgICB3aW5kb3cubG9jYXRpb24gPSAnZmly c3QtcGFnZS5odG1sJzsKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICB9Cisg ICAgICAgICAgICAgICAgLy8gTmF2aWdhdGUgZmlyc3QgcmVzb3VyY2UuCisgICAgICAgICAgICAg ICAgaWYgKGV2ZW50LmRhdGEgPT09ICduYXZpZ2F0ZS1maXJzdC1wYWdlJykgeworICAgICAgICAg ICAgICAgICAgICB3aW5kb3cubG9jYXRpb24gPSAnZmlyc3QtcGFnZS5odG1sJzsKKyAgICAgICAg ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgLy8g TmF2aWdhdGUgYmFjay4KLSAgICAgICAgICAgIGlmIChldmVudC5kYXRhID09PSAnbmF2aWdhdGUt YmFjaycpIHsKLSAgICAgICAgICAgICAgICB3aW5kb3cuaGlzdG9yeS5iYWNrKCk7Ci0gICAgICAg ICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIC8vIE5hdmln YXRlIGJhY2suCisgICAgICAgICAgICAgICAgaWYgKGV2ZW50LmRhdGEgPT09ICduYXZpZ2F0ZS1i YWNrJykgeworICAgICAgICAgICAgICAgICAgICB3aW5kb3cuaGlzdG9yeS5iYWNrKCk7CisgICAg ICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICB9CiAKLSAgICAgICAgfSwg ZmFsc2UpOworICAgICAgICAgICAgfSwgZmFsc2UpOworICAgICAgICB9CiAgICAgfQogICAgIDwv c2NyaXB0PgogPC9oZWFkPgotPGJvZHkgb25wYWdlc2hvdz0icmVnaXN0ZXJMaXN0ZW5lcnMoKTsi PgorPGJvZHkgb25wYWdlc2hvdz0iZGlkU2hvd1BhZ2UoKTsiPgogPC9ib2R5PgogPC9odG1sPgo=