60536 2011-05-10 00:33:59 -0700 [GTK] Remove some unneeded header includes 2011-05-30 07:13:46 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned oldest_to_newest 401078 0 cgarcia 2011-05-10 00:33:59 -0700 Trying to build the plugin process with the webcore gtk files to always use gtk2 for plugins I found some headers includes that are not really needed. 401079 1 92926 cgarcia 2011-05-10 00:39:49 -0700 Created attachment 92926 Patch This patch reduces the number of files needed to build the plugin process. 401218 2 92926 mrobinson 2011-05-10 08:31:47 -0700 Comment on attachment 92926 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=92926&action=review Typically > Source/WebCore/bindings/js/ScriptControllerGtk.cpp:37 > -#include "PluginView.h" > #include "runtime_root.h" > +#include <WebCore/plugins/PluginView.h> > Since this includes a header inside WebCore it doesn't seem right to use a system include here. Is this change necessary? > Source/WebCore/plugins/gtk/PluginViewGtk.cpp:30 > #include "config.h" > -#include "PluginView.h" > +#include <WebCore/plugins/PluginView.h> It's definitely not usual to do that here. 412159 3 cgarcia 2011-05-30 01:12:49 -0700 (In reply to comment #2) > (From update of attachment 92926 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=92926&action=review > > Typically > > > Source/WebCore/bindings/js/ScriptControllerGtk.cpp:37 > > -#include "PluginView.h" > > #include "runtime_root.h" > > +#include <WebCore/plugins/PluginView.h> > > > > Since this includes a header inside WebCore it doesn't seem right to use a system include here. Is this change necessary? Yes, because I'm building the plugin process with some of the webcore sources, so webcore and webkit2 cppflags are mixed. Maybe, we should create two libwebcoregtk, libwebcoregtk3 for webkit1 and webkit2 when building with gtk3 and libwecoregtk2 for webkit1 and webkit2 when building with gtk2 and for the plugin process unconditionally. > > Source/WebCore/plugins/gtk/PluginViewGtk.cpp:30 > > #include "config.h" > > -#include "PluginView.h" > > +#include <WebCore/plugins/PluginView.h> > > It's definitely not usual to do that here. Yes, same issue, I don't like it either. 412167 4 95331 cgarcia 2011-05-30 02:01:05 -0700 Created attachment 95331 Updated patch ok, I've removed the webcore files from the patch until I find a better solution. 412214 5 cgarcia 2011-05-30 07:13:46 -0700 Committed r87685: <http://trac.webkit.org/changeset/87685> 92926 2011-05-10 00:39:49 -0700 2011-05-30 02:01:05 -0700 Patch wk2-headers.diff text/plain 3919 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiOTY5YWIzLi44MzA2NjYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDUtMTAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtd IFJlbW92ZSBzb21lIHVubmVlZGVkIGhlYWRlciBpbmNsdWRlcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA1MzYKKworICAgICAgICBUaGVyZSdzIGEg UGx1Z2luVmlldy5oIGluIFdlYktpdDIgdG9vLCBzbyBiZXR0ZXIgdXNlIHRoZSBwdWJsaWMKKyAg ICAgICAgaGVhZGVyIDxXZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5oPiB0byBzb2x2ZSB0aGUg YW1iaWd1aXR5LgorCisgICAgICAgICogYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlckd0ay5j cHA6CisgICAgICAgICogcGx1Z2lucy9ndGsvUGx1Z2luVmlld0d0ay5jcHA6CisKIDIwMTEtMDUt MDkgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBUcnkgdG8gZml4 IHRoZSBMTFZNIENvbXBpbGVyIGJ1aWxkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlckd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9TY3JpcHRDb250cm9sbGVyR3RrLmNwcAppbmRleCA4ODZmMTEwLi4yNzBhNGYyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyR3RrLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyR3RrLmNw cApAQCAtMzIsOCArMzIsOCBAQAogI2luY2x1ZGUgIlNjcmlwdENvbnRyb2xsZXIuaCIKIAogI2lu Y2x1ZGUgIkJyaWRnZUpTQy5oIgotI2luY2x1ZGUgIlBsdWdpblZpZXcuaCIKICNpbmNsdWRlICJy dW50aW1lX3Jvb3QuaCIKKyNpbmNsdWRlIDxXZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5oPgog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsdWdp bnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsvUGx1 Z2luVmlld0d0ay5jcHAKaW5kZXggZDhhZWI4MS4uNDcwMjdiZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGx1Z2lucy9ndGsvUGx1Z2luVmlld0d0ay5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGx1Z2lucy9ndGsvUGx1Z2luVmlld0d0ay5jcHAKQEAgLTI3LDcgKzI3LDcgQEAKICAqLwog CiAjaW5jbHVkZSAiY29uZmlnLmgiCi0jaW5jbHVkZSAiUGx1Z2luVmlldy5oIgorI2luY2x1ZGUg PFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3Lmg+CiAKICNpbmNsdWRlICJCcmlkZ2VKU0MuaCIK ICNpbmNsdWRlICJEb2N1bWVudC5oIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDhjM2UwMDguLjJiMTk5YWEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMS0wNS0xMCAgQ2FybG9zIEdhcmNpYSBDYW1w b3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgW0dUS10gUmVtb3ZlIHNvbWUgdW5uZWVkZWQgaGVhZGVyIGluY2x1 ZGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDUz NgorCisgICAgICAgICogUGxhdGZvcm0vQ29yZUlQQy9Db25uZWN0aW9uLmNwcDogUmVtb3ZlIFdl YlByb2Nlc3MuaC4KKyAgICAgICAgKiBQbGF0Zm9ybS9Db3JlSVBDL3VuaXgvQ29ubmVjdGlvblVu aXguY3BwOiBSZW1vdmUKKyAgICAgICAgUHJvY2Vzc0xhdW5jaGVyLmggYW5kIFdlYlByb2Nlc3NQ cm94eS5oLiBBZGQgPHd0Zi9Pd25BcnJheVB0ci5oPi4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1Bs dWdpbnMvTmV0c2NhcGUvTlBKU09iamVjdC5jcHA6IFJlbW92ZSBQbHVnaW5WaWV3LmguCisKIDIw MTEtMDUtMDkgIEplcmVteSBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0 Zm9ybS9Db3JlSVBDL0Nvbm5lY3Rpb24uY3BwIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29y ZUlQQy9Db25uZWN0aW9uLmNwcAppbmRleCBmM2NhMWQyLi5kYWY4ZDNlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0Nvbm5lY3Rpb24uY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQ29ubmVjdGlvbi5jcHAKQEAgLTI5LDcgKzI5LDYg QEAKICNpbmNsdWRlICJCaW5hcnlTZW1hcGhvcmUuaCIKICNpbmNsdWRlICJDb3JlSVBDTWVzc2Fn ZUtpbmRzLmgiCiAjaW5jbHVkZSAiUnVuTG9vcC5oIgotI2luY2x1ZGUgIldlYlByb2Nlc3MuaCIK ICNpbmNsdWRlICJXb3JrSXRlbS5oIgogI2luY2x1ZGUgPHd0Zi9DdXJyZW50VGltZS5oPgogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL3VuaXgvQ29ubmVjdGlv blVuaXguY3BwIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy91bml4L0Nvbm5lY3Rp b25Vbml4LmNwcAppbmRleCA5MmZmZmYzLi5kZWRlMGExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL3VuaXgvQ29ubmVjdGlvblVuaXguY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvdW5peC9Db25uZWN0aW9uVW5peC5jcHAKQEAgLTI4 LDE1ICsyOCwxNCBAQAogI2luY2x1ZGUgIkNvbm5lY3Rpb24uaCIKIAogI2luY2x1ZGUgIkFyZ3Vt ZW50RW5jb2Rlci5oIgotI2luY2x1ZGUgIlByb2Nlc3NMYXVuY2hlci5oIgogI2luY2x1ZGUgIldv cmtJdGVtLmgiCiAjaW5jbHVkZSAiU2hhcmVkTWVtb3J5LmgiCi0jaW5jbHVkZSAiV2ViUHJvY2Vz c1Byb3h5LmgiCiAjaW5jbHVkZSA8c3lzL3NvY2tldC5oPgogI2luY2x1ZGUgPHVuaXN0ZC5oPgog I2luY2x1ZGUgPGVycm5vLmg+CiAjaW5jbHVkZSA8ZmNudGwuaD4KICNpbmNsdWRlIDx3dGYvQXNz ZXJ0aW9ucy5oPgorI2luY2x1ZGUgPHd0Zi9Pd25BcnJheVB0ci5oPgogCiAjaWYgUExBVEZPUk0o UVQpCiAjaW5jbHVkZSA8UUFwcGxpY2F0aW9uPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05QSlNPYmplY3QuY3BwIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05QSlNPYmplY3QuY3BwCmluZGV4IDc3MjBl ODguLmFhMzk4YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lu cy9OZXRzY2FwZS9OUEpTT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1BsdWdpbnMvTmV0c2NhcGUvTlBKU09iamVjdC5jcHAKQEAgLTI5LDcgKzI5LDYgQEAKICNpbmNs dWRlICJKU05QT2JqZWN0LmgiCiAjaW5jbHVkZSAiTlBSdW50aW1lT2JqZWN0TWFwLmgiCiAjaW5j bHVkZSAiTlBSdW50aW1lVXRpbGl0aWVzLmgiCi0jaW5jbHVkZSAiUGx1Z2luVmlldy5oIgogI2lu Y2x1ZGUgPEphdmFTY3JpcHRDb3JlL0pTTG9jay5oPgogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3Jl L0pTT2JqZWN0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9GcmFtZS5oPiAgCg== 95331 2011-05-30 02:01:05 -0700 2011-05-30 07:10:07 -0700 Updated patch wk2-remove-headers2.diff text/plain 2354 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1M2NlNzcyLi4zN2NlYzBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMDUtMzAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtd IFJlbW92ZSBzb21lIHVubmVlZGVkIGhlYWRlciBpbmNsdWRlcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA1MzYKKworICAgICAgICAqIFBsYXRmb3Jt L0NvcmVJUEMvQ29ubmVjdGlvbi5jcHA6IFJlbW92ZSBXZWJQcm9jZXNzLmguCisgICAgICAgICog UGxhdGZvcm0vQ29yZUlQQy91bml4L0Nvbm5lY3Rpb25Vbml4LmNwcDogUmVtb3ZlCisgICAgICAg IFByb2Nlc3NMYXVuY2hlci5oIGFuZCBXZWJQcm9jZXNzUHJveHkuaC4gQWRkIDx3dGYvT3duQXJy YXlQdHIuaD4uCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05QSlNPYmpl Y3QuY3BwOiBSZW1vdmUgUGx1Z2luVmlldy5oLgorCiAyMDExLTA1LTI5ICBEYXJpbiBBZGxlciAg PGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9Db25uZWN0aW9uLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQ29ubmVjdGlvbi5jcHAKaW5kZXgg MTYxZDcwZC4uMmJkNDAyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29y ZUlQQy9Db25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBD L0Nvbm5lY3Rpb24uY3BwCkBAIC0yOSw3ICsyOSw2IEBACiAjaW5jbHVkZSAiQmluYXJ5U2VtYXBo b3JlLmgiCiAjaW5jbHVkZSAiQ29yZUlQQ01lc3NhZ2VLaW5kcy5oIgogI2luY2x1ZGUgIlJ1bkxv b3AuaCIKLSNpbmNsdWRlICJXZWJQcm9jZXNzLmgiCiAjaW5jbHVkZSAiV29ya0l0ZW0uaCIKICNp bmNsdWRlIDx3dGYvQ3VycmVudFRpbWUuaD4KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv UGxhdGZvcm0vQ29yZUlQQy91bml4L0Nvbm5lY3Rpb25Vbml4LmNwcCBiL1NvdXJjZS9XZWJLaXQy L1BsYXRmb3JtL0NvcmVJUEMvdW5peC9Db25uZWN0aW9uVW5peC5jcHAKaW5kZXggOTJmZmZmMy4u ZGVkZTBhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy91bml4 L0Nvbm5lY3Rpb25Vbml4LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBD L3VuaXgvQ29ubmVjdGlvblVuaXguY3BwCkBAIC0yOCwxNSArMjgsMTQgQEAKICNpbmNsdWRlICJD b25uZWN0aW9uLmgiCiAKICNpbmNsdWRlICJBcmd1bWVudEVuY29kZXIuaCIKLSNpbmNsdWRlICJQ cm9jZXNzTGF1bmNoZXIuaCIKICNpbmNsdWRlICJXb3JrSXRlbS5oIgogI2luY2x1ZGUgIlNoYXJl ZE1lbW9yeS5oIgotI2luY2x1ZGUgIldlYlByb2Nlc3NQcm94eS5oIgogI2luY2x1ZGUgPHN5cy9z b2NrZXQuaD4KICNpbmNsdWRlIDx1bmlzdGQuaD4KICNpbmNsdWRlIDxlcnJuby5oPgogI2luY2x1 ZGUgPGZjbnRsLmg+CiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KKyNpbmNsdWRlIDx3dGYv T3duQXJyYXlQdHIuaD4KIAogI2lmIFBMQVRGT1JNKFFUKQogI2luY2x1ZGUgPFFBcHBsaWNhdGlv bj4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2Fw ZS9OUEpTT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRz Y2FwZS9OUEpTT2JqZWN0LmNwcAppbmRleCA3NzIwZTg4Li5hYTM5OGM1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTlBKU09iamVjdC5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05QSlNPYmpl Y3QuY3BwCkBAIC0yOSw3ICsyOSw2IEBACiAjaW5jbHVkZSAiSlNOUE9iamVjdC5oIgogI2luY2x1 ZGUgIk5QUnVudGltZU9iamVjdE1hcC5oIgogI2luY2x1ZGUgIk5QUnVudGltZVV0aWxpdGllcy5o IgotI2luY2x1ZGUgIlBsdWdpblZpZXcuaCIKICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9KU0xv Y2suaD4KICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9KU09iamVjdC5oPgogI2luY2x1ZGUgPFdl YkNvcmUvRnJhbWUuaD4gIAo=