Changeset 87509 in webkit

Timestamp:

May 27, 2011 7:19:07 AM (13 years ago)

Author:

jeffm@apple.com

Message:

2011-05-26 Jeff Miller <​jeffm@apple.com>

Reviewed by Alexey Proskuryakov.

Add a key handling logging channel for WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=61588

Added a new LogKeyHandling channel, and logged some key events in WebPageProxy.
I also fixed a misspelling of coalescing in a comment in WebPageProxy.cpp.

• Platform/Logging.cpp: (WebKit::initializeLogChannelsIfNecessary): Initialize LogKeyHandling channel.
• Platform/Logging.h: Added LogKeyHandling channel.

• UIProcess/WebPageProxy.cpp: Fixed misspelling of coalescing in a comment. (WebKit::webKeyboardEventTypeString): Added to support logging. (WebKit::WebPageProxy::handleKeyboardEvent): Log the keyboard event. (WebKit::WebPageProxy::didReceiveEvent): Log the keyboard event.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/Logging.cpp (modified) (2 diffs)
• Platform/Logging.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (5 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-26  Jeff Miller  <jeffm@apple.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Add a key handling logging channel for WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=61588
+        
+        Added a new LogKeyHandling channel, and logged some key events in WebPageProxy.
+        I also fixed a misspelling of coalescing in a comment in WebPageProxy.cpp.
+
+        * Platform/Logging.cpp:
+        (WebKit::initializeLogChannelsIfNecessary): Initialize LogKeyHandling channel.
+        * Platform/Logging.h: Added LogKeyHandling channel.
+
+        * UIProcess/WebPageProxy.cpp: Fixed misspelling of coalescing in a comment.
+        (WebKit::webKeyboardEventTypeString): Added to support logging.
+        (WebKit::WebPageProxy::handleKeyboardEvent): Log the keyboard event.
+        (WebKit::WebPageProxy::didReceiveEvent): Log the keyboard event.
+
 2011-05-26  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebKit2/Platform/Logging.cpp

@@ -36 +36 @@
 WTFLogChannel LogView         = { 0x00000008, "WebKit2LogLevel", WTFLogChannelOff };
 WTFLogChannel LogIconDatabase = { 0x00000010, "WebKit2LogLevel", WTFLogChannelOff };
+WTFLogChannel LogKeyHandling  = { 0x00000020, "WebKit2LogLevel", WTFLogChannelOff };
 
 #if !PLATFORM(MAC)
@@ -53 +54 @@
     initializeLogChannel(&LogContextMenu);
     initializeLogChannel(&LogIconDatabase);
+    initializeLogChannel(&LogKeyHandling);
     initializeLogChannel(&LogSessionState);
     initializeLogChannel(&LogTextInput);

trunk/Source/WebKit2/Platform/Logging.h

@@ -39 +39 @@
 extern WTFLogChannel LogContextMenu;
 extern WTFLogChannel LogIconDatabase;
+extern WTFLogChannel LogKeyHandling;
 extern WTFLogChannel LogSessionState;
 extern WTFLogChannel LogTextInput;

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -33 +33 @@
 #include "DrawingAreaProxy.h"
 #include "FindIndicator.h"
+#include "Logging.h"
 #include "MessageID.h"
 #include "NativeWebKeyboardEvent.h"
@@ -91 +92 @@
 #endif
 
-// This controls what strategy we use for mouse wheel coalesing.
+// This controls what strategy we use for mouse wheel coalescing.
 #define MERGE_WHEEL_EVENTS 1
 
@@ -105 +106 @@
 static WTF::RefCountedLeakCounter webPageProxyCounter("WebPageProxy");
 #endif
+
+#if !LOG_DISABLED
+static const char* webKeyboardEventTypeString(WebEvent::Type type)
+{
+    switch (type) {
+    case WebEvent::KeyDown:
+        return "KeyDown";
+    
+    case WebEvent::KeyUp:
+        return "KeyUp";
+    
+    case WebEvent::RawKeyDown:
+        return "RawKeyDown";
+    
+    case WebEvent::Char:
+        return "Char";
+    
+    default:
+        ASSERT_NOT_REACHED();
+        return "<unknown>";
+    }
+}
+#endif // !LOG_DISABLED
 
 PassRefPtr<WebPageProxy> WebPageProxy::create(PageClient* pageClient, PassRefPtr<WebProcessProxy> process, WebPageGroup* pageGroup, uint64_t pageID)
@@ -902 +926 @@
     if (!isValid())
         return;
+    
+    LOG(KeyHandling, "WebPageProxy::handleKeyboardEvent: %s", webKeyboardEventTypeString(event.type()));
 
     m_keyEventQueue.append(event);
@@ -2710 +2736 @@
     case WebEvent::RawKeyDown:
     case WebEvent::Char: {
+        LOG(KeyHandling, "WebPageProxy::didReceiveEvent: %s", webKeyboardEventTypeString(type));
+
         NativeWebKeyboardEvent event = m_keyEventQueue.first();
         MESSAGE_CHECK(type == event.type());