Reviewed by Maciej.
authoraroben <aroben@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Oct 2006 04:38:39 +0000 (04:38 +0000)
committeraroben <aroben@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Oct 2006 04:38:39 +0000 (04:38 +0000)
        (Forgot this in previous checkin)

        Add message paramter to WebView::mouse* methods to pass down to
        PlatformMouseEvent.

        * COM/WebView.cpp:
        (WebView::mouseMoved):
        (WebView::mouseDown):
        (WebView::mouseUp):
        (WebView::mouseDoubleClick):
        (WebViewWndProc):
        * COM/WebView.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16732 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/COM/WebView.cpp
WebKit/COM/WebView.h
WebKit/ChangeLog

index 7d66d0eacb05ae423424f08189b8bd4f1307d2ba..5df05f2efe61829809b4d67e929a3d644ba6ea8b 100644 (file)
@@ -96,27 +96,27 @@ WebView* WebView::createInstance()
     return instance;
 }
 
-void WebView::mouseMoved(WPARAM wParam, LPARAM lParam)
+void WebView::mouseMoved(UINT message, WPARAM wParam, LPARAM lParam)
 {
-    PlatformMouseEvent mouseEvent(m_viewWindow, wParam, lParam);
+    PlatformMouseEvent mouseEvent(m_viewWindow, message, wParam, lParam);
     m_mainFrame->impl()->view()->handleMouseMoveEvent(mouseEvent);
 }
 
-void WebView::mouseDown(WPARAM wParam, LPARAM lParam)
+void WebView::mouseDown(UINT message, WPARAM wParam, LPARAM lParam)
 {
-    PlatformMouseEvent mouseEvent(m_viewWindow, wParam, lParam);
+    PlatformMouseEvent mouseEvent(m_viewWindow, message, wParam, lParam);
     m_mainFrame->impl()->view()->handleMousePressEvent(mouseEvent);
 }
 
-void WebView::mouseUp(WPARAM wParam, LPARAM lParam)
+void WebView::mouseUp(UINT message, WPARAM wParam, LPARAM lParam)
 {
-    PlatformMouseEvent mouseEvent(m_viewWindow, wParam, lParam);
+    PlatformMouseEvent mouseEvent(m_viewWindow, message, wParam, lParam);
     m_mainFrame->impl()->view()->handleMouseReleaseEvent(mouseEvent);
 }
 
-void WebView::mouseDoubleClick(WPARAM wParam, LPARAM lParam)
+void WebView::mouseDoubleClick(UINT message, WPARAM wParam, LPARAM lParam)
 {
-    PlatformMouseEvent mouseEvent(m_viewWindow, wParam, lParam);
+    PlatformMouseEvent mouseEvent(m_viewWindow, message, wParam, lParam);
     m_mainFrame->impl()->view()->handleMouseReleaseEvent(mouseEvent);
 }
 
@@ -220,7 +220,7 @@ static LRESULT CALLBACK WebViewWndProc(HWND hWnd, UINT message, WPARAM wParam, L
             break;
         case WM_MOUSEMOVE:
             if (webView)
-                webView->mouseMoved(wParam, lParam);
+                webView->mouseMoved(message, wParam, lParam);
             break;
         case WM_LBUTTONDOWN:
             // Make ourselves the focused window before doing anything else
@@ -231,19 +231,19 @@ static LRESULT CALLBACK WebViewWndProc(HWND hWnd, UINT message, WPARAM wParam, L
         case WM_MBUTTONDOWN:
         case WM_RBUTTONDOWN:
             if (webView)
-                webView->mouseDown(wParam, lParam);
+                webView->mouseDown(message, wParam, lParam);
             break;
         case WM_LBUTTONUP:
         case WM_MBUTTONUP:
         case WM_RBUTTONUP:
             if (webView)
-                webView->mouseUp(wParam, lParam);
+                webView->mouseUp(message, wParam, lParam);
             break;
         case WM_LBUTTONDBLCLK:
         case WM_MBUTTONDBLCLK:
         case WM_RBUTTONDBLCLK:
             if (webView)
-                webView->mouseDoubleClick(wParam, lParam);
+                webView->mouseDoubleClick(message, wParam, lParam);
             break;
         case WM_HSCROLL: {
             if (mainFrameImpl) {
index d6b3eda469e6d24e8916b32e2401816db83e4a10..9024cfe0a8d5aea142f2be74cf6c896e2b9405f3 100644 (file)
@@ -393,10 +393,10 @@ public:
 
     // WebView
 
-    void mouseMoved(WPARAM, LPARAM);
-    void mouseDown(WPARAM, LPARAM);
-    void mouseUp(WPARAM, LPARAM);
-    void mouseDoubleClick(WPARAM, LPARAM);
+    void mouseMoved(UINT, WPARAM, LPARAM);
+    void mouseDown(UINT, WPARAM, LPARAM);
+    void mouseUp(UINT, WPARAM, LPARAM);
+    void mouseDoubleClick(UINT, WPARAM, LPARAM);
     bool keyPress(WPARAM, LPARAM);
     HRESULT goToItem(IWebHistoryItem* item, WebFrameLoadType withLoadType);
 
index 19df6f663ac3a2781f82d681d3e9de518650ab06..3d58d4176c8152eb08d102126b03dadb594e7c11 100644 (file)
@@ -1,3 +1,18 @@
+2006-10-02  Adam Roben  <aroben@apple.com>
+
+        Reviewed by Maciej.
+
+        Add message paramter to WebView::mouse* methods to pass down to
+        PlatformMouseEvent.
+
+        * COM/WebView.cpp:
+        (WebView::mouseMoved):
+        (WebView::mouseDown):
+        (WebView::mouseUp):
+        (WebView::mouseDoubleClick):
+        (WebViewWndProc):
+        * COM/WebView.h:
+
 2006-10-02  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Alice.