27687 2009-07-25 21:11:24 -0700 [Gtk] Refactor ResourceHandleSoup - make start* functions static 2009-07-28 04:03:26 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 jmalonzo webkit-unassigned oldest_to_newest 134791 0 jmalonzo 2009-07-25 21:11:24 -0700 The functions startHttp, startGio, and startData isn't used outside ResourceHandleSoup. I'd like to propose to refactor these functions and make them static to ResourceHandleSoup. 134792 1 33502 jmalonzo 2009-07-25 21:19:33 -0700 Created attachment 33502 patch 134977 2 33502 xan.lopez 2009-07-27 12:19:08 -0700 Comment on attachment 33502 patch Makes sense to me. 135158 3 jmalonzo 2009-07-28 04:03:26 -0700 (In reply to comment #2) > (From update of attachment 33502 [details]) > Makes sense to me. Landed in r46468. Thanks. 33502 2009-07-25 21:19:33 -0700 2009-07-27 12:19:08 -0700 patch bug-27687-20090726141930.patch text/plain 7740 jmalonzo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NjYzZTBlYy4uMjQ1NmJiZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAwOS0wNy0yNSAgSmFuIE1pY2hhZWwg QWxvbnpvICA8am1hbG9uem9Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBbR3RrXSBSZWZhY3RvciBSZXNvdXJjZUhhbmRsZVNvdXAg LSBtYWtlIHN0YXJ0KiBmdW5jdGlvbnMgc3RhdGljCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzY4NworCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3 b3JrL1Jlc291cmNlSGFuZGxlLmg6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jl c291cmNlSGFuZGxlU291cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzdGFydERhdGEpOgorICAg ICAgICAoV2ViQ29yZTo6c3RhcnRIdHRwKToKKyAgICAgICAgKFdlYkNvcmU6Oik6CisKIDIwMDkt MDctMTYgIFNoaW5pY2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBPbGl2ZXIgSHVudC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9SZXNvdXJjZUhhbmRsZS5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291 cmNlSGFuZGxlLmgKaW5kZXggZjBlMWU5NC4uNGNiMzU2MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL1Jlc291cmNlSGFuZGxlLmgKQEAgLTE5MSwxMiArMTkxLDYgQEAgcHVibGljOgogICAg IHZvaWQgZmlyZUZhaWx1cmUoVGltZXI8UmVzb3VyY2VIYW5kbGU+Kik7CiAKIHByaXZhdGU6Ci0j aWYgVVNFKFNPVVApCi0gICAgYm9vbCBzdGFydERhdGEoU3RyaW5nIHVybFN0cmluZyk7Ci0gICAg Ym9vbCBzdGFydEh0dHAoU3RyaW5nIHVybFN0cmluZyk7Ci0gICAgYm9vbCBzdGFydEdpbyhLVVJM IHVybCk7Ci0jZW5kaWYKLQogICAgIHZvaWQgc2NoZWR1bGVGYWlsdXJlKEZhaWx1cmVUeXBlKTsK IAogICAgIGJvb2wgc3RhcnQoRnJhbWUqKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCmluZGV4IDhmOGMxNTYuLmY3OTQzMzMg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxl U291cC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5k bGVTb3VwLmNwcApAQCAtMTE4LDYgKzExOCw4IEBAIHZvaWQgV2ViQ29yZVN5bmNocm9ub3VzTG9h ZGVyOjpydW4oKQogfQogCiBzdGF0aWMgdm9pZCBjbGVhbnVwR2lvT3BlcmF0aW9uKFJlc291cmNl SGFuZGxlSW50ZXJuYWwqIGhhbmRsZSk7CitzdGF0aWMgYm9vbCBzdGFydERhdGEoUmVzb3VyY2VI YW5kbGUqIGhhbmRsZSwgU3RyaW5nIHVybFN0cmluZyk7CitzdGF0aWMgYm9vbCBzdGFydEdpbyhS ZXNvdXJjZUhhbmRsZSogaGFuZGxlLCBLVVJMIHVybCk7CiAKIFJlc291cmNlSGFuZGxlSW50ZXJu YWw6On5SZXNvdXJjZUhhbmRsZUludGVybmFsKCkKIHsKQEAgLTQyMCwxMyArNDIyLDE1IEBAIHN0 YXRpYyBnYm9vbGVhbiBwYXJzZURhdGFVcmwoZ3BvaW50ZXIgY2FsbGJhY2tfZGF0YSkKICAgICBy ZXR1cm4gZmFsc2U7CiB9CiAKLWJvb2wgUmVzb3VyY2VIYW5kbGU6OnN0YXJ0RGF0YShTdHJpbmcg dXJsU3RyaW5nKQorc3RhdGljIGJvb2wgc3RhcnREYXRhKFJlc291cmNlSGFuZGxlKiBoYW5kbGUs IFN0cmluZyB1cmxTdHJpbmcpCiB7Ci0gICAgUmVzb3VyY2VIYW5kbGVJbnRlcm5hbCogZCA9IHRo aXMtPmdldEludGVybmFsKCk7CisgICAgQVNTRVJUKGhhbmRsZSk7CisKKyAgICBSZXNvdXJjZUhh bmRsZUludGVybmFsKiBkID0gaGFuZGxlLT5nZXRJbnRlcm5hbCgpOwogCiAgICAgLy8gSWYgcGFy c2VEYXRhVXJsIGlzIGNhbGxlZCBzeW5jaHJvbm91c2x5IHRoZSBqb2IgaXMgbm90IHlldCBlZmZl Y3RpdmVseSBzdGFydGVkCiAgICAgLy8gYW5kIHdlYmtpdCB3b24ndCBuZXZlciBrbm93IHRoYXQg dGhlIGRhdGEgaGFzIGJlZW4gcGFyc2VkIGV2ZW4gZGlkRmluaXNoTG9hZGluZyBpcyBjYWxsZWQu Ci0gICAgZC0+bV9pZGxlSGFuZGxlciA9IGdfaWRsZV9hZGQocGFyc2VEYXRhVXJsLCB0aGlzKTsK KyAgICBkLT5tX2lkbGVIYW5kbGVyID0gZ19pZGxlX2FkZChwYXJzZURhdGFVcmwsIGhhbmRsZSk7 CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAgLTQ1NSwxOCArNDU5LDIyIEBAIHN0YXRpYyB2b2lk IGVuc3VyZVNlc3Npb25Jc0luaXRpYWxpemVkKFNvdXBTZXNzaW9uKiBzZXNzaW9uKQogICAgIGdf b2JqZWN0X3NldF9kYXRhKEdfT0JKRUNUKHNlc3Npb24pLCAid2Via2l0LWluaXQiLCByZWludGVy cHJldF9jYXN0PHZvaWQqPigweGRlYWRiZWVmKSk7CiB9CiAKLWJvb2wgUmVzb3VyY2VIYW5kbGU6 OnN0YXJ0SHR0cChTdHJpbmcgdXJsU3RyaW5nKQorc3RhdGljIGJvb2wgc3RhcnRIdHRwKFJlc291 cmNlSGFuZGxlKiBoYW5kbGUsIFN0cmluZyB1cmxTdHJpbmcpCiB7Ci0gICAgU291cFNlc3Npb24q IHNlc3Npb24gPSBkZWZhdWx0U2Vzc2lvbigpOworICAgIEFTU0VSVChoYW5kbGUpOworIAorICAg IFNvdXBTZXNzaW9uKiBzZXNzaW9uID0gaGFuZGxlLT5kZWZhdWx0U2Vzc2lvbigpOwogICAgIGVu c3VyZVNlc3Npb25Jc0luaXRpYWxpemVkKHNlc3Npb24pOwogCi0gICAgZC0+bV9tc2cgPSByZXF1 ZXN0KCkudG9Tb3VwTWVzc2FnZSgpOwotICAgIGdfc2lnbmFsX2Nvbm5lY3QoZC0+bV9tc2csICJy ZXN0YXJ0ZWQiLCBHX0NBTExCQUNLKHJlc3RhcnRlZENhbGxiYWNrKSwgdGhpcyk7Ci0gICAgZ19z aWduYWxfY29ubmVjdChkLT5tX21zZywgImdvdC1oZWFkZXJzIiwgR19DQUxMQkFDSyhnb3RIZWFk ZXJzQ2FsbGJhY2spLCB0aGlzKTsKLSAgICBnX3NpZ25hbF9jb25uZWN0KGQtPm1fbXNnLCAiY29u dGVudC1zbmlmZmVkIiwgR19DQUxMQkFDSyhjb250ZW50U25pZmZlZENhbGxiYWNrKSwgdGhpcyk7 Ci0gICAgZ19zaWduYWxfY29ubmVjdChkLT5tX21zZywgImdvdC1jaHVuayIsIEdfQ0FMTEJBQ0so Z290Q2h1bmtDYWxsYmFjayksIHRoaXMpOworICAgIFJlc291cmNlSGFuZGxlSW50ZXJuYWwqIGQg PSBoYW5kbGUtPmdldEludGVybmFsKCk7CisKKyAgICBkLT5tX21zZyA9IGhhbmRsZS0+cmVxdWVz dCgpLnRvU291cE1lc3NhZ2UoKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0KGQtPm1fbXNnLCAicmVz dGFydGVkIiwgR19DQUxMQkFDSyhyZXN0YXJ0ZWRDYWxsYmFjayksIGhhbmRsZSk7CisgICAgZ19z aWduYWxfY29ubmVjdChkLT5tX21zZywgImdvdC1oZWFkZXJzIiwgR19DQUxMQkFDSyhnb3RIZWFk ZXJzQ2FsbGJhY2spLCBoYW5kbGUpOworICAgIGdfc2lnbmFsX2Nvbm5lY3QoZC0+bV9tc2csICJj b250ZW50LXNuaWZmZWQiLCBHX0NBTExCQUNLKGNvbnRlbnRTbmlmZmVkQ2FsbGJhY2spLCBoYW5k bGUpOworICAgIGdfc2lnbmFsX2Nvbm5lY3QoZC0+bV9tc2csICJnb3QtY2h1bmsiLCBHX0NBTExC QUNLKGdvdENodW5rQ2FsbGJhY2spLCBoYW5kbGUpOwogCi0gICAgZ19vYmplY3Rfc2V0X2RhdGEo R19PQkpFQ1QoZC0+bV9tc2cpLCAicmVzb3VyY2VIYW5kbGUiLCByZWludGVycHJldF9jYXN0PHZv aWQqPih0aGlzKSk7CisgICAgZ19vYmplY3Rfc2V0X2RhdGEoR19PQkpFQ1QoZC0+bV9tc2cpLCAi cmVzb3VyY2VIYW5kbGUiLCByZWludGVycHJldF9jYXN0PHZvaWQqPihoYW5kbGUpKTsKIAogICAg IEZvcm1EYXRhKiBodHRwQm9keSA9IGQtPm1fcmVxdWVzdC5odHRwQm9keSgpOwogICAgIGlmICho dHRwQm9keSAmJiAhaHR0cEJvZHktPmlzRW1wdHkoKSkgewpAQCAtNTA5LDEwICs1MTcsMTAgQEAg Ym9vbCBSZXNvdXJjZUhhbmRsZTo6c3RhcnRIdHRwKFN0cmluZyB1cmxTdHJpbmcpCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU3RyaW5nOjpmcm9t VVRGOChlcnJvci0+bWVzc2FnZSkpOwogICAgICAgICAgICAgICAgICAgICAgICAgZ19lcnJvcl9m cmVlKGVycm9yKTsKIAotICAgICAgICAgICAgICAgICAgICAgICAgZC0+Y2xpZW50KCktPmRpZEZh aWwodGhpcywgcmVzb3VyY2VFcnJvcik7CisgICAgICAgICAgICAgICAgICAgICAgICBkLT5jbGll bnQoKS0+ZGlkRmFpbChoYW5kbGUsIHJlc291cmNlRXJyb3IpOwogCiAgICAgICAgICAgICAgICAg ICAgICAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X21hdGNoZWQoZC0+bV9tc2csIEdf U0lHTkFMX01BVENIX0RBVEEsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgMCwgMCwgMCwgMCwgdGhpcyk7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMCwgMCwgMCwg MCwgaGFuZGxlKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGdfb2JqZWN0X3VucmVmKGQtPm1f bXNnKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGQtPm1fbXNnID0gMDsKIApAQCAtNTM1LDcg KzU0Myw3IEBAIGJvb2wgUmVzb3VyY2VIYW5kbGU6OnN0YXJ0SHR0cChTdHJpbmcgdXJsU3RyaW5n KQogICAgIH0KIAogICAgIC8vIGJhbGFuY2VkIGJ5IGEgZGVyZWYoKSBpbiBmaW5pc2hlZENhbGxi YWNrLCB3aGljaCBzaG91bGQgYWx3YXlzIHJ1bgotICAgIHJlZigpOworICAgIGhhbmRsZS0+cmVm KCk7CiAKICAgICAvLyBGSVhNRTogRm9yIG5vdywgd2UgY2Fubm90IGFjY2VwdCBjb250ZW50IGVu Y29kZWQgaW4gYW55dGhpbmcKICAgICAvLyBvdGhlciB0aGFuIGlkZW50aXR5LCBzbyBmb3JjZSBz ZXJ2ZXJzIHRvIGRvIGl0IG91ciB3YXkuIFdoZW4KQEAgLTU0Nyw3ICs1NTUsNyBAQCBib29sIFJl c291cmNlSGFuZGxlOjpzdGFydEh0dHAoU3RyaW5nIHVybFN0cmluZykKICAgICAvLyBrZWVwIG91 ciBvd24gcmVmLCBiZWNhdXNlIGFmdGVyIHF1ZXVlaW5nIHRoZSBtZXNzYWdlLCB0aGUKICAgICAv LyBzZXNzaW9uIG93bnMgdGhlIGluaXRpYWwgcmVmZXJlbmNlLgogICAgIGdfb2JqZWN0X3JlZihk LT5tX21zZyk7Ci0gICAgc291cF9zZXNzaW9uX3F1ZXVlX21lc3NhZ2Uoc2Vzc2lvbiwgZC0+bV9t c2csIGZpbmlzaGVkQ2FsbGJhY2ssIHRoaXMpOworICAgIHNvdXBfc2Vzc2lvbl9xdWV1ZV9tZXNz YWdlKHNlc3Npb24sIGQtPm1fbXNnLCBmaW5pc2hlZENhbGxiYWNrLCBoYW5kbGUpOwogCiAgICAg cmV0dXJuIHRydWU7CiB9CkBAIC01NzIsMTggKzU4MCwxOCBAQCBib29sIFJlc291cmNlSGFuZGxl OjpzdGFydChGcmFtZSogZnJhbWUpCiAgICAgZC0+bV9mcmFtZSA9IGZyYW1lOwogCiAgICAgaWYg KGVxdWFsSWdub3JpbmdDYXNlKHByb3RvY29sLCAiZGF0YSIpKQotICAgICAgICByZXR1cm4gc3Rh cnREYXRhKHVybFN0cmluZyk7CisgICAgICAgIHJldHVybiBzdGFydERhdGEodGhpcywgdXJsU3Ry aW5nKTsKIAogICAgIFNvdXBVUkkqIHVyaSA9IHNvdXBfdXJpX25ldyh1cmxTdHJpbmcudXRmOCgp LmRhdGEoKSk7CiAgICAgYm9vbCBpc0hUVFBPckhUVFBTID0gKGVxdWFsSWdub3JpbmdDYXNlKHBy b3RvY29sLCAiaHR0cCIpIHx8IGVxdWFsSWdub3JpbmdDYXNlKHByb3RvY29sLCAiaHR0cHMiKSkg JiYgU09VUF9VUklfVkFMSURfRk9SX0hUVFAodXJpKTsKICAgICBzb3VwX3VyaV9mcmVlKHVyaSk7 CiAKICAgICBpZiAoaXNIVFRQT3JIVFRQUykKLSAgICAgICAgcmV0dXJuIHN0YXJ0SHR0cCh1cmxT dHJpbmcpOworICAgICAgICByZXR1cm4gc3RhcnRIdHRwKHRoaXMsIHVybFN0cmluZyk7CiAKICAg ICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UocHJvdG9jb2wsICJmaWxlIikgfHwgZXF1YWxJZ25vcmlu Z0Nhc2UocHJvdG9jb2wsICJmdHAiKSB8fCBlcXVhbElnbm9yaW5nQ2FzZShwcm90b2NvbCwgImZ0 cHMiKSkKICAgICAgICAgLy8gRklYTUU6IHNob3VsZCB3ZSBiZSBkb2luZyBhbnkgb3RoZXIgcHJv dG9jb2xzIGhlcmU/Ci0gICAgICAgIHJldHVybiBzdGFydEdpbyh1cmwpOworICAgICAgICByZXR1 cm4gc3RhcnRHaW8odGhpcywgdXJsKTsKIAogICAgIC8vIEVycm9yIG11c3Qgbm90IGJlIHJlcG9y dGVkIGltbWVkaWF0ZWx5CiAgICAgdGhpcy0+c2NoZWR1bGVGYWlsdXJlKEludmFsaWRVUkxGYWls dXJlKTsKQEAgLTgzMCwxNCArODM4LDE3IEBAIHN0YXRpYyB2b2lkIHF1ZXJ5SW5mb0NhbGxiYWNr KEdPYmplY3QqIHNvdXJjZSwgR0FzeW5jUmVzdWx0KiByZXMsIGdwb2ludGVyKQogICAgIGdfZmls ZV9yZWFkX2FzeW5jKGQtPm1fZ2ZpbGUsIEdfUFJJT1JJVFlfREVGQVVMVCwgZC0+bV9jYW5jZWxs YWJsZSwKICAgICAgICAgICAgICAgICAgICAgICBvcGVuQ2FsbGJhY2ssIDApOwogfQotCi1ib29s IFJlc291cmNlSGFuZGxlOjpzdGFydEdpbyhLVVJMIHVybCkKK3N0YXRpYyBib29sIHN0YXJ0R2lv KFJlc291cmNlSGFuZGxlKiBoYW5kbGUsIEtVUkwgdXJsKQogewotICAgIGlmIChyZXF1ZXN0KCku aHR0cE1ldGhvZCgpICE9ICJHRVQiICYmIHJlcXVlc3QoKS5odHRwTWV0aG9kKCkgIT0gIlBPU1Qi KSB7CisgICAgQVNTRVJUKGhhbmRsZSk7CisKKyAgICBSZXNvdXJjZUhhbmRsZUludGVybmFsKiBk ID0gaGFuZGxlLT5nZXRJbnRlcm5hbCgpOworCisgICAgaWYgKGhhbmRsZS0+cmVxdWVzdCgpLmh0 dHBNZXRob2QoKSAhPSAiR0VUIiAmJiBoYW5kbGUtPnJlcXVlc3QoKS5odHRwTWV0aG9kKCkgIT0g IlBPU1QiKSB7CiAgICAgICAgIFJlc291cmNlRXJyb3IgZXJyb3IoZ19xdWFya190b19zdHJpbmco U09VUF9IVFRQX0VSUk9SKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTT1VQX1NUQVRV U19NRVRIT0RfTk9UX0FMTE9XRUQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgdXJsLnN0 cmluZygpLCByZXF1ZXN0KCkuaHR0cE1ldGhvZCgpKTsKLSAgICAgICAgZC0+Y2xpZW50KCktPmRp ZEZhaWwodGhpcywgZXJyb3IpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVybC5zdHJp bmcoKSwgaGFuZGxlLT5yZXF1ZXN0KCkuaHR0cE1ldGhvZCgpKTsKKyAgICAgICAgZC0+Y2xpZW50 KCktPmRpZEZhaWwoaGFuZGxlLCBlcnJvcik7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9 CiAKQEAgLTg1Nyw3ICs4NjgsNyBAQCBib29sIFJlc291cmNlSGFuZGxlOjpzdGFydEdpbyhLVVJM IHVybCkKICAgICBlbHNlCiAjZW5kaWYKICAgICAgICAgZC0+bV9nZmlsZSA9IGdfZmlsZV9uZXdf Zm9yX3VyaSh1cmwuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7Ci0gICAgZ19vYmplY3Rfc2V0X2Rh dGEoR19PQkpFQ1QoZC0+bV9nZmlsZSksICJ3ZWJraXQtcmVzb3VyY2UiLCB0aGlzKTsKKyAgICBn X29iamVjdF9zZXRfZGF0YShHX09CSkVDVChkLT5tX2dmaWxlKSwgIndlYmtpdC1yZXNvdXJjZSIs IGhhbmRsZSk7CiAgICAgZC0+bV9jYW5jZWxsYWJsZSA9IGdfY2FuY2VsbGFibGVfbmV3KCk7CiAg ICAgZ19maWxlX3F1ZXJ5X2luZm9fYXN5bmMoZC0+bV9nZmlsZSwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBHX0ZJTEVfQVRUUklCVVRFX1NUQU5EQVJEX1RZUEUgIiwi