Changeset 64050 in webkit

Timestamp:

Jul 26, 2010 10:03:31 AM (14 years ago)

Author:

andersca@apple.com

Message:

Clean up event handling functions
​https://bugs.webkit.org/show_bug.cgi?id=42977

Reviewed by Sam Weinig.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::mouseEvent):
(WebKit::WebPage::wheelEvent):
(WebKit::WebPage::keyEvent):
(WebKit::WebPage::didReceiveMessage):

• WebProcess/WebPage/WebPage.h:

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (5 diffs)
• WebProcess/WebPage/WebPage.h (modified) (3 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-07-26  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Clean up event handling functions
+        https://bugs.webkit.org/show_bug.cgi?id=42977
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::mouseEvent):
+        (WebKit::WebPage::wheelEvent):
+        (WebKit::WebPage::keyEvent):
+        (WebKit::WebPage::didReceiveMessage):
+        * WebProcess/WebPage/WebPage.h:
+
 2010-07-25  Darin Adler  <darin@apple.com>
 

trunk/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -278 +278 @@
 // Events 
 
-void WebPage::mouseEvent(const PlatformMouseEvent& event)
-{
+void WebPage::mouseEvent(const WebMouseEvent& mouseEvent)
+{
+    WebProcess::shared().connection()->send(WebPageProxyMessage::DidReceiveEvent, m_pageID, CoreIPC::In(static_cast<uint32_t>(mouseEvent.type())));
+
     if (!m_mainFrame->coreFrame()->view())
         return;
 
-    switch (event.eventType()) {
+    PlatformMouseEvent platformMouseEvent = platform(mouseEvent);
+    
+    switch (platformMouseEvent.eventType()) {
         case WebCore::MouseEventPressed:
-            m_mainFrame->coreFrame()->eventHandler()->handleMousePressEvent(event);
+            m_mainFrame->coreFrame()->eventHandler()->handleMousePressEvent(platformMouseEvent);
             break;
         case WebCore::MouseEventReleased:
-            m_mainFrame->coreFrame()->eventHandler()->handleMouseReleaseEvent(event);
+            m_mainFrame->coreFrame()->eventHandler()->handleMouseReleaseEvent(platformMouseEvent);
             break;
         case WebCore::MouseEventMoved:
-            m_mainFrame->coreFrame()->eventHandler()->mouseMoved(event);
+            m_mainFrame->coreFrame()->eventHandler()->mouseMoved(platformMouseEvent);
             break;
         default:
@@ -299 +303 @@
 }
 
-void WebPage::wheelEvent(PlatformWheelEvent& event)
-{
+void WebPage::wheelEvent(const WebWheelEvent& wheelEvent)
+{
+    WebProcess::shared().connection()->send(WebPageProxyMessage::DidReceiveEvent, m_pageID, CoreIPC::In(static_cast<uint32_t>(wheelEvent.type())));
     if (!m_mainFrame->coreFrame()->view())
         return;
 
-    m_mainFrame->coreFrame()->eventHandler()->handleWheelEvent(event);
-}
-
-void WebPage::keyEvent(const PlatformKeyboardEvent& event)
-{
+    PlatformWheelEvent platformWheelEvent = platform(wheelEvent);
+    m_mainFrame->coreFrame()->eventHandler()->handleWheelEvent(platformWheelEvent);
+}
+
+void WebPage::keyEvent(const WebKeyboardEvent& keyboardEvent)
+{
+    WebProcess::shared().connection()->send(WebPageProxyMessage::DidReceiveEvent, m_pageID, CoreIPC::In(static_cast<uint32_t>(keyboardEvent.type())));
+
     if (!m_mainFrame->coreFrame()->view())
         return;
 
-    m_page->focusController()->focusedOrMainFrame()->eventHandler()->keyEvent(event);
+    PlatformKeyboardEvent platformKeyboardEvent = platform(keyboardEvent);
+    m_page->focusController()->focusedOrMainFrame()->eventHandler()->keyEvent(platformKeyboardEvent);
 }
 
@@ -441 +450 @@
             if (!arguments.decode(event))
                 return;
-            connection->send(WebPageProxyMessage::DidReceiveEvent, m_pageID, CoreIPC::In((uint32_t)event.type()));
-            PlatformMouseEvent platformEvent = platform(event);
-            mouseEvent(platformEvent);
+            mouseEvent(event);
             return;
         }
@@ -458 +465 @@
             if (!arguments.decode(event))
                 return;
-            connection->send(WebPageProxyMessage::DidReceiveEvent, m_pageID, CoreIPC::In((uint32_t)event.type()));
-            PlatformWheelEvent platformEvent = platform(event);
-            wheelEvent(platformEvent);
+
+            wheelEvent(event);
             return;
         }
@@ -467 +473 @@
             if (!arguments.decode(event))
                 return;
-            connection->send(WebPageProxyMessage::DidReceiveEvent, m_pageID, CoreIPC::In((uint32_t)event.type()));
-            PlatformKeyboardEvent platformEvent = platform(event);
-            keyEvent(platformEvent);
+
+            keyEvent(event);
             return;
         }

trunk/WebKit2/WebProcess/WebPage/WebPage.h

@@ -49 +49 @@
     class KeyboardEvent;
     class Page;
-    class PlatformKeyboardEvent;
-    class PlatformMouseEvent;
-    class PlatformWheelEvent;
     class String;
 }
@@ -59 +56 @@
 class DrawingArea;
 class WebFrame;
+class WebKeyboardEvent;
+class WebMouseEvent;
+class WebWheelEvent;
 struct WebPreferencesStore;
 
@@ -127 +127 @@
     void setFocused(bool);
     void setIsInWindow(bool);
-    void mouseEvent(const WebCore::PlatformMouseEvent&);
-    void wheelEvent(WebCore::PlatformWheelEvent&);
-    void keyEvent(const WebCore::PlatformKeyboardEvent&);
+    void mouseEvent(const WebMouseEvent&);
+    void wheelEvent(const WebWheelEvent&);
+    void keyEvent(const WebKeyboardEvent&);
     void runJavaScriptInMainFrame(const WebCore::String&, uint64_t callbackID);
     void getRenderTreeExternalRepresentation(uint64_t callbackID);