Changeset 85860 in webkit

Timestamp:

May 5, 2011 9:57:50 AM (13 years ago)

Author:

jeffm@apple.com

Message:

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

Reviewed by Darin Adler.

Add didNotHandleWheelEvent callback to WKPageUIClient
​https://bugs.webkit.org/show_bug.cgi?id=60203

• MiniBrowser/gtk/BrowserWindow.c: (browserWindowUIClientInit): Stub out didNotHandleWheelEvent callback.
• MiniBrowser/mac/BrowserWindowController.m: (-[BrowserWindowController awakeFromNib]): Stub out didNotHandleWheelEvent callback.
• MiniBrowser/win/BrowserView.cpp: (BrowserView::create): Stub out didNotHandleWheelEvent callback.
• WebKitTestRunner/TestController.cpp: (WTR::TestController::createOtherPage): Stub out didNotHandleWheelEvent callback. (WTR::TestController::initialize): Stub out didNotHandleWheelEvent callback.

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

Reviewed by Darin Adler.

Add didNotHandleWheelEvent callback to WKPageUIClient
​https://bugs.webkit.org/show_bug.cgi?id=60203

Remove Windows-specific WebPageProxy::wheelEventNotHandled() member function and use
didNotHandleWheelEvent callback in WKPageUIClient instead. It turns out that just
resending the wheel event to the parent window doesn't provide the client with enough context
to know that WebKit has already attempted to handle the event.

• UIProcess/API/C/WKPage.h: Added WKPageDidNotHandleWheelEventCallback typedef and didNotHandleWheelEvent to WKPageUIClient.

• UIProcess/API/gtk/PageClientImpl.cpp: (WebKit::PageClientImpl::didNotHandleWheelEvent): Added, but not implemented.
• UIProcess/API/gtk/PageClientImpl.h: Added didNotHandleWheelEvent().
• UIProcess/API/qt/qwkpage.cpp: (QWKPage::QWKPage):Stubbed out didNotHandleWheelEvent callback.

• UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::didReceiveEvent): Call didNotHandleWheelEvent in WKPageUIClient if wheel event is not handled.
• UIProcess/WebPageProxy.h: Removed wheelEventNotHandled().

• UIProcess/WebUIClient.cpp: (WebKit::WebUIClient::implementsDidNotHandleWheelEvent): Added. (WebKit::WebUIClient::didNotHandleWheelEvent): Added.
• UIProcess/WebUIClient.h: Added implementsDidNotHandleWheelEvent() and didNotHandleWheelEvent().

• UIProcess/win/WebPageProxyWin.cpp: Removed wheelEventNotHandled().

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/WKPage.h (modified) (2 diffs)
• Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (modified) (1 diff)
• Source/WebKit2/UIProcess/API/qt/qwkpage.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/WebPageProxy.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/WebPageProxy.h (modified) (1 diff)
• Source/WebKit2/UIProcess/WebUIClient.cpp (modified) (2 diffs)
• Source/WebKit2/UIProcess/WebUIClient.h (modified) (2 diffs)
• Source/WebKit2/UIProcess/win/WebPageProxyWin.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/MiniBrowser/gtk/BrowserWindow.c (modified) (1 diff)
• Tools/MiniBrowser/mac/BrowserWindowController.m (modified) (1 diff)
• Tools/MiniBrowser/win/BrowserView.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/TestController.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-05  Jeff Miller  <jeffm@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Add didNotHandleWheelEvent callback to WKPageUIClient
+        https://bugs.webkit.org/show_bug.cgi?id=60203
+        
+        Remove Windows-specific WebPageProxy::wheelEventNotHandled() member function and use
+        didNotHandleWheelEvent callback in WKPageUIClient instead.  It turns out that just
+        resending the wheel event to the parent window doesn't provide the client with enough context
+        to know that WebKit has already attempted to handle the event.
+
+        * UIProcess/API/C/WKPage.h: Added WKPageDidNotHandleWheelEventCallback typedef and didNotHandleWheelEvent to WKPageUIClient.
+
+        * UIProcess/API/gtk/PageClientImpl.cpp:
+        (WebKit::PageClientImpl::didNotHandleWheelEvent): Added, but not implemented.
+        * UIProcess/API/gtk/PageClientImpl.h: Added didNotHandleWheelEvent().
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPage::QWKPage):Stubbed out didNotHandleWheelEvent callback.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::didReceiveEvent): Call didNotHandleWheelEvent in WKPageUIClient if wheel event is not handled.
+        * UIProcess/WebPageProxy.h: Removed wheelEventNotHandled().
+        
+        * UIProcess/WebUIClient.cpp:
+        (WebKit::WebUIClient::implementsDidNotHandleWheelEvent): Added.
+        (WebKit::WebUIClient::didNotHandleWheelEvent): Added.
+        * UIProcess/WebUIClient.h: Added implementsDidNotHandleWheelEvent() and didNotHandleWheelEvent().
+
+        * UIProcess/win/WebPageProxyWin.cpp: Removed wheelEventNotHandled().
+
 2011-05-05  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/UIProcess/API/C/WKPage.h

@@ -164 +164 @@
 typedef void (*WKPageMissingPluginButtonClickedCallback)(WKPageRef page, WKStringRef mimeType, WKStringRef url, WKStringRef pluginsPageURL, const void* clientInfo);
 typedef void (*WKPageDidNotHandleKeyEventCallback)(WKPageRef page, WKNativeEventPtr event, const void *clientInfo);
+typedef void (*WKPageDidNotHandleWheelEventCallback)(WKPageRef page, WKNativeEventPtr event, const void *clientInfo);
 typedef bool (*WKPageGetToolbarsAreVisibleCallback)(WKPageRef page, const void *clientInfo);
 typedef void (*WKPageSetToolbarsAreVisibleCallback)(WKPageRef page, bool toolbarsVisible, const void *clientInfo);
@@ -203 +204 @@
     WKPageMissingPluginButtonClickedCallback                            missingPluginButtonClicked;
     WKPageDidNotHandleKeyEventCallback                                  didNotHandleKeyEvent;
+    WKPageDidNotHandleWheelEventCallback                                didNotHandleWheelEvent;
     WKPageGetToolbarsAreVisibleCallback                                 toolbarsAreVisible;
     WKPageSetToolbarsAreVisibleCallback                                 setToolbarsAreVisible;

trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp

@@ -427 +427 @@
 }
 
+void PageClientImpl::didNotHandleWheelEvent(const NativeWebWheelEvent&)
+{
+    notImplemented();
+}
+
 PassRefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy*)
 {

trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h

@@ -78 +78 @@
     virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled);
     virtual void didNotHandleKeyEvent(const NativeWebKeyboardEvent&);
+    virtual void didNotHandleWheelEvent(const NativeWebWhellboardEvent&);
     virtual PassRefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*);
     virtual PassRefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*);

trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp

@@ -478 +478 @@
         0,  /* missingPluginButtonClicked */
         0,  /* didNotHandleKeyEvent */
+        0,  /* didNotHandleWheelEvent */
         0,  /* toolbarsAreVisible */
         0,  /* setToolbarsAreVisible */

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -2628 +2628 @@
         ASSERT(m_currentlyProcessedWheelEvent);
 
-#if PLATFORM(WIN)
-        if (!handled && m_currentlyProcessedWheelEvent)
-            wheelEventNotHandled(*m_currentlyProcessedWheelEvent);
-#endif
+        if (!handled && m_currentlyProcessedWheelEvent && m_uiClient.implementsDidNotHandleWheelEvent())
+            m_uiClient.didNotHandleWheelEvent(this, *m_currentlyProcessedWheelEvent);
 
         m_currentlyProcessedWheelEvent = nullptr;

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -693 +693 @@
     void stopResponsivenessTimer();
 
-#if PLATFORM(WIN)
-    void wheelEventNotHandled(NativeWebWheelEvent&) const;
-#endif
-
     void voidCallback(uint64_t);
     void dataCallback(const CoreIPC::DataReference&, uint64_t);

trunk/Source/WebKit2/UIProcess/WebUIClient.cpp

@@ -29 +29 @@
 #include "ImmutableDictionary.h"
 #include "NativeWebKeyboardEvent.h"
+#include "NativeWebWheelEvent.h"
 #include "WKAPICast.h"
 #include "WebNumber.h"
@@ -176 +177 @@
 }
 
+bool WebUIClient::implementsDidNotHandleWheelEvent() const
+{
+    return m_client.didNotHandleWheelEvent;
+}
+
+void WebUIClient::didNotHandleWheelEvent(WebPageProxy* page, const NativeWebWheelEvent& event)
+{
+    if (!m_client.didNotHandleWheelEvent)
+        return;
+    m_client.didNotHandleWheelEvent(toAPI(page), event.nativeEvent(), m_client.clientInfo);
+}
+
 bool WebUIClient::toolbarsAreVisible(WebPageProxy* page)
 {

trunk/Source/WebKit2/UIProcess/WebUIClient.h

@@ -45 +45 @@
 class GeolocationPermissionRequestProxy;
 class NativeWebKeyboardEvent;
+class NativeWebWheelEvent;
 class WebData;
 class WebFrameProxy;
@@ -71 +72 @@
     bool implementsDidNotHandleKeyEvent() const;
     void didNotHandleKeyEvent(WebPageProxy*, const NativeWebKeyboardEvent&);
+
+    bool implementsDidNotHandleWheelEvent() const;
+    void didNotHandleWheelEvent(WebPageProxy*, const NativeWebWheelEvent&);
 
     bool toolbarsAreVisible(WebPageProxy*);

trunk/Source/WebKit2/UIProcess/win/WebPageProxyWin.cpp

@@ -27 +27 @@
 #include "WebPageProxy.h"
 
-#include "NativeWebWheelEvent.h"
 #include "PageClient.h"
 #include "WebPopupMenuProxyWin.h"
@@ -77 +76 @@
 }
 
-void WebPageProxy::wheelEventNotHandled(NativeWebWheelEvent& event) const
-{
-    const MSG* msg = event.nativeEvent();
-    ::PostMessage(::GetParent(nativeWindow()), msg->message, msg->wParam, msg->lParam);
-}
-
 } // namespace WebKit

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-05  Jeff Miller  <jeffm@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Add didNotHandleWheelEvent callback to WKPageUIClient
+        https://bugs.webkit.org/show_bug.cgi?id=60203
+
+        * MiniBrowser/gtk/BrowserWindow.c:
+        (browserWindowUIClientInit): Stub out didNotHandleWheelEvent callback.
+        * MiniBrowser/mac/BrowserWindowController.m:
+        (-[BrowserWindowController awakeFromNib]): Stub out didNotHandleWheelEvent callback.
+        * MiniBrowser/win/BrowserView.cpp:
+        (BrowserView::create): Stub out didNotHandleWheelEvent callback.
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::createOtherPage): Stub out didNotHandleWheelEvent callback.
+        (WTR::TestController::initialize): Stub out didNotHandleWheelEvent callback.
+
 2011-05-04  Eric Seidel  <eric@webkit.org>
 

trunk/Tools/MiniBrowser/gtk/BrowserWindow.c

@@ -423 +423 @@
         0,      /* missingPluginButtonClicked */
         0,      /* didNotHandleKeyEvent */
+        0,      /* didNotHandleWheelEvent */
         0,      /* toolbarsAreVisible */
         0,      /* setToolbarsAreVisible */

trunk/Tools/MiniBrowser/mac/BrowserWindowController.m

@@ -630 +630 @@
         0,          /* missingPluginButtonClicked */
         0,          /* didNotHandleKeyEvent */
+        0,          /* didNotHandleWheelEvent */
         0,          /* toolbarsAreVisible */
         0,          /* setToolbarsAreVisible */

trunk/Tools/MiniBrowser/win/BrowserView.cpp

@@ -108 +108 @@
         mouseDidMoveOverElement,
         0,          /* didNotHandleKeyEvent */
+        0,          /* didNotHandleWheelEvent */
         0,          /* toolbarsAreVisible */
         0,          /* setToolbarsAreVisible */

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -152 +152 @@
         0, // missingPluginButtonClicked
         0, // didNotHandleKeyEvent
+        0, // didNotHandleWheelEvent
         0, // toolbarsAreVisible
         0, // setToolbarsAreVisible
@@ -294 +295 @@
         0, // missingPluginButtonClicked
         0, // didNotHandleKeyEvent
+        0, // didNotHandleWheelEvent
         0, // toolbarsAreVisible
         0, // setToolbarsAreVisible