Changeset 91307 in webkit

Timestamp:

Jul 19, 2011 3:07:11 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] [WK2] Implement missing initializeLogChannel function.
​https://bugs.webkit.org/show_bug.cgi?id=63381

Patch by Lukasz Slachciak <​lukasz.slachciak@gmail.com> on 2011-07-19
Reviewed by Martin Robinson.

Implemented logging for GTK platform in WebKit2 - function initializeLogChannel is called for all ports,
so added missing implementation. Aslo helper function added for getting channels from names.

• GNUmakefile.am: Added reference to new file LoggingGtk.cpp.
• Platform/Logging.cpp: Logging implementation for GTK port enabled.

(WebKit::getChannelFromName): Helper to connect name with WTFLogChannel.

• Platform/Logging.h: New helper method added.
• Platform/gtk/LoggingGtk.cpp: Added. GTK logging implementation.

(WebKit::initializeLogChannel): Channel is initialized if its name is found in WEBKIT_DEBUG.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (1 diff)
• Platform/Logging.cpp (modified) (2 diffs)
• Platform/Logging.h (modified) (2 diffs)
• Platform/gtk/LoggingGtk.cpp (copied) (copied from trunk/Source/WebKit2/Platform/Logging.h) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-07-19  Lukasz Slachciak  <lukasz.slachciak@gmail.com>
+
+        [GTK] [WK2] Implement missing initializeLogChannel function.
+        https://bugs.webkit.org/show_bug.cgi?id=63381
+
+        Reviewed by Martin Robinson.
+
+        Implemented logging for GTK platform in WebKit2 - function initializeLogChannel is called for all ports,
+        so added missing implementation. Aslo helper function added for getting channels from names.
+
+        * GNUmakefile.am: Added reference to new file LoggingGtk.cpp.
+        * Platform/Logging.cpp: Logging implementation for GTK port enabled.
+        (WebKit::getChannelFromName): Helper to connect name with WTFLogChannel.
+        * Platform/Logging.h: New helper method added.
+        * Platform/gtk/LoggingGtk.cpp: Added. GTK logging implementation.
+        (WebKit::initializeLogChannel): Channel is initialized if its name is found in WEBKIT_DEBUG.
+
 2011-07-19  Brian Weinstein  <bweinstein@apple.com>
 

trunk/Source/WebKit2/GNUmakefile.am

@@ -169 +169 @@
         Source/WebKit2/Platform/CoreIPC/unix/AttachmentUnix.cpp \
         Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp \
+        Source/WebKit2/Platform/gtk/LoggingGtk.cpp \
         Source/WebKit2/Platform/gtk/ModuleGtk.cpp \
         Source/WebKit2/Platform/gtk/RunLoopGtk.cpp \

trunk/Source/WebKit2/Platform/Logging.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2011 Samsung Electronics
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38 +39 @@
 WTFLogChannel LogKeyHandling  = { 0x00000020, "WebKit2LogLevel", WTFLogChannelOff };
 
-#if !PLATFORM(MAC)
+#if !PLATFORM(MAC) && !PLATFORM(GTK)
 void initializeLogChannel(WTFLogChannel* channel)
 {
     // FIXME: Each platform will need to define their own initializeLogChannel().
+}
+#endif
+
+#if PLATFORM(GTK)
+WTFLogChannel* getChannelFromName(const String& channelName)
+{
+    if (!(channelName.length() >= 2))
+        return 0;
+
+    if (equalIgnoringCase(channelName, String("SessionState")))
+        return &LogSessionState;
+
+    if (equalIgnoringCase(channelName, String("ContextMenu")))
+        return &LogContextMenu;
+
+    if (equalIgnoringCase(channelName, String("TextInput")))
+        return &LogTextInput;
+
+    if (equalIgnoringCase(channelName, String("View")))
+        return &LogView;
+
+    if (equalIgnoringCase(channelName, String("IconDatabase")))
+        return &LogIconDatabase;
+
+    if (equalIgnoringCase(channelName, String("KeyHandling")))
+        return &LogKeyHandling;
+
+    return 0;
 }
 #endif

trunk/Source/WebKit2/Platform/Logging.h

@@ -27 +27 @@
 #define WebKitLogging_h
 
+#include "PlatformString.h"
 #include <wtf/Assertions.h>
 
@@ -46 +47 @@
 void initializeLogChannel(WTFLogChannel*);
 void initializeLogChannelsIfNecessary(void);
+#if PLATFORM(GTK)
+WTFLogChannel* getChannelFromName(const String& channelName);
+#endif
 
 } // namespace WebKit

trunk/Source/WebKit2/Platform/gtk/LoggingGtk.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2011 Samsung Electronics
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24 +24 @@
  */
 
-#ifndef WebKitLogging_h
-#define WebKitLogging_h
+#include "config.h"
+#include "Logging.h"
 
-#include <wtf/Assertions.h>
+#include <glib.h>
+
+namespace WebKit {
 
 #if !LOG_DISABLED
 
-#ifndef LOG_CHANNEL_PREFIX
-#define LOG_CHANNEL_PREFIX Log
-#endif
+void initializeLogChannel(WTFLogChannel* channel)
+{
+    static Vector<WTFLogChannel*> activatedChannels;
+    const static String logValue(g_getenv("WEBKIT_DEBUG"));
 
-namespace WebKit {
+    if (logValue.isEmpty())
+        return;
 
-extern WTFLogChannel LogContextMenu;
-extern WTFLogChannel LogIconDatabase;
-extern WTFLogChannel LogKeyHandling;
-extern WTFLogChannel LogSessionState;
-extern WTFLogChannel LogTextInput;
-extern WTFLogChannel LogView;
+    // Fill activatedChannels vector only once based on names set in logValue.
+    if (activatedChannels.isEmpty()) {
+        static Vector<String> activatedNames;
+        logValue.split(" ", activatedNames);
+        for (unsigned int i = 0; i < activatedNames.size(); i++) {
+            WTFLogChannel* activeChannel = getChannelFromName(activatedNames[i]);
+            if (activeChannel)
+                activatedChannels.append(activeChannel);
+        }
+    }
 
-void initializeLogChannel(WTFLogChannel*);
-void initializeLogChannelsIfNecessary(void);
+    if (activatedChannels.contains(channel))
+        channel->state = WTFLogChannelOn;
+}
 
-} // namespace WebKit
+#endif // !LOG_DISABLED
 
-#endif // LOG_DISABLED
-
-#endif // Logging_h
+}