Bug 191378 – Simplify macros in platform

• Status: RESOLVED
• Resolution: FIXED
• Component: Platform

[Don Olmstead]

There are a few cases where the #if PLATFORM macros could be simplified withing WebCore/platform

[Don Olmstead]

Created attachment 354101 [details]
Patch

[Konstantin Tokarev]

Comment on attachment 354101 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=354101&action=review

> Source/WebCore/page/EventHandler.cpp:2643
> +#if !USE(GLIB)

This code has nothing to do with GLib

> Source/WebCore/platform/network/NetworkStateNotifier.h:70
> +#if USE(GLIB)

Same here

[Don Olmstead]

Comment on attachment 354101 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=354101&action=review

With the GLIB stuff I found implementations in corresponding Glib platform files. Both WPE and GTK rely on Glib.

>> Source/WebCore/page/EventHandler.cpp:2643
>> +#if !USE(GLIB)
> 
> This code has nothing to do with GLib

There is an implementation at Source/WebCore/platform/glib/EventHandlerGlib.cpp so !USE(GLIB) is applicable here.

>> Source/WebCore/platform/network/NetworkStateNotifier.h:70
>> +#if USE(GLIB)
> 
> Same here

There is an implementation at Source/WebCore/platform/network/glib/NetworkStateNotifierGlib.cpp so USE(GLIB) is applicable here.

[Michael Catanzaro]

Comment on attachment 354101 [details]
Patch

This is iffy, but Don's changes seem reasonable. The problem is we do have a lot of GTK/WPE-specific code used by both ports in files with the GLib (or older Glib) suffix. So these macros *are* guarding WebKit's GLib implementations of these functions... even if they have nothing to do with the library GLib itself.

[Don Olmstead]

(In reply to Michael Catanzaro from comment #4)
> Comment on attachment 354101 [details]
> Patch
> 
> This is iffy, but Don's changes seem reasonable. The problem is we do have a
> lot of GTK/WPE-specific code used by both ports in files with the GLib (or
> older Glib) suffix. So these macros *are* guarding WebKit's GLib
> implementations of these functions... even if they have nothing to do with
> the library GLib itself.

I currently have platform/glib/EventHandlerGLib.cpp in my CMake for PlayStation so its on my list to turn into a generic implementation. So this should be temporary

[WebKit Commit Bot]

Comment on attachment 354101 [details]
Patch

Clearing flags on attachment: 354101

Committed r237944: <https://trac.webkit.org/changeset/237944>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/45888762>