- Revision
- 91307
- Author
- [email protected]
- Date
- 2011-07-19 15:07:11 -0700 (Tue, 19 Jul 2011)
Log Message
[GTK] [WK2] Implement missing initializeLogChannel function.
https://bugs.webkit.org/show_bug.cgi?id=63381
Patch by Lukasz Slachciak <[email protected]> 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.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (91306 => 91307)
--- trunk/Source/WebKit2/ChangeLog 2011-07-19 21:56:38 UTC (rev 91306)
+++ trunk/Source/WebKit2/ChangeLog 2011-07-19 22:07:11 UTC (rev 91307)
@@ -1,3 +1,20 @@
+2011-07-19 Lukasz Slachciak <[email protected]>
+
+ [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 <[email protected]>
Add back a change that was accidentally removed in r91266.
Modified: trunk/Source/WebKit2/GNUmakefile.am (91306 => 91307)
--- trunk/Source/WebKit2/GNUmakefile.am 2011-07-19 21:56:38 UTC (rev 91306)
+++ trunk/Source/WebKit2/GNUmakefile.am 2011-07-19 22:07:11 UTC (rev 91307)
@@ -168,6 +168,7 @@
Source/WebKit2/Platform/CoreIPC/MessageSender.h \
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 \
Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp \
Modified: trunk/Source/WebKit2/Platform/Logging.cpp (91306 => 91307)
--- trunk/Source/WebKit2/Platform/Logging.cpp 2011-07-19 21:56:38 UTC (rev 91306)
+++ trunk/Source/WebKit2/Platform/Logging.cpp 2011-07-19 22:07:11 UTC (rev 91307)
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2011 Samsung Electronics
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -37,13 +38,41 @@
WTFLogChannel LogIconDatabase = { 0x00000010, "WebKit2LogLevel", WTFLogChannelOff };
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
+
void initializeLogChannelsIfNecessary()
{
static bool haveInitializedLogChannels = false;
Modified: trunk/Source/WebKit2/Platform/Logging.h (91306 => 91307)
--- trunk/Source/WebKit2/Platform/Logging.h 2011-07-19 21:56:38 UTC (rev 91306)
+++ trunk/Source/WebKit2/Platform/Logging.h 2011-07-19 22:07:11 UTC (rev 91307)
@@ -26,6 +26,7 @@
#ifndef WebKitLogging_h
#define WebKitLogging_h
+#include "PlatformString.h"
#include <wtf/Assertions.h>
#if !LOG_DISABLED
@@ -45,6 +46,9 @@
void initializeLogChannel(WTFLogChannel*);
void initializeLogChannelsIfNecessary(void);
+#if PLATFORM(GTK)
+WTFLogChannel* getChannelFromName(const String& channelName);
+#endif
} // namespace WebKit
Copied: trunk/Source/WebKit2/Platform/gtk/LoggingGtk.cpp (from rev 91306, trunk/Source/WebKit2/Platform/Logging.h) (0 => 91307)
--- trunk/Source/WebKit2/Platform/gtk/LoggingGtk.cpp (rev 0)
+++ trunk/Source/WebKit2/Platform/gtk/LoggingGtk.cpp 2011-07-19 22:07:11 UTC (rev 91307)
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2011 Samsung Electronics
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "Logging.h"
+
+#include <glib.h>
+
+namespace WebKit {
+
+#if !LOG_DISABLED
+
+void initializeLogChannel(WTFLogChannel* channel)
+{
+ static Vector<WTFLogChannel*> activatedChannels;
+ const static String logValue(g_getenv("WEBKIT_DEBUG"));
+
+ if (logValue.isEmpty())
+ return;
+
+ // 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);
+ }
+ }
+
+ if (activatedChannels.contains(channel))
+ channel->state = WTFLogChannelOn;
+}
+
+#endif // !LOG_DISABLED
+
+}
