115268 2013-04-26 11:14:49 -0700 [WK2] Remove NetworkResourceLoader::cleanupOnMainThread 2013-04-26 11:39:45 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap oldest_to_newest 881970 0 ap 2013-04-26 11:14:49 -0700 All cleanup() callers are now on main thread, and this indirection only complicates debugging. 881972 1 199847 ap 2013-04-26 11:16:15 -0700 Created attachment 199847 proposed patch 881983 2 ap 2013-04-26 11:39:45 -0700 Committed <http://trac.webkit.org/r149199>. 199847 2013-04-26 11:16:15 -0700 2013-04-26 11:19:03 -0700 proposed patch MainThreadCleanup.txt text/plain 4732 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0OTE5NykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEzLTA0LTI2ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIFJlbW92ZSBOZXR3 b3JrUmVzb3VyY2VMb2FkZXI6OmNsZWFudXBPbk1haW5UaHJlYWQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTI2OAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFsbCBjbGVhbnVwKCkgY2FsbGVycyBhcmUg bm93IG9uIG1haW4gdGhyZWFkLCBhbmQgdGhpcyBpbmRpcmVjdGlvbiBvbmx5IGNvbXBsaWNhdGVz IGRlYnVnZ2luZy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxv YWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6Y29ubmVj dGlvblRvV2ViUHJvY2Vzc0RpZENsb3NlKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291 cmNlTG9hZGVyOjphYm9ydEluUHJvZ3Jlc3NMb2FkKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29y a1Jlc291cmNlTG9hZGVyOjpkaWRGaW5pc2hMb2FkaW5nKToKKyAgICAgICAgKFdlYktpdDo6TmV0 d29ya1Jlc291cmNlTG9hZGVyOjpkaWRGYWlsKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrUmVzb3VyY2VMb2FkZXIuaDoKKwogMjAxMy0wNC0yNiAgQWxleGV5IFByb3NrdXJ5YWtv diAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBCbG9icyBhcmUgbm90IGFzc29jaWF0ZWQgd2l0 aCBjb25uZWN0aW9uIHdoZW4gdGhlcmUgYXJlIG5vIHNhbmRib3ggZXh0ZW5zaW9ucwpJbmRleDog U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3Vy Y2VMb2FkZXIuY3BwCShyZXZpc2lvbiAxNDkxNDUpCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05MCw0 NyArOTAsNiBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6c3RhcnQoKQogICAgIG1faGFu ZGxlID0gUmVzb3VyY2VIYW5kbGU6OmNyZWF0ZShtX25ldHdvcmtpbmdDb250ZXh0LmdldCgpLCBy ZXF1ZXN0KCksIHRoaXMsIGZhbHNlIC8qIGRlZmVyc0xvYWRpbmcgKi8sIGNvbnRlbnRTbmlmZmlu Z1BvbGljeSgpID09IFNuaWZmQ29udGVudCk7CiB9CiAKLXN0YXRpYyBib29sIHBlcmZvcm1DbGVh bnVwc0NhbGxlZCA9IGZhbHNlOwotCi1zdGF0aWMgTXV0ZXgmIHJlcXVlc3RzVG9DbGVhbnVwTXV0 ZXgoKQotewotICAgIERFRklORV9TVEFUSUNfTE9DQUwoTXV0ZXgsIG11dGV4LCAoKSk7Ci0gICAg cmV0dXJuIG11dGV4OwotfQotCi1zdGF0aWMgSGFzaFNldDxOZXR3b3JrUmVzb3VyY2VMb2FkZXIq PiYgcmVxdWVzdHNUb0NsZWFudXAoKQotewotICAgIERFRklORV9TVEFUSUNfTE9DQUwoSGFzaFNl dDxOZXR3b3JrUmVzb3VyY2VMb2FkZXIqPiwgcmVxdWVzdHMsICgpKTsKLSAgICByZXR1cm4gcmVx dWVzdHM7Ci19Ci0KLXZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpzY2hlZHVsZUNsZWFudXBP bk1haW5UaHJlYWQoKQotewotICAgIE11dGV4TG9ja2VyIGxvY2tlcihyZXF1ZXN0c1RvQ2xlYW51 cE11dGV4KCkpOwotCi0gICAgcmVxdWVzdHNUb0NsZWFudXAoKS5hZGQodGhpcyk7Ci0gICAgaWYg KCFwZXJmb3JtQ2xlYW51cHNDYWxsZWQpIHsKLSAgICAgICAgcGVyZm9ybUNsZWFudXBzQ2FsbGVk ID0gdHJ1ZTsKLSAgICAgICAgY2FsbE9uTWFpblRocmVhZChOZXR3b3JrUmVzb3VyY2VMb2FkZXI6 OnBlcmZvcm1DbGVhbnVwcywgMCk7Ci0gICAgfQotfQotCi12b2lkIE5ldHdvcmtSZXNvdXJjZUxv YWRlcjo6cGVyZm9ybUNsZWFudXBzKHZvaWQqKQotewotICAgIEFTU0VSVChwZXJmb3JtQ2xlYW51 cHNDYWxsZWQpOwotCi0gICAgVmVjdG9yPE5ldHdvcmtSZXNvdXJjZUxvYWRlcio+IHJlcXVlc3Rz OwotICAgIHsKLSAgICAgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKHJlcXVlc3RzVG9DbGVhbnVwTXV0 ZXgoKSk7Ci0gICAgICAgIGNvcHlUb1ZlY3RvcihyZXF1ZXN0c1RvQ2xlYW51cCgpLCByZXF1ZXN0 cyk7Ci0gICAgICAgIHJlcXVlc3RzVG9DbGVhbnVwKCkuY2xlYXIoKTsKLSAgICAgICAgcGVyZm9y bUNsZWFudXBzQ2FsbGVkID0gZmFsc2U7Ci0gICAgfQotICAgIAotICAgIGZvciAoc2l6ZV90IGkg PSAwOyBpIDwgcmVxdWVzdHMuc2l6ZSgpOyArK2kpCi0gICAgICAgIHJlcXVlc3RzW2ldLT5jbGVh bnVwKCk7Ci19Ci0KIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpjbGVhbnVwKCkKIHsKICAg ICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwpAQCAtMTU4LDE2ICsxMTcsNiBAQCB2b2lkIE5ldHdv cmtSZXNvdXJjZUxvYWRlcjo6Y29ubmVjdGlvblRvCiAgICAgaWYgKG1faGFuZGxlKQogICAgICAg ICByZXR1cm47CiAKLSNpZiAhQVNTRVJUX0RJU0FCTEVECi0gICAgLy8gU2luY2UgdGhlcmUncyBu byBoYW5kbGUsIHRoaXMgbG9hZGVyIHNob3VsZCBuZXZlciBoYXZlIGJlZW4gc3RhcnRlZCwgYW5k IHRoZXJlZm9yZSBpdCBzaG91bGQgbmV2ZXIgYmUgaW4gdGhlCi0gICAgLy8gc2V0IG9mIGxvYWRl cnMgdG8gY2xlYW51cCBvbiB0aGUgbWFpbiB0aHJlYWQuCi0gICAgLy8gTGV0J3MgbWFrZSBzdXJl IHRoYXQncyB0cnVlLgotICAgIHsKLSAgICAgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKHJlcXVlc3Rz VG9DbGVhbnVwTXV0ZXgoKSk7Ci0gICAgICAgIEFTU0VSVCghcmVxdWVzdHNUb0NsZWFudXAoKS5j b250YWlucyh0aGlzKSk7Ci0gICAgfQotI2VuZGlmCi0KICAgICBjbGVhbnVwKCk7CiB9CiAKQEAg LTE5NCw3ICsxNDMsNyBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6YWJvcnRJblByb2dy CiAKICAgICBtX2hhbmRsZS0+Y2FuY2VsKCk7CiAKLSAgICBzY2hlZHVsZUNsZWFudXBPbk1haW5U aHJlYWQoKTsKKyAgICBjbGVhbnVwKCk7CiB9CiAKIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVy OjpkaWRSZWNlaXZlUmVzcG9uc2VBc3luYyhSZXNvdXJjZUhhbmRsZSosIGNvbnN0IFJlc291cmNl UmVzcG9uc2UmIHJlc3BvbnNlKQpAQCAtMjQ4LDcgKzE5Nyw3IEBAIHZvaWQgTmV0d29ya1Jlc291 cmNlTG9hZGVyOjpkaWRGaW5pc2hMb2EKICAgICBpbnZhbGlkYXRlU2FuZGJveEV4dGVuc2lvbnMo KTsKICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJSZXNvdXJjZUxvYWRlcjo6RGlkRmluaXNoUmVzb3Vy Y2VMb2FkKGZpbmlzaFRpbWUpKTsKICAgICAKLSAgICBzY2hlZHVsZUNsZWFudXBPbk1haW5UaHJl YWQoKTsKKyAgICBjbGVhbnVwKCk7CiB9CiAKIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpk aWRGYWlsKFJlc291cmNlSGFuZGxlKiwgY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IpCkBAIC0y NTcsNyArMjA2LDcgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmRpZEZhaWwoUmVzbwog ICAgIC8vIFN1Y2ggYm9va2tlZXBpbmcgd2lsbCBuZWVkIHRvIGJlIHRocmVhZCBzYWZlLCBhcyB0 aGlzIGNhbGxiYWNrIGlzIGhhcHBlbmluZyBvbiBhIGJhY2tncm91bmQgdGhyZWFkLgogICAgIGlu dmFsaWRhdGVTYW5kYm94RXh0ZW5zaW9ucygpOwogICAgIHNlbmQoTWVzc2FnZXM6OldlYlJlc291 cmNlTG9hZGVyOjpEaWRGYWlsUmVzb3VyY2VMb2FkKGVycm9yKSk7Ci0gICAgc2NoZWR1bGVDbGVh bnVwT25NYWluVGhyZWFkKCk7CisgICAgY2xlYW51cCgpOwogfQogCiB2b2lkIE5ldHdvcmtSZXNv dXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0QXN5bmMoUmVzb3VyY2VIYW5kbGUqLCBjb25zdCBS ZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlZGlyZWN0 UmVzcG9uc2UpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVz b3VyY2VMb2FkZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vz cy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaAkocmV2aXNpb24gMTQ5MTQ1KQorKysgU291cmNlL1dl YktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmgJKHdvcmtpbmcgY29w eSkKQEAgLTExMSw4ICsxMTEsNiBAQCBwcml2YXRlOgogICAgIHZvaWQgY29udGludWVDYW5BdXRo ZW50aWNhdGVBZ2FpbnN0UHJvdGVjdGlvblNwYWNlKGJvb2wpOwogI2VuZGlmCiAKLSAgICB2b2lk IHNjaGVkdWxlQ2xlYW51cE9uTWFpblRocmVhZCgpOwotICAgIHN0YXRpYyB2b2lkIHBlcmZvcm1D bGVhbnVwcyh2b2lkKik7CiAgICAgdm9pZCBjbGVhbnVwKCk7CiAgICAgCiAgICAgdm9pZCBwbGF0 Zm9ybURpZFJlY2VpdmVSZXNwb25zZShjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJik7 Cg==