diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebKit2/Platform/Logging.cpp | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebKit2/Platform/Logging.cpp')
| -rw-r--r-- | Source/WebKit2/Platform/Logging.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Source/WebKit2/Platform/Logging.cpp b/Source/WebKit2/Platform/Logging.cpp index 184821c..9093415 100644 --- a/Source/WebKit2/Platform/Logging.cpp +++ b/Source/WebKit2/Platform/Logging.cpp @@ -28,15 +28,20 @@ #if !LOG_DISABLED +namespace WebKit { + WTFLogChannel LogSessionState = { 0x00000001, "WebKit2LogLevel", WTFLogChannelOff }; WTFLogChannel LogContextMenu = { 0x00000002, "WebKit2LogLevel", WTFLogChannelOff }; WTFLogChannel LogTextInput = { 0x00000004, "WebKit2LogLevel", WTFLogChannelOff }; WTFLogChannel LogView = { 0x00000008, "WebKit2LogLevel", WTFLogChannelOff }; +WTFLogChannel LogIconDatabase = { 0x00000010, "WebKit2LogLevel", WTFLogChannelOff }; -static inline void initializeLogChannel(WTFLogChannel* channel) +#if !PLATFORM(MAC) +void initializeLogChannel(WTFLogChannel* channel) { - // FIXME: This is a build fix. Each platform will need to define their own initializeLogChannel(). + // FIXME: Each platform will need to define their own initializeLogChannel(). } +#endif void initializeLogChannelsIfNecessary() { @@ -46,9 +51,12 @@ void initializeLogChannelsIfNecessary() haveInitializedLogChannels = true; initializeLogChannel(&LogContextMenu); + initializeLogChannel(&LogIconDatabase); initializeLogChannel(&LogSessionState); initializeLogChannel(&LogTextInput); initializeLogChannel(&LogView); } +} // namespace WebKit + #endif // LOG_DISABLED |