Changeset 80429 in webkit

Timestamp:

Mar 5, 2011 2:32:57 PM (13 years ago)

Author:

Martin Robinson

Message:

2011-03-01 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] Windowless plugins override the view cursor
​https://bugs.webkit.org/show_bug.cgi?id=55531

manual test: manual-tests/plugins/windowless.html

• platform/gtk/WidgetGtk.cpp: (WebCore::Widget::setCursor): Call into the ChromeClient implementation now.
• plugins/gtk/PluginViewGtk.cpp: (WebCore::PluginView::initXEvent): Instead of setting the window for windowless plugin events, set the window value to none. This method is also used to send focus in / focus out events to windowed plugins, but this is not one of the plugin types where the window parameter matters. This matches what Mozilla does. Also pass in the display of the widget itself, not the default display. (WebCore::PluginView::handleMouseEvent): When the cursor leaves the plugin area, reset the cursor. (WebCore::PluginView::platformGetValue): Clean up this section slightly. Give the widget the top-level window explicitly. This matches Mozilla.

2011-03-01 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] Windowless plugins override the view cursor
​https://bugs.webkit.org/show_bug.cgi?id=55531

• WebCoreSupport/ChromeClientGtk.cpp: (WebKit::ChromeClient::setCursor): Moved the implementation of setCursor here which is more fitting since it sets the cursor for the entire window.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/gtk/WidgetGtk.cpp (modified) (1 diff)
• WebCore/plugins/gtk/PluginViewGtk.cpp (modified) (3 diffs)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-01  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Windowless plugins override the view cursor
+        https://bugs.webkit.org/show_bug.cgi?id=55531
+
+        manual test: manual-tests/plugins/windowless.html
+
+        * platform/gtk/WidgetGtk.cpp:
+        (WebCore::Widget::setCursor): Call into the ChromeClient implementation now.
+        * plugins/gtk/PluginViewGtk.cpp:
+        (WebCore::PluginView::initXEvent): Instead of setting the window for windowless
+        plugin events, set the window value to none. This method is also used to send
+        focus in / focus out events to windowed plugins, but this is not one of the plugin
+        types where the window parameter matters. This matches what Mozilla does. Also
+        pass in the display of the widget itself, not the default display.
+        (WebCore::PluginView::handleMouseEvent): When the cursor leaves the plugin area,
+        reset the cursor.
+        (WebCore::PluginView::platformGetValue): Clean up this section slightly. Give the
+        widget the top-level window explicitly. This matches Mozilla.
+
 2011-03-05  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebCore/platform/gtk/WidgetGtk.cpp

@@ -68 +68 @@
 void Widget::setCursor(const Cursor& cursor)
 {
-    GdkCursor* platformCursor = cursor.platformCursor().get();
-
-    // http://bugs.webkit.org/show_bug.cgi?id=16388
-    // [GTK] Widget::setCursor() gets called frequently
-    //
-    // gdk_window_set_cursor() in certain GDK backends seems to be an
-    // expensive operation, so avoid it if possible.
-
-    if (platformCursor == lastSetCursor)
+    ScrollView* view = root();
+    if (!view)
         return;
-
-    gdk_window_set_cursor(gdkWindow(platformWidget()) ? gdkWindow(platformWidget()) : gtk_widget_get_window(GTK_WIDGET(root()->hostWindow()->platformPageClient())), platformCursor);
-    lastSetCursor = platformCursor;
+    view->hostWindow()->setCursor(cursor);
 }
 

trunk/Source/WebCore/plugins/gtk/PluginViewGtk.cpp

@@ -323 +323 @@
     xEvent->xany.serial = 0; // we are unaware of the last request processed by X Server
     xEvent->xany.send_event = false;
-    xEvent->xany.display = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
-    // NOTE: event->xany.window doesn't always correspond to the .window property of other XEvent's
-    // but does in the case of KeyPress, KeyRelease, ButtonPress, ButtonRelease, and MotionNotify
-    // events; thus, this is right:
     GtkWidget* widget = m_parentFrame->view()->hostWindow()->platformPageClient();
-    xEvent->xany.window = widget ? GDK_WINDOW_XWINDOW(gtk_widget_get_window(widget)) : 0;
+    xEvent->xany.display = GDK_DISPLAY_XDISPLAY(gtk_widget_get_display(widget));
+
+    // Mozilla also sends None here for windowless plugins. See nsObjectFrame.cpp in the Mozilla sources.
+    // This method also sets up FocusIn and FocusOut events for windows plugins, but Mozilla doesn't
+    // even send these types of events to windowed plugins. In the future, it may be good to only
+    // send them to windowless plugins.
+    xEvent->xany.window = None;
 }
 
@@ -416 +418 @@
     else if (event->type() == eventNames().mousemoveEvent)
         setXMotionEventSpecificFields(&xEvent, event, postZoomPos, m_parentFrame.get());
-    else if (event->type() == eventNames().mouseoutEvent || event->type() == eventNames().mouseoverEvent)
+    else if (event->type() == eventNames().mouseoutEvent || event->type() == eventNames().mouseoverEvent) {
         setXCrossingEventSpecificFields(&xEvent, event, postZoomPos, m_parentFrame.get());
+
+        // This is a work-around for plugins which change the cursor. When that happens we
+        // get out of sync with GDK somehow. Resetting the cursor here seems to fix the issue.
+        if (event->type() == eventNames().mouseoutEvent)
+            gdk_window_set_cursor(gtk_widget_get_window(m_parentFrame->view()->hostWindow()->platformPageClient()), 0);
+    }
     else
         return;
@@ -650 +658 @@
 
         case NPNVnetscapeWindow: {
-#if defined(XP_UNIX)
-            void* w = reinterpret_cast<void*>(value);
-            GtkWidget* widget = m_parentFrame->view()->hostWindow()->platformPageClient();
-            *((XID *)w) = GDK_WINDOW_XWINDOW(gtk_widget_get_window(widget));
-#endif
-#ifdef GDK_WINDOWING_WIN32
-            HGDIOBJ* w = reinterpret_cast<HGDIOBJ*>(value);
-            GtkWidget* widget = m_parentFrame->view()->hostWindow()->platformPageClient();
-            *w = GDK_WINDOW_HWND(gtk_widget_get_window(widget));
+            GdkWindow* gdkWindow = gtk_widget_get_window(m_parentFrame->view()->hostWindow()->platformPageClient());
+#if defined(XP_UNIX)
+            *static_cast<Window*>(value) = GDK_WINDOW_XWINDOW(gdk_window_get_toplevel(gdkWindow));
+#elif defined(GDK_WINDOWING_WIN32)
+            *static_cast<HGIOBJ*>(value) = GDK_WINDOW_HWND(gdkWindow);
 #endif
             *result = NPERR_NO_ERROR;

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2011-03-01  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Windowless plugins override the view cursor
+        https://bugs.webkit.org/show_bug.cgi?id=55531
+
+        * WebCoreSupport/ChromeClientGtk.cpp:
+        (WebKit::ChromeClient::setCursor): Moved the implementation of setCursor here
+        which is more fitting since it sets the cursor for the entire window.
+
 2011-03-03  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

@@ -653 +653 @@
 }
 
-void ChromeClient::setCursor(const Cursor&)
-{
-    notImplemented();
+void ChromeClient::setCursor(const Cursor& cursor)
+{
+    // [GTK] Widget::setCursor() gets called frequently
+    // http://bugs.webkit.org/show_bug.cgi?id=16388
+    // Setting the cursor may be an expensive operation in some backends,
+    // so don't re-set the cursor if it's already set to the target value.
+    GdkWindow* window = gtk_widget_get_window(platformPageClient());
+    GdkCursor* currentCursor = gdk_window_get_cursor(window);
+    GdkCursor* newCursor = cursor.platformCursor().get();
+    if (currentCursor != newCursor)
+        gdk_window_set_cursor(window, newCursor);
 }