From 7c4e63c779b4b66b091365c35d3e018b6cd0fa08 Mon Sep 17 00:00:00 2001
From: "zandobersek@gmail.com"
 <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu, 5 Jul 2012 09:34:46 +0000
Subject: [PATCH] Add Gamepad logging channel
 https://bugs.webkit.org/show_bug.cgi?id=90570

Reviewed by Carlos Garcia Campos.

Add a new logging channel for logging significant
events that are related to Gamepad API implementation.

No new tests - no new testable functionality.

* platform/Logging.cpp:
(WebCore):
(WebCore::getChannelFromName):
* platform/Logging.h:
(WebCore):
* platform/gtk/GamepadsGtk.cpp: Log when a device is
registered or unregistered.
(WebCore::GamepadsGtk::registerDevice):
(WebCore::GamepadsGtk::unregisterDevice):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121895 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 Source/WebCore/ChangeLog                    | 22 ++++++++++++++++++++++
 Source/WebCore/platform/Logging.cpp         |  4 ++++
 Source/WebCore/platform/Logging.h           |  1 +
 Source/WebCore/platform/gtk/GamepadsGtk.cpp |  4 ++++
 4 files changed, 31 insertions(+)

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index fca6248..6011adf 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2012-07-05  Zan Dobersek  <zandobersek@gmail.com>
+
+        Add Gamepad logging channel
+        https://bugs.webkit.org/show_bug.cgi?id=90570
+
+        Reviewed by Carlos Garcia Campos.
+
+        Add a new logging channel for logging significant
+        events that are related to Gamepad API implementation.
+
+        No new tests - no new testable functionality.
+
+        * platform/Logging.cpp:
+        (WebCore):
+        (WebCore::getChannelFromName):
+        * platform/Logging.h:
+        (WebCore):
+        * platform/gtk/GamepadsGtk.cpp: Log when a device is
+        registered or unregistered.
+        (WebCore::GamepadsGtk::registerDevice):
+        (WebCore::GamepadsGtk::unregisterDevice):
+
 2012-07-05  Peter Wang  <peter.wang@torchmobile.com.cn>
 
         Web Inspector: [JSC] support JS execution in the context of an isolated world
diff --git a/Source/WebCore/platform/Logging.cpp b/Source/WebCore/platform/Logging.cpp
index 6e788d6..d97e104 100644
--- a/Source/WebCore/platform/Logging.cpp
+++ b/Source/WebCore/platform/Logging.cpp
@@ -65,6 +65,7 @@ WTFLogChannel LogFileAPI =           { 0x10000000, "WebCoreLogLevel", WTFLogChan
 
 WTFLogChannel LogWebAudio =          { 0x20000000, "WebCoreLogLevel", WTFLogChannelOff };
 WTFLogChannel LogCompositing =       { 0x40000000, "WebCoreLogLevel", WTFLogChannelOff };
+WTFLogChannel LogGamepad =           { 0x80000000, "WebCoreLogLevel", WTFLogChannelOff };
 
 
 WTFLogChannel* getChannelFromName(const String& channelName)
@@ -147,6 +148,9 @@ WTFLogChannel* getChannelFromName(const String& channelName)
     if (equalIgnoringCase(channelName, String("Compositing")))
         return &LogCompositing;
 
+    if (equalIgnoringCase(channelName, String("Gamepad")))
+        return &LogGamepad;
+
     return 0;
 }
 
diff --git a/Source/WebCore/platform/Logging.h b/Source/WebCore/platform/Logging.h
index 4330717..cde0ce8 100644
--- a/Source/WebCore/platform/Logging.h
+++ b/Source/WebCore/platform/Logging.h
@@ -63,6 +63,7 @@ namespace WebCore {
     extern WTFLogChannel LogFileAPI;
     extern WTFLogChannel LogWebAudio;
     extern WTFLogChannel LogCompositing;
+    extern WTFLogChannel LogGamepad;
 
     void initializeLoggingChannelsIfNecessary();
     WTFLogChannel* getChannelFromName(const String& channelName);
diff --git a/Source/WebCore/platform/gtk/GamepadsGtk.cpp b/Source/WebCore/platform/gtk/GamepadsGtk.cpp
index 5329116..f8a73f4 100644
--- a/Source/WebCore/platform/gtk/GamepadsGtk.cpp
+++ b/Source/WebCore/platform/gtk/GamepadsGtk.cpp
@@ -30,12 +30,14 @@
 
 #include "GamepadDeviceLinux.h"
 #include "GamepadList.h"
+#include "Logging.h"
 #include <gio/gunixinputstream.h>
 #include <gudev/gudev.h>
 #include <wtf/HashMap.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/gobject/GOwnPtr.h>
 #include <wtf/gobject/GRefPtr.h>
+#include <wtf/text/CString.h>
 #include <wtf/text/StringHash.h>
 
 namespace WebCore {
@@ -138,6 +140,7 @@ GamepadsGtk::~GamepadsGtk()
 
 void GamepadsGtk::registerDevice(String deviceFile)
 {
+    LOG(Gamepad, "GamepadsGtk::registerDevice %s", deviceFile.ascii().data());
     ASSERT(!m_deviceMap.contains(deviceFile));
 
     for (unsigned index = 0; index < m_slots.size(); index++) {
@@ -151,6 +154,7 @@ void GamepadsGtk::registerDevice(String deviceFile)
 
 void GamepadsGtk::unregisterDevice(String deviceFile)
 {
+    LOG(Gamepad, "GamepadsGtk::unregisterDevice %s", deviceFile.ascii().data());
     ASSERT(m_deviceMap.contains(deviceFile));
 
     GamepadDeviceGtk* gamepadDevice = m_deviceMap.take(deviceFile);
-- 
2.7.4