Bug 195904 – Make WTFLogChannelState and WTFLogLevel enum classes

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Alex Christensen]

Make WTFLogChannelState and WTFLogLevel enum classes

[Alex Christensen]

Created attachment 365047 [details]
Patch

[Eric Carlson]

Comment on attachment 365047 [details]
Patch

Thanks Alex!

[Alex Christensen]

Created attachment 365067 [details]
Patch

[EWS Watchlist]

Attachment 365067 [details] did not pass style-queue:


ERROR: Source/WTF/wtf/Assertions.h:182:  LOG_CHANNEL is incorrectly named. Don't use underscores in your identifier names.  [readability/naming/underscores] [4]
ERROR: Source/WTF/wtf/Assertions.h:185:  LOG_CHANNEL is incorrectly named. Don't use underscores in your identifier names.  [readability/naming/underscores] [4]
Total errors found: 2 in 25 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Alex Christensen]

Created attachment 365075 [details]
Patch

[EWS Watchlist]

Attachment 365075 [details] did not pass style-queue:


ERROR: Source/WTF/wtf/Assertions.h:182:  LOG_CHANNEL is incorrectly named. Don't use underscores in your identifier names.  [readability/naming/underscores] [4]
ERROR: Source/WTF/wtf/Assertions.h:185:  LOG_CHANNEL is incorrectly named. Don't use underscores in your identifier names.  [readability/naming/underscores] [4]
Total errors found: 2 in 27 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[WebKit Commit Bot]

Comment on attachment 365075 [details]
Patch

Clearing flags on attachment: 365075

Committed r243132: <https://trac.webkit.org/changeset/243132>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/49008895>

[Michael Catanzaro]

GTK is broken:

In file included from /usr/include/X11/Xlib.h:44,
                 from ../../Source/WebCore/plugins/npapi.h:89,
                 from ../../Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h:1,
                 from ../../Tools/DumpRenderTree/TestNetscapePlugIn/TestObject.h:26,
                 from ../../Tools/DumpRenderTree/TestNetscapePlugIn/TestObject.cpp:26:
../../Source/WTF/wtf/Assertions.h:153:36: error: expected identifier before numeric constant
  153 | enum class WTFLogLevel : uint8_t { Always, Error, Warning, Info, Debug };
      |                                    ^~~~~~

We won't ever be able to use the name "Always" because it makes Assertions.h conflict with Xlib.h, and it's not practical to ensure these headers are never included together. Xlib.h is the absolute worst (it defines a bunch of very common names without any namespace) but we're stuck with it.

[Michael Catanzaro]

I think the options are:

 (a) Rename WTFLogLevel::Always to something less-appropriate
 (b) Remain an old-style enum forever

Let's go with (b) for now, just to get the build working until we have time to bikeshed about naming.

[Michael Catanzaro]

Reverted r243132 for reason:

Broke GTK build

Committed r243135: <https://trac.webkit.org/changeset/243135>

[Alex Christensen]

WTFLogLevel::Always_ could work

[Michael Catanzaro]

(In reply to Michael Catanzaro from comment #11)
> I think the options are:
> 
>  (a) Rename WTFLogLevel::Always to something less-appropriate
>  (b) Remain an old-style enum forever
> 
> Let's go with (b) for now, just to get the build working until we have time
> to bikeshed about naming.

Phil suggested #undef Always, so that's another option. It will fail if Assertion.h gets included before anything that actually needs to use Xlib.h's Always. I think nothing in WebKit will ever want to do that, but other external headers might... using #undef in headers is not exactly safe. Then again, nothing about unified builds is safe.

[Alex Christensen]

Created attachment 365168 [details]
Patch

[EWS Watchlist]

Attachment 365168 [details] did not pass style-queue:


ERROR: Source/WTF/wtf/Assertions.h:183:  LOG_CHANNEL is incorrectly named. Don't use underscores in your identifier names.  [readability/naming/underscores] [4]
ERROR: Source/WTF/wtf/Assertions.h:186:  LOG_CHANNEL is incorrectly named. Don't use underscores in your identifier names.  [readability/naming/underscores] [4]
Total errors found: 2 in 27 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[WebKit Commit Bot]

Comment on attachment 365168 [details]
Patch

Clearing flags on attachment: 365168

Committed r243141: <https://trac.webkit.org/changeset/243141>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.