[GTK] Build failure due to unwieldy definition of “None” from X11 headers

[Adrian Perez]

This happens sometimes, depending on how “lucky” one with the
chain of #includes generated in the derived sources for unified
builds. Right now I have a reproducer locally so let's try and
fix it for good. Build error log follows.

----

In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-88d1702b-25.cpp:6:
In file included from ../Source/WebKit/UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp:31:
In file included from ../Source/WebKit/UIProcess/WebPageProxy.h:30:
In file included from ../Source/WebKit/Shared/ContextMenuContextData.h:34:
In file included from ../Source/WebKit/Shared/WebHitTestResultData.h:25:
In file included from DerivedSources/ForwardingHeaders/WebCore/DictionaryPopupInfo.h:29:
DerivedSources/ForwardingHeaders/WebCore/TextIndicator.h:41:5: error: expected identifier
    None,
    ^
/usr/include/X11/X.h:115:30: note: expanded from macro 'None'
#define None                 0L /* universal null resource or null atom */
                             ^
In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-88d1702b-25.cpp:6:
In file included from ../Source/WebKit/UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp:31:
In file included from ../Source/WebKit/UIProcess/WebPageProxy.h:34:
In file included from ../Source/WebKit/Shared/EditorState.h:30:
DerivedSources/ForwardingHeaders/WebCore/FontAttributes.h:40:42: error: expected unqualified-id
    ListStyleType style { ListStyleType::None };
                                         ^
/usr/include/X11/X.h:115:30: note: expanded from macro 'None'
#define None                 0L /* universal null resource or null atom */
                             ^
In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-88d1702b-25.cpp:6:
In file included from ../Source/WebKit/UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp:31:
In file included from ../Source/WebKit/UIProcess/WebPageProxy.h:34:
In file included from ../Source/WebKit/Shared/EditorState.h:30:
DerivedSources/ForwardingHeaders/WebCore/FontAttributes.h:78:51: error: expected identifier
    enum class SubscriptOrSuperscript : uint8_t { None, Subscript, Superscript };
                                                  ^
/usr/include/X11/X.h:115:30: note: expanded from macro 'None'
#define None                 0L /* universal null resource or null atom */
                             ^
In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-88d1702b-25.cpp:6:
In file included from ../Source/WebKit/UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp:31:
In file included from ../Source/WebKit/UIProcess/WebPageProxy.h:34:
In file included from ../Source/WebKit/Shared/EditorState.h:30:
DerivedSources/ForwardingHeaders/WebCore/FontAttributes.h:97:77: error: expected unqualified-id
    SubscriptOrSuperscript subscriptOrSuperscript { SubscriptOrSuperscript::None };
                                                                            ^
/usr/include/X11/X.h:115:30: note: expanded from macro 'None'
#define None                 0L /* universal null resource or null atom */
                             ^
In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-88d1702b-25.cpp:6:
In file included from ../Source/WebKit/UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp:31:
In file included from ../Source/WebKit/UIProcess/WebPageProxy.h:34:
In file included from ../Source/WebKit/Shared/EditorState.h:30:
DerivedSources/ForwardingHeaders/WebCore/FontAttributes.h:111:58: error: expected unqualified-id
        WebCore::FontAttributes::SubscriptOrSuperscript::None,
                                                         ^
/usr/include/X11/X.h:115:30: note: expanded from macro 'None'
#define None                 0L /* universal null resource or null atom */
                             ^
In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-88d1702b-25.cpp:6:
In file included from ../Source/WebKit/UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp:31:
In file included from ../Source/WebKit/UIProcess/WebPageProxy.h:35:
In file included from ../Source/WebKit/Shared/FocusedElementInformation.h:30:
DerivedSources/ForwardingHeaders/WebCore/Autofill.h:39:5: error: expected identifier
    None,
    ^
/usr/include/X11/X.h:115:30: note: expanded from macro 'None'
#define None                 0L /* universal null resource or null atom */
                             ^
In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-88d1702b-25.cpp:6:
In file included from ../Source/WebKit/UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp:31:
In file included from ../Source/WebKit/UIProcess/WebPageProxy.h:35:
In file included from ../Source/WebKit/Shared/FocusedElementInformation.h:32:
In file included from DerivedSources/ForwardingHeaders/WebCore/GraphicsLayer.h:28:
DerivedSources/ForwardingHeaders/WebCore/Animation.h:194:76: error: expected unqualified-id
    static AnimationFillMode initialFillMode() { return AnimationFillMode::None; }
                                                                           ^
/usr/include/X11/X.h:115:30: note: expanded from macro 'None'
#define None                 0L /* universal null resource or null atom */
                             ^
In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-88d1702b-25.cpp:6:
In file included from ../Source/WebKit/UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp:31:
In file included from ../Source/WebKit/UIProcess/WebPageProxy.h:35:
In file included from ../Source/WebKit/Shared/FocusedElementInformation.h:32:
In file included from DerivedSources/ForwardingHeaders/WebCore/GraphicsLayer.h:40:
In file included from DerivedSources/ForwardingHeaders/WebCore/ScrollableArea.h:29:
DerivedSources/ForwardingHeaders/WebCore/ScrollTypes.h:53:5: error: expected identifier
    None,
    ^
/usr/include/X11/X.h:115:30: note: expanded from macro 'None'
#define None                 0L /* universal null resource or null atom */
                             ^
In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-88d1702b-25.cpp:6:
In file included from ../Source/WebKit/UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp:31:
In file included from ../Source/WebKit/UIProcess/WebPageProxy.h:35:
In file included from ../Source/WebKit/Shared/FocusedElementInformation.h:32:
In file included from DerivedSources/ForwardingHeaders/WebCore/GraphicsLayer.h:40:
In file included from DerivedSources/ForwardingHeaders/WebCore/ScrollableArea.h:29:
DerivedSources/ForwardingHeaders/WebCore/ScrollTypes.h:210:5: error: expected identifier
    None,
    ^
/usr/include/X11/X.h:115:30: note: expanded from macro 'None'
#define None                 0L /* universal null resource or null atom */
                             ^
In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-88d1702b-25.cpp:6:
In file included from ../Source/WebKit/UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp:31:
In file included from ../Source/WebKit/UIProcess/WebPageProxy.h:35:
In file included from ../Source/WebKit/Shared/FocusedElementInformation.h:32:
In file included from DerivedSources/ForwardingHeaders/WebCore/GraphicsLayer.h:40:
In file included from DerivedSources/ForwardingHeaders/WebCore/ScrollableArea.h:29:
DerivedSources/ForwardingHeaders/WebCore/ScrollTypes.h:223:5: error: expected identifier
    None,
    ^
/usr/include/X11/X.h:115:30: note: expanded from macro 'None'
#define None                 0L /* universal null resource or null atom */
                             ^
In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-88d1702b-25.cpp:6:
In file included from ../Source/WebKit/UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp:31:
In file included from ../Source/WebKit/UIProcess/WebPageProxy.h:35:
In file included from ../Source/WebKit/Shared/FocusedElementInformation.h:32:
DerivedSources/ForwardingHeaders/WebCore/GraphicsLayer.h:485:9: error: expected identifier
        None = 0,
        ^
/usr/include/X11/X.h:115:30: note: expanded from macro 'None'
#define None                 0L /* universal null resource or null atom */
                             ^
In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-88d1702b-25.cpp:6:
In file included from ../Source/WebKit/UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp:31:
In file included from ../Source/WebKit/UIProcess/WebPageProxy.h:35:
In file included from ../Source/WebKit/Shared/FocusedElementInformation.h:32:
DerivedSources/ForwardingHeaders/WebCore/GraphicsLayer.h:495:9: error: expected identifier
        None = 0,
        ^
/usr/include/X11/X.h:115:30: note: expanded from macro 'None'
#define None                 0L /* universal null resource or null atom */
                             ^
In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-88d1702b-25.cpp:6:
In file included from ../Source/WebKit/UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp:31:
In file included from ../Source/WebKit/UIProcess/WebPageProxy.h:35:
In file included from ../Source/WebKit/Shared/FocusedElementInformation.h:32:
DerivedSources/ForwardingHeaders/WebCore/GraphicsLayer.h:536:9: error: expected identifier
        None,
        ^
/usr/include/X11/X.h:115:30: note: expanded from macro 'None'
#define None                 0L /* universal null resource or null atom */
                             ^
In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-88d1702b-25.cpp:6:
In file included from ../Source/WebKit/UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp:31:
In file included from ../Source/WebKit/UIProcess/WebPageProxy.h:35:
In file included from ../Source/WebKit/Shared/FocusedElementInformation.h:32:
DerivedSources/ForwardingHeaders/WebCore/GraphicsLayer.h:692:61: error: expected unqualified-id
    CustomAppearance m_customAppearance { CustomAppearance::None };
                                                            ^
/usr/include/X11/X.h:115:30: note: expanded from macro 'None'
#define None                 0L /* universal null resource or null atom */
                             ^
In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-88d1702b-25.cpp:6:
In file included from ../Source/WebKit/UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp:31:
In file included from ../Source/WebKit/UIProcess/WebPageProxy.h:35:
../Source/WebKit/Shared/FocusedElementInformation.h:41:5: error: expected identifier
    None,
    ^
/usr/include/X11/X.h:115:30: note: expanded from macro 'None'
#define None                 0L /* universal null resource or null atom */
                             ^
In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-88d1702b-25.cpp:6:
In file included from ../Source/WebKit/UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp:31:
In file included from ../Source/WebKit/UIProcess/WebPageProxy.h:73:
DerivedSources/ForwardingHeaders/WebCore/DragActions.h:72:43: error: expected identifier
enum class DragHandlingMethod : uint8_t { None, EditPlainText, EditRichText, UploadFile, PageLoad, SetColor, NonDefault };
                                          ^
/usr/include/X11/X.h:115:30: note: expanded from macro 'None'
#define None                 0L /* universal null resource or null atom */
                             ^
In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-88d1702b-25.cpp:6:
In file included from ../Source/WebKit/UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp:31:
In file included from ../Source/WebKit/UIProcess/WebPageProxy.h:73:
DerivedSources/ForwardingHeaders/WebCore/DragActions.h:81:38: error: expected unqualified-id
        WebCore::DragHandlingMethod::None,
                                     ^
/usr/include/X11/X.h:115:30: note: expanded from macro 'None'
#define None                 0L /* universal null resource or null atom */
                             ^
In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-88d1702b-25.cpp:6:
In file included from ../Source/WebKit/UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp:31:
In file included from ../Source/WebKit/UIProcess/WebPageProxy.h:77:
DerivedSources/ForwardingHeaders/WebCore/FrameView.h:899:49: error: expected identifier
    enum class ViewportRendererType : uint8_t { None, Document, Body };
                                                ^
/usr/include/X11/X.h:115:30: note: expanded from macro 'None'
#define None                 0L /* universal null resource or null atom */
                             ^
In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-88d1702b-25.cpp:6:
In file included from ../Source/WebKit/UIProcess/gstreamer/InstallMissingMediaPluginsPermissionRequest.cpp:31:
In file included from ../Source/WebKit/UIProcess/WebPageProxy.h:77:
DerivedSources/ForwardingHeaders/WebCore/FrameView.h:900:73: error: expected unqualified-id
    ViewportRendererType m_viewportRendererType { ViewportRendererType::None };
                                                                        ^
/usr/include/X11/X.h:115:30: note: expanded from macro 'None'
#define None                 0L /* universal null resource or null atom */
                             ^
fatal error: too many errors emitted, stopping now [-ferror-limit=]

[Adrian Perez]

Created attachment 376890 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 376890 [details]
Patch

Clearing flags on attachment: 376890

Committed r248948: <https://trac.webkit.org/changeset/248948>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/54560945>