72873 2011-11-21 04:48:44 -0800 Web Inspector: [Regression] Successfully loaded XHRs are shown as canceled. 2011-11-30 13:09:12 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik abarth apavlov bweinstein japhet joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 506886 0 vsevik 2011-11-21 04:48:44 -0800 Caused by https://bugs.webkit.org/show_bug.cgi?id=71149 508787 1 116513 vsevik 2011-11-24 07:56:05 -0800 Created attachment 116513 Patch 509859 2 116513 japhet 2011-11-28 08:56:29 -0800 Comment on attachment 116513 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116513&action=review > Source/WebCore/loader/SubresourceLoader.cpp:114 > +void SubresourceLoader::cancelCachedResourceLoad() > +{ > + if (m_state != Initialized) > + return; > + > + ResourceLoader::cancel(); > +} Does it break other things to name this cancel() and override ResourceLoader::cancel() ? 512028 3 vsevik 2011-11-30 12:44:23 -0800 (In reply to comment #2) > (From update of attachment 116513 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=116513&action=review > > > Source/WebCore/loader/SubresourceLoader.cpp:114 > > +void SubresourceLoader::cancelCachedResourceLoad() > > +{ > > + if (m_state != Initialized) > > + return; > > + > > + ResourceLoader::cancel(); > > +} > > Does it break other things to name this cancel() and override ResourceLoader::cancel() ? Looks like this can break other cancel scenarios, e.g. like here http://codesearch.google.com/codesearch#OAMlx_jo-ck/src/third_party/WebKit/Source/WebCore/loader/SubresourceLoader.cpp&l=204&type=cs 512038 4 116513 japhet 2011-11-30 12:54:54 -0800 Comment on attachment 116513 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116513&action=review >>> Source/WebCore/loader/SubresourceLoader.cpp:114 >>> +} >> >> Does it break other things to name this cancel() and override ResourceLoader::cancel() ? > > Looks like this can break other cancel scenarios, e.g. like here http://codesearch.google.com/codesearch#OAMlx_jo-ck/src/third_party/WebKit/Source/WebCore/loader/SubresourceLoader.cpp&l=204&type=cs Alright, thanks for checking. I'd slightly prefer a name like "cancelIfNotFinishing", but you can feel free to land without another review so long as it still compiles :) 512058 5 vsevik 2011-11-30 13:09:12 -0800 Committed r101545: <http://trac.webkit.org/changeset/101545> 116513 2011-11-24 07:56:05 -0800 2011-11-30 12:54:54 -0800 Patch bug-72873-20111124195603.patch text/plain 5295 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMTM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGNiYjc0YTc4N2ZiNmYy ZGEzZjE5ZjAyNjRiZTM2YWY2ZDQ4ODM3Zi4uOTBiZjk2NGUxZWRmNDJlMmYxZjNkNjVmMDNjZjI4 Y2ZjNzQyZjBjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDExLTExLTI0ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtSZWdyZXNzaW9uXSBTdWNjZXNzZnVsbHkgbG9hZGVkIFhIUnMgYXJlIHNob3duIGFzIGNh bmNlbGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzI4NzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGxvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdWJyZXNv dXJjZUxvYWRlcjo6Y2FuY2VsQ2FjaGVkUmVzb3VyY2VMb2FkKToKKyAgICAgICAgKiBsb2FkZXIv U3VicmVzb3VyY2VMb2FkZXIuaDoKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmF3UmVz b3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmF3UmVzb3VyY2U6OmFsbENsaWVu dHNSZW1vdmVkKToKKwogMjAxMS0xMS0yNCAgVG9yIEFybmUgVmVzdGLDuCAgPHRvci5hcm5lLnZl c3Rib0Bub2tpYS5jb20+CiAKICAgICAgICAgW1F0XSBHZXQgcmlkIG9mIHRoZSBidWlsZERpckZv clNvdXJjZSgpIGZ1bmN0aW9uIGluIHRoZSBidWlsZCBzeXN0ZW0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IGI1ODk2NjJhNTFiNDAxMDUxZjc5ODg1 NzRiMjk1NjkyMDM0YTVmYmYuLjYwZDk2NGM5YWE1OWM2N2Q1ZDY2NDFhNjVjYzg2MTg2OTE1MzJm OWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcApAQCAt MTA1LDYgKzEwNSwxNCBAQCBQYXNzUmVmUHRyPFN1YnJlc291cmNlTG9hZGVyPiBTdWJyZXNvdXJj ZUxvYWRlcjo6Y3JlYXRlKEZyYW1lKiBmcmFtZSwgQ2FjaGVkUmVzbwogICAgIHJldHVybiBzdWJs b2FkZXIucmVsZWFzZSgpOwogfQogCit2b2lkIFN1YnJlc291cmNlTG9hZGVyOjpjYW5jZWxDYWNo ZWRSZXNvdXJjZUxvYWQoKQoreworICAgIGlmIChtX3N0YXRlICE9IEluaXRpYWxpemVkKQorICAg ICAgICByZXR1cm47CisKKyAgICBSZXNvdXJjZUxvYWRlcjo6Y2FuY2VsKCk7Cit9CisKIGJvb2wg U3VicmVzb3VyY2VMb2FkZXI6OmluaXQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQog ewogICAgIGlmICghUmVzb3VyY2VMb2FkZXI6OmluaXQocmVxdWVzdCkpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuaCBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5oCmluZGV4IGQ3M2MzN2RlOGZhZmE3ZTA1OGJkNzc1 OWY0M2NjYjgxZDEwMzUzNGEuLjJmYTRlZWI1ZDJlYTAwZDBkNGMyNjllZjlmZTRmMzc1ZTk2MWZm YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5oCkBAIC00NCw5 ICs0NCwxMiBAQCBjbGFzcyBTdWJyZXNvdXJjZUxvYWRlciA6IHB1YmxpYyBSZXNvdXJjZUxvYWRl ciB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8U3VicmVzb3VyY2VMb2FkZXI+IGNy ZWF0ZShGcmFtZSosIENhY2hlZFJlc291cmNlKiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgY29u c3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zJik7CiAKKyAgICB2b2lkIGNhbmNlbENhY2hlZFJlc291 cmNlTG9hZCgpOworCiBwcml2YXRlOgogICAgIFN1YnJlc291cmNlTG9hZGVyKEZyYW1lKiwgQ2Fj aGVkUmVzb3VyY2UqLCBjb25zdCBSZXNvdXJjZUxvYWRlck9wdGlvbnMmKTsKICAgICB2aXJ0dWFs IH5TdWJyZXNvdXJjZUxvYWRlcigpOworCiAgICAgdmlydHVhbCBib29sIGluaXQoY29uc3QgUmVz b3VyY2VSZXF1ZXN0Jik7CiAKICAgICB2aXJ0dWFsIHZvaWQgd2lsbFNlbmRSZXF1ZXN0KFJlc291 cmNlUmVxdWVzdCYsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlZGlyZWN0UmVzcG9uc2UpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJhd1Jlc291cmNl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSYXdSZXNvdXJjZS5jcHAK aW5kZXggNWM1NjVmMjdiODQzNTY0ZWM1N2U1ZjFmODM5ODgxNzY3NGQ0MTQ0YS4uMjEwZTUwMjI4 MzJhYTE5ODc4YjcxNDU5YzU2YTU3Zjk2ZDY1NzU5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJhd1Jlc291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmF3UmVzb3VyY2UuY3BwCkBAIC03OSw3ICs3OSw3IEBAIHZv aWQgQ2FjaGVkUmF3UmVzb3VyY2U6OmRpZEFkZENsaWVudChDYWNoZWRSZXNvdXJjZUNsaWVudCog YykKIHZvaWQgQ2FjaGVkUmF3UmVzb3VyY2U6OmFsbENsaWVudHNSZW1vdmVkKCkKIHsKICAgICBp ZiAobV9sb2FkZXIpCi0gICAgICAgIG1fbG9hZGVyLT5jYW5jZWwoKTsKKyAgICAgICAgbV9sb2Fk ZXItPmNhbmNlbENhY2hlZFJlc291cmNlTG9hZCgpOwogfQogCiB2b2lkIENhY2hlZFJhd1Jlc291 cmNlOjp3aWxsU2VuZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBSZXNv dXJjZVJlc3BvbnNlJiByZXNwb25zZSkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkZDc3ODRhOWE2NmUwOTZlYmRlNzhiYjVi ZTkyZmQ5Y2Y0NDk4YzhiLi5lYTBhZWU2MThiN2E2Zjk0MjM3OGNhZjMwMTA4YzkyODRlMmYyMzcz IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMTEtMjQgIFZzZXZvbG9kIFZsYXNvdiAgPHZz ZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogW1JlZ3Jlc3Npb25d IFN1Y2Nlc3NmdWxseSBsb2FkZWQgWEhScyBhcmUgc2hvd24gYXMgY2FuY2VsZWQuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03Mjg3MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC90ZXN0cy9pbnNw ZWN0b3IvbmV0d29yay9uZXR3b3JrLXhoci1hc3luYy5odG1sOgorICAgICAgICAqIGh0dHAvdGVz dHMvaW5zcGVjdG9yL25ldHdvcmsvbmV0d29yay14aHItc3luYy5odG1sOgorCiAyMDExLTExLTIz ICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IGFkZCBpbnRlZ3JhdGlvbiB0ZXN0IGZvciBjb21waWxlciBzb3VyY2UgbWFw cy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsv bmV0d29yay14aHItYXN5bmMuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9y L25ldHdvcmsvbmV0d29yay14aHItYXN5bmMuaHRtbAppbmRleCAzNTYyZTkzNjE3MjQzOWE0ZmZl ODBmYzhkZTUzZjBhODAxZjUwOWVhLi4yMDc4NDYzY2YxZjBjODMxZTlmNDk5ZTZkOGZkZjE0Y2E3 YmU0Nzc5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3 b3JrL25ldHdvcmsteGhyLWFzeW5jLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9p bnNwZWN0b3IvbmV0d29yay9uZXR3b3JrLXhoci1hc3luYy5odG1sCkBAIC0zMSw2ICszMSw3IEBA IGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdChyZXNvdXJj ZTEudXJsKTsKICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoInJlc291cmNlLnR5cGU6 ICIgKyByZXNvdXJjZTEudHlwZSk7CiAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJy ZXNvdXJjZS5jb250ZW50IGJlZm9yZSByZXF1ZXN0aW5nIGNvbnRlbnQ6ICIgKyByZXNvdXJjZTEu Y29udGVudCk7CisgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0VHJ1ZSghcmVzb3VyY2UxLmZh aWxlZCwgIlJlc291cmNlIGxvYWRpbmcgZmFpbGVkLiIpOwogICAgICAgICByZXNvdXJjZTEucmVx dWVzdENvbnRlbnQoc3RlcDMpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3b3JrLXhoci1zeW5jLmh0bWwgYi9MYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmsteGhyLXN5bmMuaHRtbApp bmRleCA5Y2IwZjA0NDM1ZDI0N2I4ODY5MzExNGJhMDU0ZGNhYTgwZWE2YmZiLi5mMjg3NTY2Zjcw ZWM3MzhlYjdhNDg0YTBmODU2MWI0NzkzZmUxZThlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmsteGhyLXN5bmMuaHRtbAorKysgYi9M YXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmsteGhyLXN5bmMu aHRtbApAQCAtMzEsNiArMzEsNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgSW5zcGVjdG9y VGVzdC5hZGRSZXN1bHQocmVzb3VyY2UxLnVybCk7CiAgICAgICAgIEluc3BlY3RvclRlc3QuYWRk UmVzdWx0KCJyZXNvdXJjZS50eXBlOiAiICsgcmVzb3VyY2UxLnR5cGUpOwogICAgICAgICBJbnNw ZWN0b3JUZXN0LmFkZFJlc3VsdCgicmVzb3VyY2UuY29udGVudCBiZWZvcmUgcmVxdWVzdGluZyBj b250ZW50OiAiICsgcmVzb3VyY2UxLmNvbnRlbnQpOworICAgICAgICBJbnNwZWN0b3JUZXN0LmFz c2VydFRydWUoIXJlc291cmNlMS5mYWlsZWQsICJSZXNvdXJjZSBsb2FkaW5nIGZhaWxlZC4iKTsK ICAgICAgICAgcmVzb3VyY2UxLnJlcXVlc3RDb250ZW50KHN0ZXAzKTsKICAgICB9CiAK