116119 2013-05-14 12:43:45 -0700 We should clear mainResource in DocumentLoader::cancelMainResourceLoad. 2013-05-15 14:50:44 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 yongjun_zhang yongjun_zhang ap beidson commit-queue ddkilzer japhet joepeck koivisto oldest_to_newest 888983 0 yongjun_zhang 2013-05-14 12:43:45 -0700 MainResourceLoader::clearResource() fell out when refactoring MainResourceLoader.cpp in http://trac.webkit.org/changeset/146239 for no apparent reasons. We should bring it back. 888984 1 yongjun_zhang 2013-05-14 12:44:48 -0700 <rdar://problem/13869068> 889391 2 201855 yongjun_zhang 2013-05-15 10:33:24 -0700 Created attachment 201855 clear m_mainResource in cancelMainResourceLoad. 889536 3 201855 commit-queue 2013-05-15 14:50:41 -0700 Comment on attachment 201855 clear m_mainResource in cancelMainResourceLoad. Clearing flags on attachment: 201855 Committed r150150: <http://trac.webkit.org/changeset/150150> 889537 4 commit-queue 2013-05-15 14:50:44 -0700 All reviewed patches have been landed. Closing bug. 201855 2013-05-15 10:33:24 -0700 2013-05-15 14:50:41 -0700 clear m_mainResource in cancelMainResourceLoad. clearMainResource.patch text/plain 3468 yongjun_zhang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MDEyNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDEzLTA1LTE1ICBZb25nanVu IFpoYW5nICA8eW9uZ2p1bl96aGFuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgV2Ugc2hvdWxkIGNs ZWFyIG1haW5SZXNvdXJjZSBpbiBEb2N1bWVudExvYWRlcjo6Y2FuY2VsTWFpblJlc291cmNlTG9h ZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNjEx OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1haW5S ZXNvdXJjZUxvYWRlcjo6Y2xlYXJSZXNvdXJjZSgpIHdhcyBsZWZ0IG91dCBpbiByMTQ2MjM5IHdo ZW4gbW92aW5nIE1haW5SZXNvdXJjZUxvYWRlcjo6Y2FuY2VsKCkKKyAgICAgICAgdG8gRG9jdW1l bnRMb2FkZXI6OmNhbmNlbE1haW5SZXNvdXJjZUxvYWQoKSwgd2UgbmVlZCB0byBhZGQgaXQgYmFj ayB0byBtYWtlIHN1cmUgbV9tYWluUmVzb3VyY2UgaXMKKyAgICAgICAgY2xlYXJlZCB3aGVuIHdl IGNhbmNlbCB0aGUgbG9hZGVyLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBuZWVkZWQuCisKKyAg ICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9j dW1lbnRMb2FkZXI6On5Eb2N1bWVudExvYWRlcik6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVu dExvYWRlcjo6Y29udGludWVBZnRlck5hdmlnYXRpb25Qb2xpY3kpOgorICAgICAgICAoV2ViQ29y ZTo6RG9jdW1lbnRMb2FkZXI6OmNhbmNlbE1haW5SZXNvdXJjZUxvYWQpOgorICAgICAgICAoV2Vi Q29yZTo6RG9jdW1lbnRMb2FkZXI6OmNsZWFyTWFpblJlc291cmNlKToKKyAgICAgICAgKFdlYkNv cmUpOgorICAgICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5oOiBhZGQgaGVscGVyIG1ldGhv ZCBjbGVhck1haW5SZXNvdXJjZSgpCisgICAgICAgIChEb2N1bWVudExvYWRlcik6CisKIDIwMTMt MDUtMTUgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdIENo YW5nZSBDbGlwYm9hcmQ6OmNyZWF0ZSBmdW5jdGlvbnMgc28gdGhleSBkb24ndCB1c2UgQ2xpcGJv YXJkTWFjOjpjcmVhdGUgYW55IG1vcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1 bWVudExvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3Vt ZW50TG9hZGVyLmNwcAkocmV2aXNpb24gMTUwMTIyKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVy L0RvY3VtZW50TG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQzLDEwICsxNDMsNyBAQCBE b2N1bWVudExvYWRlcjo6fkRvY3VtZW50TG9hZGVyKCkKICAgICAgICAgbV9pY29uRGF0YUNhbGxi YWNrLT5pbnZhbGlkYXRlKCk7CiAgICAgbV9jYWNoZWRSZXNvdXJjZUxvYWRlci0+Y2xlYXJEb2N1 bWVudExvYWRlcigpOwogICAgIAotICAgIGlmIChtX21haW5SZXNvdXJjZSkgewotICAgICAgICBt X21haW5SZXNvdXJjZS0+cmVtb3ZlQ2xpZW50KHRoaXMpOwotICAgICAgICBtX21haW5SZXNvdXJj ZSA9IDA7Ci0gICAgfQorICAgIGNsZWFyTWFpblJlc291cmNlKCk7CiB9CiAKIFBhc3NSZWZQdHI8 UmVzb3VyY2VCdWZmZXI+IERvY3VtZW50TG9hZGVyOjptYWluUmVzb3VyY2VEYXRhKCkgY29uc3QK QEAgLTU0NiwxMCArNTQzLDcgQEAgdm9pZCBEb2N1bWVudExvYWRlcjo6Y29udGludWVBZnRlck5h dmlnYQogICAgICAgICBSZWZQdHI8UmVzb3VyY2VMb2FkZXI+IHJlc291cmNlTG9hZGVyID0gbWFp blJlc291cmNlTG9hZGVyKCk7CiAgICAgICAgIEFTU0VSVChyZXNvdXJjZUxvYWRlci0+c2hvdWxk U2VuZFJlc291cmNlTG9hZENhbGxiYWNrcygpKTsKICAgICAgICAgcmVzb3VyY2VMb2FkZXItPnNl dFNlbmRDYWxsYmFja1BvbGljeShEb05vdFNlbmRDYWxsYmFja3MpOwotICAgICAgICBpZiAobV9t YWluUmVzb3VyY2UpIHsKLSAgICAgICAgICAgIG1fbWFpblJlc291cmNlLT5yZW1vdmVDbGllbnQo dGhpcyk7Ci0gICAgICAgICAgICBtX21haW5SZXNvdXJjZSA9IDA7Ci0gICAgICAgIH0KKyAgICAg ICAgY2xlYXJNYWluUmVzb3VyY2UoKTsKICAgICAgICAgcmVzb3VyY2VMb2FkZXItPnNldFNlbmRD YWxsYmFja1BvbGljeShTZW5kQ2FsbGJhY2tzKTsKICAgICAgICAgaGFuZGxlU3Vic3RpdHV0ZURh dGFMb2FkU29vbigpOwogICAgIH0KQEAgLTE0MDksOSArMTQwMywxOSBAQCB2b2lkIERvY3VtZW50 TG9hZGVyOjpjYW5jZWxNYWluUmVzb3VyY2VMCiAgICAgaWYgKG1haW5SZXNvdXJjZUxvYWRlcigp KQogICAgICAgICBtYWluUmVzb3VyY2VMb2FkZXIoKS0+Y2FuY2VsKGVycm9yKTsKIAorICAgIGNs ZWFyTWFpblJlc291cmNlKCk7CisKICAgICBtYWluUmVjZWl2ZWRFcnJvcihlcnJvcik7CiB9CiAK K3ZvaWQgRG9jdW1lbnRMb2FkZXI6OmNsZWFyTWFpblJlc291cmNlKCkKK3sKKyAgICBpZiAobV9t YWluUmVzb3VyY2UpIHsKKyAgICAgICAgbV9tYWluUmVzb3VyY2UtPnJlbW92ZUNsaWVudCh0aGlz KTsKKyAgICAgICAgbV9tYWluUmVzb3VyY2UgPSAwOworICAgIH0KK30KKwogdm9pZCBEb2N1bWVu dExvYWRlcjo6c3VicmVzb3VyY2VMb2FkZXJGaW5pc2hlZExvYWRpbmdPbmVQYXJ0KFJlc291cmNl TG9hZGVyKiBsb2FkZXIpCiB7CiAgICAgbV9tdWx0aXBhcnRTdWJyZXNvdXJjZUxvYWRlcnMuYWRk KGxvYWRlcik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAkocmV2 aXNpb24gMTUwMTIyKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmgJ KHdvcmtpbmcgY29weSkKQEAgLTMwOCw3ICszMDgsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK ICAgICAgICAgdm9pZCBkZWxpdmVyU3Vic3RpdHV0ZVJlc291cmNlc0FmdGVyRGVsYXkoKTsKICAg ICAgICAgdm9pZCBzdWJzdGl0dXRlUmVzb3VyY2VEZWxpdmVyeVRpbWVyRmlyZWQoVGltZXI8RG9j dW1lbnRMb2FkZXI+Kik7Ci0gICAgICAgICAgICAgICAgCisKKyAgICAgICAgdm9pZCBjbGVhck1h aW5SZXNvdXJjZSgpOworCiAgICAgICAgIEZyYW1lKiBtX2ZyYW1lOwogICAgICAgICBSZWZQdHI8 Q2FjaGVkUmVzb3VyY2VMb2FkZXI+IG1fY2FjaGVkUmVzb3VyY2VMb2FkZXI7CiAK