Diff
Modified: trunk/Source/WebKit2/ChangeLog (119516 => 119517)
--- trunk/Source/WebKit2/ChangeLog 2012-06-05 19:59:17 UTC (rev 119516)
+++ trunk/Source/WebKit2/ChangeLog 2012-06-05 20:06:26 UTC (rev 119517)
@@ -1,3 +1,18 @@
+2012-06-05 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Implement log channel initialization for WebKit2
+
+ Reviewed by Alexis Menard.
+
+ * Platform/Logging.cpp:
+ (WebKit):
+ * Platform/Logging.h:
+ (WebKit):
+ * Platform/qt/LoggingQt.cpp: Copied from Source/WebKit2/Platform/gtk/LoggingGtk.cpp
+ (WebKit):
+ (WebKit::initializeLogChannel):
+ * Target.pri:
+
2012-06-05 Jocelyn Turcotte <[email protected]>
WebLayerTreeRenderer behaves wrongly when no contentsScale is set.
Modified: trunk/Source/WebKit2/Platform/Logging.cpp (119516 => 119517)
--- trunk/Source/WebKit2/Platform/Logging.cpp 2012-06-05 19:59:17 UTC (rev 119516)
+++ trunk/Source/WebKit2/Platform/Logging.cpp 2012-06-05 20:06:26 UTC (rev 119517)
@@ -38,14 +38,14 @@
WTFLogChannel LogIconDatabase = { 0x00000010, "WebKit2LogLevel", WTFLogChannelOff };
WTFLogChannel LogKeyHandling = { 0x00000020, "WebKit2LogLevel", WTFLogChannelOff };
-#if !PLATFORM(MAC) && !PLATFORM(GTK)
+#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(QT)
void initializeLogChannel(WTFLogChannel* channel)
{
// FIXME: Each platform will need to define their own initializeLogChannel().
}
#endif
-#if PLATFORM(GTK)
+#if PLATFORM(GTK) || PLATFORM(QT)
WTFLogChannel* getChannelFromName(const String& channelName)
{
if (!(channelName.length() >= 2))
Modified: trunk/Source/WebKit2/Platform/Logging.h (119516 => 119517)
--- trunk/Source/WebKit2/Platform/Logging.h 2012-06-05 19:59:17 UTC (rev 119516)
+++ trunk/Source/WebKit2/Platform/Logging.h 2012-06-05 20:06:26 UTC (rev 119517)
@@ -46,7 +46,7 @@
void initializeLogChannel(WTFLogChannel*);
void initializeLogChannelsIfNecessary(void);
-#if PLATFORM(GTK)
+#if PLATFORM(GTK) || PLATFORM(QT)
WTFLogChannel* getChannelFromName(const String& channelName);
#endif
Copied: trunk/Source/WebKit2/Platform/qt/LoggingQt.cpp (from rev 119516, trunk/Source/WebKit2/Platform/Logging.h) (0 => 119517)
--- trunk/Source/WebKit2/Platform/qt/LoggingQt.cpp (rev 0)
+++ trunk/Source/WebKit2/Platform/qt/LoggingQt.cpp 2012-06-05 20:06:26 UTC (rev 119517)
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2011 Samsung Electronics
+ * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * 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 <QDebug>
+#include <QStringList>
+
+namespace WebKit {
+
+#if !LOG_DISABLED
+
+void initializeLogChannel(WTFLogChannel* channel)
+{
+ static Vector<WTFLogChannel*> activatedChannels;
+
+ QByteArray loggingEnv = qgetenv("QT_WEBKIT_LOG");
+ if (loggingEnv.isEmpty())
+ return;
+
+ // Fill activatedChannels vector only once based on names set in logValue.
+ if (activatedChannels.isEmpty()) {
+ QStringList channels = QString::fromLocal8Bit(loggingEnv).split(QLatin1String(","));
+ for (int i = 0; i < channels.count(); i++) {
+ if (WTFLogChannel* activeChannel = getChannelFromName(channels.at(i)))
+ activatedChannels.append(activeChannel);
+ }
+ }
+
+ if (activatedChannels.contains(channel))
+ channel->state = WTFLogChannelOn;
+}
+
+#endif // !LOG_DISABLED
+
+}
Modified: trunk/Source/WebKit2/Target.pri (119516 => 119517)
--- trunk/Source/WebKit2/Target.pri 2012-06-05 19:59:17 UTC (rev 119516)
+++ trunk/Source/WebKit2/Target.pri 2012-06-05 20:06:26 UTC (rev 119517)
@@ -388,6 +388,7 @@
Platform/Logging.cpp \
Platform/Module.cpp \
Platform/WorkQueue.cpp \
+ Platform/qt/LoggingQt.cpp \
Platform/qt/ModuleQt.cpp \
PluginProcess/PluginControllerProxy.cpp \
PluginProcess/PluginCreationParameters.cpp \
