Changeset 199810 in webkit

Timestamp:

Apr 21, 2016 3:50:59 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] WebKitWebView should propagate wheel events not handled by the web process
​https://bugs.webkit.org/show_bug.cgi?id=156834

Reviewed by Žan Doberšek.

We are currently swallowing all wheel events unconditionally, not allowing applications to handle wheel events
when not handled by us. Since the GTK+ event propagation system is synchronous, and our events are handled
asynchronously, we need to do something similar to what we do for key events, not propagate the event the first
time and if not handled by the web process, re-inject it in the event loop and then just propagate it.

• Shared/NativeWebWheelEvent.h:

(WebKit::NativeWebWheelEvent::nativeEvent): Remove useless const.

• UIProcess/API/gtk/PageClientImpl.cpp:

(WebKit::PageClientImpl::wheelEventWasNotHandledByWebCore): Tell the web view to propagate the next wheel event,
and re-inject the event not handled by the web process in the event loop.

• UIProcess/API/gtk/PageClientImpl.h:
• UIProcess/API/gtk/WebKitWebViewBase.cpp:

(webkitWebViewBaseScrollEvent): Propagate the event if shouldForwardNextWheelEvent is true.
(webkitWebViewBaseForwardNextWheelEvent): Set shouldForwardNextWheelEvent to true.

• UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
• UIProcess/PageClient.h:
• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::didReceiveEvent): Remove ifdef.

• UIProcess/efl/WebView.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/NativeWebWheelEvent.h (modified) (1 diff)
• UIProcess/API/gtk/PageClientImpl.cpp (modified) (2 diffs)
• UIProcess/API/gtk/PageClientImpl.h (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebViewBase.cpp (modified) (3 diffs)
• UIProcess/API/gtk/WebKitWebViewBasePrivate.h (modified) (1 diff)
• UIProcess/PageClient.h (modified) (2 diffs)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/efl/WebView.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-04-21  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] WebKitWebView should propagate wheel events not handled by the web process
+        https://bugs.webkit.org/show_bug.cgi?id=156834
+
+        Reviewed by Žan Doberšek.
+
+        We are currently swallowing all wheel events unconditionally, not allowing applications to handle wheel events
+        when not handled by us. Since the GTK+ event propagation system is synchronous, and our events are handled
+        asynchronously, we need to do something similar to what we do for key events, not propagate the event the first
+        time and if not handled by the web process, re-inject it in the event loop and then just propagate it.
+
+        * Shared/NativeWebWheelEvent.h:
+        (WebKit::NativeWebWheelEvent::nativeEvent): Remove useless const.
+        * UIProcess/API/gtk/PageClientImpl.cpp:
+        (WebKit::PageClientImpl::wheelEventWasNotHandledByWebCore): Tell the web view to propagate the next wheel event,
+        and re-inject the event not handled by the web process in the event loop.
+        * UIProcess/API/gtk/PageClientImpl.h:
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkitWebViewBaseScrollEvent): Propagate the event if shouldForwardNextWheelEvent is true.
+        (webkitWebViewBaseForwardNextWheelEvent): Set shouldForwardNextWheelEvent to true.
+        * UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
+        * UIProcess/PageClient.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::didReceiveEvent): Remove ifdef.
+        * UIProcess/efl/WebView.h:
+
 2016-04-20  Dustin Falgout  <dustin@falgout.us>
 

trunk/Source/WebKit2/Shared/NativeWebWheelEvent.h

@@ -60 +60 @@
     NSEvent* nativeEvent() const { return m_nativeEvent.get(); }
 #elif PLATFORM(GTK)
-    const GdkEvent* nativeEvent() const { return m_nativeEvent.get(); }
+    GdkEvent* nativeEvent() const { return m_nativeEvent.get(); }
 #elif PLATFORM(EFL)
     const Evas_Event_Mouse_Wheel* nativeEvent() const { return m_nativeEvent; }

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

@@ -32 +32 @@
 #include "NativeWebKeyboardEvent.h"
 #include "NativeWebMouseEvent.h"
+#include "NativeWebWheelEvent.h"
 #include "NotImplemented.h"
 #include "WebColorPickerGtk.h"
@@ -378 +379 @@
 #endif // ENABLE(TOUCH_EVENTS)
 
+void PageClientImpl::wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent& event)
+{
+    webkitWebViewBaseForwardNextWheelEvent(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
+    gtk_main_do_event(event.nativeEvent());
+}
+
 void PageClientImpl::didFinishLoadingDataForCustomContentProvider(const String&, const IPC::DataReference&)
 {

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

@@ -132 +132 @@
 #endif
 
+    void wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent&) override;
+
     void didChangeBackgroundColor() override;
 

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

@@ -178 +178 @@
     RefPtr<WebPageProxy> pageProxy;
     bool shouldForwardNextKeyEvent;
+    bool shouldForwardNextWheelEvent;
     ClickCounter clickCounter;
     CString tooltipText;
@@ -854 +855 @@
     WebKitWebViewBasePrivate* priv = webViewBase->priv;
 
+    if (std::exchange(priv->shouldForwardNextWheelEvent, false))
+        return FALSE;
+
     if (priv->authenticationDialog)
-        return TRUE;
+        return FALSE;
 
     priv->pageProxy->handleWheelEvent(NativeWebWheelEvent(reinterpret_cast<GdkEvent*>(event)));
@@ -1284 +1288 @@
 }
 
+void webkitWebViewBaseForwardNextWheelEvent(WebKitWebViewBase* webkitWebViewBase)
+{
+    webkitWebViewBase->priv->shouldForwardNextWheelEvent = true;
+}
+
 #if ENABLE(FULLSCREEN_API)
 static void screenSaverInhibitedCallback(GDBusProxy* screenSaverProxy, GAsyncResult* result, WebKitWebViewBase* webViewBase)

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

@@ -45 +45 @@
 void webkitWebViewBaseSetTooltipArea(WebKitWebViewBase*, const WebCore::IntRect&);
 void webkitWebViewBaseForwardNextKeyEvent(WebKitWebViewBase*);
+void webkitWebViewBaseForwardNextWheelEvent(WebKitWebViewBase*);
 void webkitWebViewBaseChildMoveResize(WebKitWebViewBase*, GtkWidget*, const WebCore::IntRect&);
 void webkitWebViewBaseEnterFullScreen(WebKitWebViewBase*);

trunk/Source/WebKit2/UIProcess/PageClient.h

@@ -169 +169 @@
     virtual bool canUndoRedo(WebPageProxy::UndoOrRedo) = 0;
     virtual void executeUndoRedo(WebPageProxy::UndoOrRedo) = 0;
+    virtual void wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent&) = 0;
 #if PLATFORM(COCOA)
     virtual void accessibilityWebProcessTokenReceived(const IPC::DataReference&) = 0;
@@ -180 +181 @@
     virtual LayerOrView *acceleratedCompositingRootLayer() const = 0;
     virtual PassRefPtr<ViewSnapshot> takeViewSnapshot() = 0;
-    virtual void wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent&) = 0;
 #if ENABLE(MAC_GESTURE_EVENTS)
     virtual void gestureEventWasNotHandledByWebCore(const NativeWebGestureEvent&) = 0;

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -4647 +4647 @@
             if (m_uiClient->implementsDidNotHandleWheelEvent())
                 m_uiClient->didNotHandleWheelEvent(this, oldestCoalescedEvent->last());
-#if PLATFORM(COCOA)
             m_pageClient.wheelEventWasNotHandledByWebCore(oldestCoalescedEvent->last());
-#endif
         }
 

trunk/Source/WebKit2/UIProcess/efl/WebView.h

@@ -208 +208 @@
     void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled) override;
 #endif
+    void wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent&) override { }
 
     RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) override;