Changeset 91937 in webkit

Timestamp:

Jul 28, 2011 10:24:47 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Pass the key_press_event or key_release_event to parent widget when it is not handled by Web Process.
(​https://bugs.webkit.org/show_bug.cgi?id=64790)

Patch by Ravi Phaneendra Kasibhatla <​ravi.kasibhatla@motorola.com> on 2011-07-28
Reviewed by Martin Robinson.

• Shared/NativeWebKeyboardEvent.h:

(WebKit::NativeWebKeyboardEvent::nativeEvent): Return a GdkEvent* instead of const GdkEvent* (non-const).

• UIProcess/API/gtk/PageClientImpl.cpp:

(WebKit::PageClientImpl::doneWithKeyEvent): Implemented for GTK port. Sets flag if the keyboard event
needs to be passed to the parent widget. Invoke gtk_main_do_event() if event needs to be passed to parent.

• UIProcess/API/gtk/PageClientImpl.h: Deleted obsolete functions didNotHandleKeyEvent & didNotHandleWheelEvent.
• UIProcess/API/gtk/WebKitWebViewBase.cpp:

(webkit_web_view_base_init): Initialize shouldForwardNextKeyEvent flag.
(webkitWebViewBaseKeyPressEvent): Pass event to parent widget depending on status from doneWithKeyEvent.
(webkitWebViewBaseKeyReleaseEvent): Pass event to parent widget depending on status from doneWithKeyEvent.
(webkitWebViewBaseForwardNextKeyEvent): API to set flag shouldForwardNextKeyEvent.

• UIProcess/API/gtk/WebKitWebViewBasePrivate.h: Added API to set shouldForwardNextKeyEvent flag.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/NativeWebKeyboardEvent.h (modified) (1 diff)
• UIProcess/API/gtk/PageClientImpl.cpp (modified) (1 diff)
• UIProcess/API/gtk/PageClientImpl.h (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebViewBase.cpp (modified) (5 diffs)
• UIProcess/API/gtk/WebKitWebViewBasePrivate.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-07-28  Ravi Phaneendra Kasibhatla  <ravi.kasibhatla@motorola.com>
+
+        Pass the key_press_event or key_release_event to parent widget when it is not handled by Web Process.
+        (https://bugs.webkit.org/show_bug.cgi?id=64790)
+
+        Reviewed by Martin Robinson.
+
+        * Shared/NativeWebKeyboardEvent.h:
+        (WebKit::NativeWebKeyboardEvent::nativeEvent): Return a GdkEvent* instead of const GdkEvent* (non-const).
+        * UIProcess/API/gtk/PageClientImpl.cpp:
+        (WebKit::PageClientImpl::doneWithKeyEvent): Implemented for GTK port. Sets flag if the keyboard event 
+        needs to be passed to the parent widget. Invoke gtk_main_do_event() if event needs to be passed to parent.
+        * UIProcess/API/gtk/PageClientImpl.h: Deleted obsolete functions didNotHandleKeyEvent & didNotHandleWheelEvent.
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkit_web_view_base_init): Initialize shouldForwardNextKeyEvent flag.
+        (webkitWebViewBaseKeyPressEvent): Pass event to parent widget depending on status from doneWithKeyEvent. 
+        (webkitWebViewBaseKeyReleaseEvent): Pass event to parent widget depending on status from doneWithKeyEvent.
+        (webkitWebViewBaseForwardNextKeyEvent): API to set flag shouldForwardNextKeyEvent.
+        * UIProcess/API/gtk/WebKitWebViewBasePrivate.h: Added API to set shouldForwardNextKeyEvent flag.
+
 2011-07-28  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/Shared/NativeWebKeyboardEvent.h

@@ -68 +68 @@
     const QKeyEvent* nativeEvent() const { return &m_nativeEvent; }
 #elif PLATFORM(GTK)
-    const GdkEvent* nativeEvent() const { return m_nativeEvent.get(); }
+    GdkEvent* nativeEvent() const { return m_nativeEvent.get(); }
 #elif PLATFORM(EFL)
     const void* nativeEvent() const { return m_nativeEvent; }

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

@@ -206 +206 @@
 }
 
-void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled)
-{
-    notImplemented();
-}
-
-void PageClientImpl::didNotHandleKeyEvent(const NativeWebKeyboardEvent& event)
-{
-    notImplemented();
-}
-
-void PageClientImpl::didNotHandleWheelEvent(const NativeWebWheelEvent&)
-{
-    notImplemented();
+void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool wasEventHandled)
+{
+    if (wasEventHandled)
+        return;
+
+    WebKitWebViewBase* webkitWebViewBase = WEBKIT_WEB_VIEW_BASE(m_viewWidget);
+    webkitWebViewBaseForwardNextKeyEvent(webkitWebViewBase);
+    gtk_main_do_event(event.nativeEvent());
 }
 

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

@@ -80 +80 @@
     virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&);
     virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled);
-    virtual void didNotHandleKeyEvent(const NativeWebKeyboardEvent&);
-    virtual void didNotHandleWheelEvent(const NativeWebWheelEvent&);
     virtual PassRefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*);
     virtual PassRefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*);

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

@@ -54 +54 @@
     RefPtr<WebPageProxy> pageProxy;
     gboolean isPageActive;
+    gboolean shouldForwardNextKeyEvent;
     GtkIMContext* imContext;
     GtkClickCounter clickCounter;
@@ -130 +131 @@
 
     priv->isPageActive = TRUE;
+    priv->shouldForwardNextKeyEvent = FALSE;
 
     gtk_widget_set_double_buffered(GTK_WIDGET(webkitWebViewBase), FALSE);
@@ -201 +203 @@
     WebKitWebViewBasePrivate* priv = webViewBase->priv;
 
+    // Since WebProcess key event handling is not synchronous, handle the event in two passes.
+    // When WebProcess processes the input event, it will call PageClientImpl::doneWithKeyEvent 
+    // with event handled status which determines whether to pass the input event to parent or not 
+    // using gtk_main_do_event().
+    if (priv->shouldForwardNextKeyEvent) {
+        priv->shouldForwardNextKeyEvent = FALSE;
+        return GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->key_press_event(widget, event);
+    }
     priv->pageProxy->handleKeyboardEvent(NativeWebKeyboardEvent(reinterpret_cast<GdkEvent*>(event)));
-
-    return GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->key_press_event(widget, event);
+    return TRUE;
 }
 
@@ -214 +223 @@
         return TRUE;
 
+    if (priv->shouldForwardNextKeyEvent) {
+        priv->shouldForwardNextKeyEvent = FALSE;
+        return GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->key_release_event(widget, event);
+    }
     priv->pageProxy->handleKeyboardEvent(NativeWebKeyboardEvent(reinterpret_cast<GdkEvent*>(event)));
-
-    return GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->key_release_event(widget, event);
+    return TRUE;
 }
 
@@ -344 +356 @@
 }
 
-
+void webkitWebViewBaseForwardNextKeyEvent(WebKitWebViewBase* webkitWebViewBase)
+{
+    webkitWebViewBase->priv->shouldForwardNextKeyEvent = TRUE;
+}

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

@@ -47 +47 @@
 void webkitWebViewBaseSetTooltipText(WebKitWebViewBase*, const char*);
 
+void webkitWebViewBaseForwardNextKeyEvent(WebKitWebViewBase*);
+
 G_END_DECLS