Index: third_party/WebKit/Source/platform/Logging.cpp |
diff --git a/third_party/WebKit/Source/platform/Logging.cpp b/third_party/WebKit/Source/platform/Logging.cpp |
index 899efd2945fca1525370960c36fe818a3fa225c4..63fae0b01ba05f1bb4970340226563235fea6a0d 100644 |
--- a/third_party/WebKit/Source/platform/Logging.cpp |
+++ b/third_party/WebKit/Source/platform/Logging.cpp |
@@ -31,75 +31,23 @@ |
namespace blink { |
+WTFLogChannel LogFileAPI = { WTFLogChannelOff }; |
+WTFLogChannel LogFonts = { WTFLogChannelOff }; |
+WTFLogChannel LogMedia = { WTFLogChannelOff }; |
+WTFLogChannel LogNetwork = { WTFLogChannelOff }; |
WTFLogChannel LogNotYetImplemented = { WTFLogChannelOff }; |
- |
-WTFLogChannel LogFrames = { WTFLogChannelOff }; |
-WTFLogChannel LogLoading = { WTFLogChannelOff }; |
-WTFLogChannel LogPopupBlocking = { WTFLogChannelOff }; |
-WTFLogChannel LogEvents = { WTFLogChannelOff }; |
- |
-WTFLogChannel LogEditing = { WTFLogChannelOff }; |
-WTFLogChannel LogLiveConnect = { WTFLogChannelOff }; |
-WTFLogChannel LogIconDatabase = { WTFLogChannelOff }; |
-WTFLogChannel LogSQLDatabase = { WTFLogChannelOff }; |
- |
-WTFLogChannel LogSpellingAndGrammar = { WTFLogChannelOff }; |
-WTFLogChannel LogBackForward = { WTFLogChannelOff }; |
-WTFLogChannel LogHistory = { WTFLogChannelOff }; |
- |
-WTFLogChannel LogPlatformLeaks = { WTFLogChannelOff }; |
+WTFLogChannel LogPlugins = { WTFLogChannelOff }; |
WTFLogChannel LogResourceLoading = { WTFLogChannelOff }; |
- |
-WTFLogChannel LogNetwork = { WTFLogChannelOff }; |
-WTFLogChannel LogFTP = { WTFLogChannelOff }; |
-WTFLogChannel LogThreading = { WTFLogChannelOff }; |
+WTFLogChannel LogSQLDatabase = { WTFLogChannelOff }; |
WTFLogChannel LogStorageAPI = { WTFLogChannelOff }; |
- |
-WTFLogChannel LogMedia = { WTFLogChannelOff }; |
-WTFLogChannel LogPlugins = { WTFLogChannelOff }; |
-WTFLogChannel LogArchives = { WTFLogChannelOff }; |
-WTFLogChannel LogProgress = { WTFLogChannelOff }; |
- |
-WTFLogChannel LogFileAPI = { WTFLogChannelOff }; |
- |
+WTFLogChannel LogTimers = { WTFLogChannelOff }; |
WTFLogChannel LogWebAudio = { WTFLogChannelOff }; |
-WTFLogChannel LogCompositing = { WTFLogChannelOff }; |
-WTFLogChannel LogGamepad = { WTFLogChannelOff }; |
- |
-WTFLogChannel LogScriptedAnimationController = { WTFLogChannelOff }; |
-WTFLogChannel LogTimers = { WTFLogChannelOff }; |
- |
-WTFLogChannel LogFonts = { WTFLogChannelOff }; |
WTFLogChannel* getChannelFromName(const String& channelName) |
{ |
if (!(channelName.length() >= 2)) |
return 0; |
- if (equalIgnoringCase(channelName, String("BackForward"))) |
- return &LogBackForward; |
- |
- if (equalIgnoringCase(channelName, String("Editing"))) |
- return &LogEditing; |
- |
- if (equalIgnoringCase(channelName, String("Events"))) |
- return &LogEvents; |
- |
- if (equalIgnoringCase(channelName, String("Frames"))) |
- return &LogFrames; |
- |
- if (equalIgnoringCase(channelName, String("FTP"))) |
- return &LogFTP; |
- |
- if (equalIgnoringCase(channelName, String("History"))) |
- return &LogHistory; |
- |
- if (equalIgnoringCase(channelName, String("IconDatabase"))) |
- return &LogIconDatabase; |
- |
- if (equalIgnoringCase(channelName, String("Loading"))) |
- return &LogLoading; |
- |
if (equalIgnoringCase(channelName, String("Media"))) |
return &LogMedia; |
@@ -109,51 +57,24 @@ WTFLogChannel* getChannelFromName(const String& channelName) |
if (equalIgnoringCase(channelName, String("NotYetImplemented"))) |
return &LogNotYetImplemented; |
- if (equalIgnoringCase(channelName, String("PlatformLeaks"))) |
- return &LogPlatformLeaks; |
- |
if (equalIgnoringCase(channelName, String("ResourceLoading"))) |
return &LogResourceLoading; |
if (equalIgnoringCase(channelName, String("Plugins"))) |
return &LogPlugins; |
- if (equalIgnoringCase(channelName, String("PopupBlocking"))) |
- return &LogPopupBlocking; |
- |
- if (equalIgnoringCase(channelName, String("Progress"))) |
- return &LogProgress; |
- |
- if (equalIgnoringCase(channelName, String("SpellingAndGrammar"))) |
- return &LogSpellingAndGrammar; |
- |
if (equalIgnoringCase(channelName, String("SQLDatabase"))) |
return &LogSQLDatabase; |
if (equalIgnoringCase(channelName, String("StorageAPI"))) |
return &LogStorageAPI; |
- if (equalIgnoringCase(channelName, String("LiveConnect"))) |
- return &LogLiveConnect; |
- |
- if (equalIgnoringCase(channelName, String("Threading"))) |
- return &LogThreading; |
- |
if (equalIgnoringCase(channelName, String("FileAPI"))) |
return &LogFileAPI; |
if (equalIgnoringCase(channelName, String("WebAudio"))) |
return &LogWebAudio; |
- if (equalIgnoringCase(channelName, String("Compositing"))) |
- return &LogCompositing; |
- |
- if (equalIgnoringCase(channelName, String("Gamepad"))) |
- return &LogGamepad; |
- |
- if (equalIgnoringCase(channelName, String("ScriptedAnimationController"))) |
- return &LogScriptedAnimationController; |
- |
if (equalIgnoringCase(channelName, String("Timers"))) |
return &LogTimers; |