144998 2015-05-14 04:26:27 -0700 [GTK] Fix Wayland-related header inclusions in GLContext, GLContextEGL, PlatformDisplay 2017-03-11 11:05:38 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified NEW P2 Normal --- 1 zan zan bugs-noreply oldest_to_newest 1094791 0 zan 2015-05-14 04:26:27 -0700 [GTK] Fix Wayland-related header inclusions in GLContext, GLContextEGL, PlatformDisplay 1094793 1 253118 zan 2015-05-14 04:41:53 -0700 Created attachment 253118 Patch 1094794 2 253118 cgarcia 2015-05-14 05:12:45 -0700 Comment on attachment 253118 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=253118&action=review Would it be possible to use forward declarations in the headers and do the includes in the cpp files? > Source/WebCore/platform/graphics/GLContext.h:30 > +#include <wayland-egl.h> This is not specific to GTK, no? > Source/WebCore/platform/graphics/PlatformDisplay.cpp:51 > #if PLATFORM(GTK) > +#if PLATFORM(X11) > #include <gdk/gdkx.h> > #endif > +#if PLATFORM(WAYLAND) > +#include <gdk/gdkwayland.h> > +#endif > +#endif I think the nested ifs makes this more difficult to read, what about something like? #if PLATFORM(GTK) && PLATFORM(X11) #include <gdk/gdkx.h> #endif #if PLATFORM(GTK) && PLATFORM(WAYLAND) #include <gdk/gdkwayland.h> #endif 1094828 3 253118 zan 2015-05-14 09:39:50 -0700 Comment on attachment 253118 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=253118&action=review >> Source/WebCore/platform/graphics/GLContext.h:30 >> +#include <wayland-egl.h> > > This is not specific to GTK, no? Right, this shouldn't be. <EGL/eglplatform.h> should. This also breaks EFL build. Oops. >> Source/WebCore/platform/graphics/PlatformDisplay.cpp:51 >> +#endif > > I think the nested ifs makes this more difficult to read, what about something like? > > #if PLATFORM(GTK) && PLATFORM(X11) > #include <gdk/gdkx.h> > #endif > > #if PLATFORM(GTK) && PLATFORM(WAYLAND) > #include <gdk/gdkwayland.h> > #endif Ugh ... It does look nicer, but I'll ping you as soon as someone uploads a patch that folds the guarded #include statements back under one #if PLATFORM(GTK) guard. 1094829 4 253124 zan 2015-05-14 09:51:26 -0700 Created attachment 253124 Patch 253118 2015-05-14 04:41:53 -0700 2015-05-14 09:51:21 -0700 Patch bug-144998-20150514044429.patch text/plain 2998 zan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NDMzNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA1LTE0ICBaYW4gRG9i ZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBGaXggV2F5bGFu ZC1yZWxhdGVkIGhlYWRlciBpbmNsdXNpb25zIGluIEdMQ29udGV4dCwgR0xDb250ZXh0RUdMLCBQ bGF0Zm9ybURpc3BsYXkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE0NDk5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR0xDb250ZXh0Lmg6IEZvciBHVEssIGluY2x1ZGUg PEVHTC9lZ2xwbGF0Zm9ybS5oPi4gSW4gY2FzZSBvZgorICAgICAgICBidWlsZGluZyBmb3IgdGhl IFdheWxhbmQgd2luZG93aW5nIHRhcmdldCwgaW5jbHVkZSA8d2F5bGFuZC1lZ2wuaD4gYmVmb3Jl aGFuZCBzbworICAgICAgICB0aGF0IHRoZSBXYXlsYW5kIEVHTCBwbGF0Zm9ybSBpcyB1c2VkLiBF R0xOYXRpdmVXaW5kb3dUeXBlIGlzIHRoZW4gdXNlZCBpbnN0ZWFkCisgICAgICAgIG9mIGhhcmQt Y29kaW5nIHRoZSBYMTEtc3BlY2lmaWMgdWludDY0X3QgYXMgdGhlIEdMTmF0aXZlV2luZG93VHlw ZS4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9QbGF0Zm9ybURpc3BsYXkuY3BwOiBPbmx5 IGluY2x1ZGUgPGdkay9nZGt4Lmg+IHdoZW4gYnVpbGRpbmcKKyAgICAgICAgZm9yIHRoZSBYMTEg dGFyZ2V0LiBTaW1pbGFybHksIDxnZGsvZ2Rrd2F5bGFuZC5oPiBzaG91bGQgYmUgaW5jbHVkZWQg d2hlbiBidWlsZGluZworICAgICAgICBmb3IgdGhlIFdheWxhbmQgdGFyZ2V0LCBpbiBvcmRlciB0 byB1c2UgR0RLX0lTX1dBWUxBTkRfRElTUExBWSgpLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2VnbC9HTENvbnRleHRFR0wuaDogSW4gY2FzZSBvZiBidWlsZGluZyBmb3IgdGhlIFdheWxh bmQgdGFyZ2V0LAorICAgICAgICA8d2F5bGFuZC1lZ2wuaD4gc2hvdWxkIGJlIGluY2x1ZGVkIGJl Zm9yZSA8RUdML2VnbC5oPiBzbyB0aGF0IHRoZSBXYXlsYW5kIEVHTAorICAgICAgICBwbGF0Zm9y bSBpcyB1c2VkIGF0IGNvbXBpbGUtdGltZS4KKwogMjAxNS0wNS0xNCAgWW91ZW5uIEZhYmxldCAg PHlvdWVubi5mYWJsZXRAY3JmLmNhbm9uLmZyPgogCiAgICAgICAgIFNoYXJlZEJ1ZmZlcjo6Y3Jl YXRlV2l0aENvbnRlbnRzT2ZGaWxlIHNob3VsZCB1c2UgbWFwIGZpbGUgcm91dGluZXMKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4dC5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4dC5oCShyZXZpc2lv biAxODQzMzUpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HTENvbnRleHQu aAkod29ya2luZyBjb3B5KQpAQCAtMjQsMTEgKzI0LDE2IEBACiAjaW5jbHVkZSAiV2lkZ2V0Lmgi CiAjaW5jbHVkZSA8d3RmL05vbmNvcHlhYmxlLmg+CiAKLSNpZiBVU0UoRUdMKSAmJiAhUExBVEZP Uk0oR1RLKQorI2lmIFVTRShFR0wpCisjaWYgUExBVEZPUk0oR1RLKQorI2lmIFBMQVRGT1JNKFdB WUxBTkQpCisjaW5jbHVkZSA8d2F5bGFuZC1lZ2wuaD4KKyNlbmRpZgorI2luY2x1ZGUgPEVHTC9l Z2xwbGF0Zm9ybS5oPgorI2Vsc2UKICNpbmNsdWRlICJlZ2xwbGF0Zm9ybS5oIgorI2VuZGlmCiB0 eXBlZGVmIEVHTE5hdGl2ZVdpbmRvd1R5cGUgR0xOYXRpdmVXaW5kb3dUeXBlOwotI2Vsc2UKLXR5 cGVkZWYgdWludDY0X3QgR0xOYXRpdmVXaW5kb3dUeXBlOwogI2VuZGlmCiAKICNpZiBVU0UoQ0FJ Uk8pCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QbGF0Zm9ybURpc3Bs YXkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1Bs YXRmb3JtRGlzcGxheS5jcHAJKHJldmlzaW9uIDE4NDMzNSkKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL1BsYXRmb3JtRGlzcGxheS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQy LDggKzQyLDEzIEBACiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKEdUSykKKyNpZiBQTEFURk9STShY MTEpCiAjaW5jbHVkZSA8Z2RrL2dka3guaD4KICNlbmRpZgorI2lmIFBMQVRGT1JNKFdBWUxBTkQp CisjaW5jbHVkZSA8Z2RrL2dka3dheWxhbmQuaD4KKyNlbmRpZgorI2VuZGlmCiAKICNpZiBQTEFU Rk9STShFRkwpICYmIGRlZmluZWQoSEFWRV9FQ09SRV9YKQogI2luY2x1ZGUgPEVjb3JlX1guaD4K SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2VnbC9HTENvbnRleHRFR0wu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZ2wvR0xD b250ZXh0RUdMLmgJKHJldmlzaW9uIDE4NDMzNSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2VnbC9HTENvbnRleHRFR0wuaAkod29ya2luZyBjb3B5KQpAQCAtMjMsNiArMjMs MTAgQEAKICNpZiBVU0UoRUdMKQogCiAjaW5jbHVkZSAiR0xDb250ZXh0LmgiCisKKyNpZiBQTEFU Rk9STShXQVlMQU5EKQorI2luY2x1ZGUgPHdheWxhbmQtZWdsLmg+CisjZW5kaWYKICNpbmNsdWRl IDxFR0wvZWdsLmg+CiAKICNpZiBQTEFURk9STShYMTEpCg== 253124 2015-05-14 09:51:26 -0700 2016-01-06 20:43:56 -0800 Patch bug-144998-20150514095403.patch text/plain 3098 zan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NDMzOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE1LTA1LTE0ICBaYW4gRG9i ZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBGaXggV2F5bGFu ZC1yZWxhdGVkIGhlYWRlciBpbmNsdXNpb25zIGluIEdMQ29udGV4dCwgR0xDb250ZXh0RUdMLCBQ bGF0Zm9ybURpc3BsYXkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE0NDk5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR0xDb250ZXh0Lmg6IEZvciB0aGUgR1RLIHBvcnQg YnVpbGRpbmcgd2l0aCBFR0wgc3VwcG9ydCBlbmFibGVkLAorICAgICAgICBpbmNsdWRlIDxFR0wv ZWdscGxhdGZvcm0uaD4uIEluIGNhc2Ugb2YgYnVpbGRpbmcgZm9yIHRoZSBXYXlsYW5kIHdpbmRv d2luZyB0YXJnZXQsCisgICAgICAgIGluY2x1ZGUgPHdheWxhbmQtZWdsLmg+IGJlZm9yZWhhbmQg c28gdGhhdCB0aGUgV2F5bGFuZCBFR0wgcGxhdGZvcm0gaXMgdXNlZC4KKyAgICAgICAgRUdMTmF0 aXZlV2luZG93VHlwZSBpcyB0aGVuIHVzZWQgaW5zdGVhZCBvZiBoYXJkLWNvZGluZyB0aGUgWDEx LXNwZWNpZmljIHVpbnQ2NF90CisgICAgICAgIGFzIHRoZSBHTE5hdGl2ZVdpbmRvd1R5cGUuCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvUGxhdGZvcm1EaXNwbGF5LmNwcDogRm9yIHRoZSBH VEsgcG9ydCwgb25seSBpbmNsdWRlIDxnZGsvZ2RreC5oPgorICAgICAgICB3aGVuIGJ1aWxkaW5n IGZvciB0aGUgWDExIHRhcmdldC4gU2ltaWxhcmx5LCA8Z2RrL2dka3dheWxhbmQuaD4gc2hvdWxk IGJlIGluY2x1ZGVkCisgICAgICAgIHdoZW4gYnVpbGRpbmcgZm9yIHRoZSBXYXlsYW5kIHRhcmdl dCwgaW4gb3JkZXIgdG8gdXNlIEdES19JU19XQVlMQU5EX0RJU1BMQVkoKS4KKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9lZ2wvR0xDb250ZXh0RUdMLmg6IEluIGNhc2Ugb2YgYnVpbGRpbmcg Zm9yIHRoZSBXYXlsYW5kIHRhcmdldCwKKyAgICAgICAgPHdheWxhbmQtZWdsLmg+IHNob3VsZCBi ZSBpbmNsdWRlZCBiZWZvcmUgPEVHTC9lZ2wuaD4gc28gdGhhdCB0aGUgV2F5bGFuZCBFR0wKKyAg ICAgICAgcGxhdGZvcm0gaXMgdXNlZCBhdCBjb21waWxlLXRpbWUuCisKIDIwMTUtMDUtMTQgIE1h bnVlbCBSZWdvIENhc2Fzbm92YXMgIDxyZWdvQGlnYWxpYS5jb20+CiAKICAgICAgICAgRml4IHR5 cG8gaW4gUmVuZGVyQm94OjppbnN0cmluc2ljU2Nyb2xsYmFyTG9naWNhbFdpZHRoKCkKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4dC5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4dC5oCShyZXZpc2lv biAxODQzMzkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HTENvbnRleHQu aAkod29ya2luZyBjb3B5KQpAQCAtMjQsOCArMjQsMTUgQEAKICNpbmNsdWRlICJXaWRnZXQuaCIK ICNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KIAotI2lmIFVTRShFR0wpICYmICFQTEFURk9S TShHVEspCisjaWYgVVNFKEVHTCkKKyNpZiBQTEFURk9STShXQVlMQU5EKQorI2luY2x1ZGUgPHdh eWxhbmQtZWdsLmg+CisjZW5kaWYKKyNpZiBQTEFURk9STShHVEspCisjaW5jbHVkZSA8RUdML2Vn bHBsYXRmb3JtLmg+CisjZWxzZQogI2luY2x1ZGUgImVnbHBsYXRmb3JtLmgiCisjZW5kaWYKIHR5 cGVkZWYgRUdMTmF0aXZlV2luZG93VHlwZSBHTE5hdGl2ZVdpbmRvd1R5cGU7CiAjZWxzZQogdHlw ZWRlZiB1aW50NjRfdCBHTE5hdGl2ZVdpbmRvd1R5cGU7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9QbGF0Zm9ybURpc3BsYXkuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1BsYXRmb3JtRGlzcGxheS5jcHAJKHJldmlzaW9u IDE4NDMzOSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1BsYXRmb3JtRGlz cGxheS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQxLDEwICs0MSwxNCBAQAogI2luY2x1ZGUgIlBs YXRmb3JtRGlzcGxheVdpbi5oIgogI2VuZGlmCiAKLSNpZiBQTEFURk9STShHVEspCisjaWYgUExB VEZPUk0oR1RLKSAmJiBQTEFURk9STShYMTEpCiAjaW5jbHVkZSA8Z2RrL2dka3guaD4KICNlbmRp ZgogCisjaWYgUExBVEZPUk0oR1RLKSAmJiBQTEFURk9STShXQVlMQU5EKQorI2luY2x1ZGUgPGdk ay9nZGt3YXlsYW5kLmg+CisjZW5kaWYKKwogI2lmIFBMQVRGT1JNKEVGTCkgJiYgZGVmaW5lZChI QVZFX0VDT1JFX1gpCiAjaW5jbHVkZSA8RWNvcmVfWC5oPgogI2VuZGlmCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZ2wvR0xDb250ZXh0RUdMLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZWdsL0dMQ29udGV4dEVHTC5oCShy ZXZpc2lvbiAxODQzMzkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZ2wv R0xDb250ZXh0RUdMLmgJKHdvcmtpbmcgY29weSkKQEAgLTIzLDYgKzIzLDEwIEBACiAjaWYgVVNF KEVHTCkKIAogI2luY2x1ZGUgIkdMQ29udGV4dC5oIgorCisjaWYgUExBVEZPUk0oV0FZTEFORCkK KyNpbmNsdWRlIDx3YXlsYW5kLWVnbC5oPgorI2VuZGlmCiAjaW5jbHVkZSA8RUdML2VnbC5oPgog CiAjaWYgUExBVEZPUk0oWDExKQo=