18010 2008-03-22 02:10:08 -0700 WebKitNetworkRequestPrivate is defined in two places unnecessarily 2008-03-31 14:42:50 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 jasper webkit-unassigned jmalonzo oldest_to_newest 74777 0 jasper 2008-03-22 02:10:08 -0700 WebKitNetworkRequestPrivate is defined in both WebKit/gtk/webkit/webkitnetworkrequest.cpp and in WebKit/gtk/webkit/webkitprivate.h. This is unnecessary code duplication as far as I can tell. Alternatively, if there is a reason for it then maybe some comments should be added? Patch momentarily. 74778 1 19963 jasper 2008-03-22 02:11:35 -0700 Created attachment 19963 remove duplicate definition of WebKitNetworkRequest 74784 2 jmalonzo 2008-03-22 02:33:44 -0700 hi Jasper I think you should move the struct and the _GET_PRIVATE macro out of webkitprivate.h and into webkitnetworkrequest.cpp. I think the frame and view structs just there because they need each other. Regards 74789 3 jasper 2008-03-22 02:37:54 -0700 Hmm, you're right. I'm not sure what WebKitNetworkRequestPrivate is doing in webkitprivate.h at all, then. I initially assumed there must be a reason but a grep would indicate not. I'll move it into webkitnetworkrequest.cpp and build-test, and if that's OK, I'll submit a patch shortly. 74794 4 19969 jasper 2008-03-22 02:56:17 -0700 Created attachment 19969 updated patch removes dupe definition from webkitprivate.h rather than from webkitnetworkrequest.cpp 75317 5 19969 darin 2008-03-26 10:09:27 -0700 Comment on attachment 19969 updated patch removes dupe definition from webkitprivate.h rather than from webkitnetworkrequest.cpp r=me 75993 6 jchaffraix 2008-03-31 14:42:50 -0700 Committed in r31480. 19963 2008-03-22 02:11:35 -0700 2008-03-22 02:56:17 -0700 remove duplicate definition of WebKitNetworkRequest 18010-remove-duplicate-WebKitNetworkRequest-definition.patch text/plain 1458 jasper SW5kZXg6IFdlYktpdC9ndGsvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvQ2hh bmdlTG9nCShyZXZpc2lvbiAzMTIyOCkKKysrIFdlYktpdC9ndGsvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDgtMDMtMjIgIEphc3BlciBCcnlhbnQtR3JlZW5l ICA8amFzcGVyQHVuaXguZ2Vlay5uej4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBSZXNvbHZlcyBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xODAxMAorICAgICAgICAiV2ViS2l0TmV0d29ya1JlcXVlc3RQcml2YXRlIGlzIGRl ZmluZWQgaW4gdHdvIHBsYWNlcyB1bm5lY2Vzc2FyaWx5IgorCisgICAgICAgIFJlbW92ZWQgZHVw bGljYXRlIGRlZmluaXRpb24gb2YgV2ViS2l0TmV0d29ya1JlcXVlc3QuCisKKyAgICAgICAgKiB3 ZWJraXQvd2Via2l0bmV0d29ya3JlcXVlc3QuY3BwOgorCiAyMDA4LTAzLTIwICBBbHAgVG9rZXIg IDxhbHBAYXRva2VyLmNvbT4KIAogICAgICAgICBHVEsrIGJ1aWxkIGZpeC4gQmFjayBvdXQgcjMx MTgzLiBUaGlzIHBhdGNoIGFsc28gaW50cm9kdWNlZCBBUEkgc3R5bGUKSW5kZXg6IFdlYktpdC9n dGsvd2Via2l0L3dlYmtpdG5ldHdvcmtyZXF1ZXN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQv Z3RrL3dlYmtpdC93ZWJraXRuZXR3b3JrcmVxdWVzdC5jcHAJKHJldmlzaW9uIDMxMjI4KQorKysg V2ViS2l0L2d0ay93ZWJraXQvd2Via2l0bmV0d29ya3JlcXVlc3QuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yMCwxNyArMjAsMTIgQEAKICNpbmNsdWRlICJjb25maWcuaCIKIAogI2luY2x1ZGUgIndl YmtpdG5ldHdvcmtyZXF1ZXN0LmgiCisjaW5jbHVkZSAid2Via2l0cHJpdmF0ZS5oIgogCiBleHRl cm4gIkMiIHsKIAogR19ERUZJTkVfVFlQRShXZWJLaXROZXR3b3JrUmVxdWVzdCwgd2Via2l0X25l dHdvcmtfcmVxdWVzdCwgR19UWVBFX09CSkVDVCk7CiAKLXN0cnVjdCBfV2ViS2l0TmV0d29ya1Jl cXVlc3RQcml2YXRlIHsKLSAgICBnY2hhciogdXJpOwotfTsKLQotI2RlZmluZSBXRUJLSVRfTkVU V09SS19SRVFVRVNUX0dFVF9QUklWQVRFKG9iaikgKEdfVFlQRV9JTlNUQU5DRV9HRVRfUFJJVkFU RSgob2JqKSwgV0VCS0lUX1RZUEVfTkVUV09SS19SRVFVRVNULCBXZWJLaXROZXR3b3JrUmVxdWVz dFByaXZhdGUpKQotCiBzdGF0aWMgdm9pZCB3ZWJraXRfbmV0d29ya19yZXF1ZXN0X2ZpbmFsaXpl KEdPYmplY3QqIG9iamVjdCkKIHsKICAgICBXZWJLaXROZXR3b3JrUmVxdWVzdCogcmVxdWVzdCA9 IFdFQktJVF9ORVRXT1JLX1JFUVVFU1Qob2JqZWN0KTsK 19969 2008-03-22 02:56:17 -0700 2008-03-26 10:09:27 -0700 updated patch removes dupe definition from webkitprivate.h rather than from webkitnetworkrequest.cpp 18010-remove-duplicate-WebKitNetworkRequest-definition.patch text/plain 1661 jasper SW5kZXg6IFdlYktpdC9ndGsvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvQ2hh bmdlTG9nCShyZXZpc2lvbiAzMTIzMSkKKysrIFdlYktpdC9ndGsvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDgtMDMtMjIgIEphc3BlciBCcnlhbnQtR3JlZW5l ICA8c2V0IEVNQUlMX0FERFJFU1MgZW52aXJvbm1lbnQgdmFyaWFibGU+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVzb2x2ZXMgaHR0cDovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgwMTAKKyAgICAgICAgIldlYktpdE5ldHdvcmtS ZXF1ZXN0UHJpdmF0ZSBpcyBkZWZpbmVkIGluIHR3byBwbGFjZXMgdW5uZWNlc3NhcmlseSIKKwor ICAgICAgICBSZW1vdmVkIHVubmVjZXNzYXJ5IGRlZmluaXRpb24gb2YgV2ViS2l0TmV0d29ya1Jl cXVlc3RQcml2YXRlIGluCisgICAgICAgIHdlYmtpdHByaXZhdGUuaAorCisgICAgICAgICogd2Vi a2l0L3dlYmtpdHByaXZhdGUuaDoKKwogMjAwOC0wMy0yMCAgQWxwIFRva2VyICA8YWxwQGF0b2tl ci5jb20+CiAKICAgICAgICAgR1RLKyBidWlsZCBmaXguIEJhY2sgb3V0IHIzMTE4My4gVGhpcyBw YXRjaCBhbHNvIGludHJvZHVjZWQgQVBJIHN0eWxlCkluZGV4OiBXZWJLaXQvZ3RrL3dlYmtpdC93 ZWJraXRwcml2YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJp dmF0ZS5oCShyZXZpc2lvbiAzMTIyOCkKKysrIFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZh dGUuaAkod29ya2luZyBjb3B5KQpAQCAtMzAsNyArMzAsNiBAQAogI2luY2x1ZGUgPHdlYmtpdC93 ZWJraXR3ZWJ2aWV3Lmg+CiAjaW5jbHVkZSA8d2Via2l0L3dlYmtpdHdlYmZyYW1lLmg+CiAjaW5j bHVkZSA8d2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmg+Ci0jaW5jbHVkZSA8d2Via2l0L3dlYmtp dG5ldHdvcmtyZXF1ZXN0Lmg+CiAjaW5jbHVkZSA8d2Via2l0L3dlYmtpdHdlYmJhY2tmb3J3YXJk bGlzdC5oPgogCiAjaW5jbHVkZSAiQmFja0ZvcndhcmRMaXN0LmgiCkBAIC0xMDAsMTIgKzk5LDYg QEAgZXh0ZXJuICJDIiB7CiAgICAgICAgIGdjaGFyKiB1cmk7CiAgICAgfTsKIAotICAgICNkZWZp bmUgV0VCS0lUX05FVFdPUktfUkVRVUVTVF9HRVRfUFJJVkFURShvYmopICAgIChHX1RZUEVfSU5T VEFOQ0VfR0VUX1BSSVZBVEUoKG9iaiksIFdFQktJVF9UWVBFX05FVFdPUktfUkVRVUVTVCwgV2Vi S2l0TmV0d29ya1JlcXVlc3RQcml2YXRlKSkKLSAgICB0eXBlZGVmIHN0cnVjdCBfV2ViS2l0TmV0 d29ya1JlcXVlc3RQcml2YXRlIFdlYktpdE5ldHdvcmtSZXF1ZXN0UHJpdmF0ZTsKLSAgICBzdHJ1 Y3QgX1dlYktpdE5ldHdvcmtSZXF1ZXN0UHJpdmF0ZSB7Ci0gICAgICAgIGdjaGFyKiB1cmk7Ci0g ICAgfTsKLQogICAgIFdlYktpdFdlYkZyYW1lKgogICAgIHdlYmtpdF93ZWJfZnJhbWVfaW5pdF93 aXRoX3dlYl92aWV3KFdlYktpdFdlYlZpZXcqLCBXZWJDb3JlOjpIVE1MRnJhbWVPd25lckVsZW1l bnQqKTsKIAo=