[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 6fc366a46dd0da081bf9dc3924cc68cb3e7120cb
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 22 17:48:36 2010 +0000

    2010-07-22  Joone Hur  <joone.hur at samsung.com>
    
            Reviewed by Antonio Gomes.
    
            [EFL] add support for logging
            https://bugs.webkit.org/show_bug.cgi?id=40807
    
            Enable to turn log channels on for EFL port
    
            * platform/efl/LoggingEfl.cpp:
            (WebCore::InitializeLoggingChannelsIfNecessary):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63901 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c66dbef..88e5a0d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-22  Joone Hur  <joone.hur at samsung.com>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] add support for logging
+        https://bugs.webkit.org/show_bug.cgi?id=40807
+
+        Enable to turn log channels on for EFL port
+
+        * platform/efl/LoggingEfl.cpp:
+        (WebCore::InitializeLoggingChannelsIfNecessary):
+
 2010-07-22  Balazs Kelemen  <kb at inf.u-szeged.hu>
 
         Ureviewed build fix.
diff --git a/WebCore/platform/efl/LoggingEfl.cpp b/WebCore/platform/efl/LoggingEfl.cpp
index 1829c80..55de765 100644
--- a/WebCore/platform/efl/LoggingEfl.cpp
+++ b/WebCore/platform/efl/LoggingEfl.cpp
@@ -23,10 +23,41 @@
 #include "config.h"
 #include "Logging.h"
 
+#include "PlatformString.h"
+#include <Eina.h>
+
 namespace WebCore {
 
 void InitializeLoggingChannelsIfNecessary()
 {
+    static bool didInitializeLoggingChannels = false;
+    if (didInitializeLoggingChannels)
+        return;
+
+    didInitializeLoggingChannels = true;
+
+    char* logEnv = getenv("WEBKIT_DEBUG");
+    if (!logEnv)
+        return;
+
+#if defined(NDEBUG)
+    EINA_LOG_WARN("WEBKIT_DEBUG is not empty, but this is a release build. Notice that many log messages will only appear in a debug build.");
+#endif
+
+    char** logv = eina_str_split(logEnv, ",", -1);
+
+    EINA_SAFETY_ON_NULL_RETURN(logv);
+
+    for (int i = 0; logv[i]; i++) {
+        if (WTFLogChannel* channel = getChannelFromName(logv[i]))
+            channel->state = WTFLogChannelOn;
+    }
+
+    free(*logv);
+    free(logv);
+
+    // To disable logging notImplemented set the DISABLE_NI_WARNING
+    // environment variable to 1.
     LogNotYetImplemented.state = WTFLogChannelOn;
 }
 

-- 
WebKit Debian packaging