Changeset 107249 in webkit

Timestamp:

Feb 9, 2012 8:38:52 AM (12 years ago)

Author:

Martin Robinson

Message:

[GTK] Embedded GtkWidgets are not drawn
​https://bugs.webkit.org/show_bug.cgi?id=63451

Source/WebCore:

Remove widget from it's parent container when GtkPluginWidget is destroyed.
Remove paint() method because real expose even is used for drawing child widgets now.

Patch by Dan Vrátil <​dvratil@redhat.com>, Milan Crha <​mcrha@redhat.com> on 2012-02-08
Reviewed by Martin Robinson.

• platform/gtk/GtkPluginWidget.cpp:

(WebCore::GtkPluginWidget::~GtkPluginWidget):
(WebCore):

• platform/gtk/GtkPluginWidget.h:

(GtkPluginWidget):

Source/WebKit/gtk:

Insert plugin widgets to WebKitWebView container as it's children.
Chain up to parent in webkit_web_view_draw() to ensure the child widgets are drawn.

Patch by Dan Vrátil <​dvratil@redhat.com>, Milan Crha <​mcrha@redhat.com> on 2012-02-08
Reviewed by Martin Robinson.

• WebCoreSupport/FrameLoaderClientGtk.cpp:

(WebKit::FrameLoaderClient::createPlugin):

• webkit/webkitwebview.cpp:

(webkit_web_view_draw):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/gtk/GtkPluginWidget.cpp (modified) (2 diffs)
• WebCore/platform/gtk/GtkPluginWidget.h (modified) (1 diff)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (modified) (1 diff)
• WebKit/gtk/webkit/webkitwebview.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-08  Dan Vrátil  <dvratil@redhat.com>, Milan Crha <mcrha@redhat.com>
+
+        [GTK] Embedded GtkWidgets are not drawn
+        https://bugs.webkit.org/show_bug.cgi?id=63451
+
+        Remove widget from it's parent container when GtkPluginWidget is destroyed.
+        Remove paint() method because real expose even is used for drawing child widgets now.
+
+        Reviewed by Martin Robinson.
+
+        * platform/gtk/GtkPluginWidget.cpp:
+        (WebCore::GtkPluginWidget::~GtkPluginWidget):
+        (WebCore):
+        * platform/gtk/GtkPluginWidget.h:
+        (GtkPluginWidget):
+
 2012-02-09  Arun Patole  <arun.patole@motorola.com>
 

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

@@ -42 +42 @@
 }
 
+GtkPluginWidget::~GtkPluginWidget()
+{
+    gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(platformWidget())), platformWidget());
+}
+
 void GtkPluginWidget::invalidateRect(const IntRect& coreRect)
 {
@@ -67 +72 @@
 }
 
-void GtkPluginWidget::paint(GraphicsContext* context, const IntRect& rect)
-{
-    if (!context->gdkExposeEvent())
-        return;
-
-    /* only paint widgets with no window this way */
-    if (gtk_widget_get_has_window(platformWidget()))
-        return;
-
-    GtkWidget* widget = platformWidget();
-    ASSERT(!gtk_widget_get_has_window(widget));
-
-    GdkEvent* event = gdk_event_new(GDK_EXPOSE);
-    event->expose = *context->gdkExposeEvent();
-    event->expose.area = static_cast<GdkRectangle>(rect);
-
-    IntPoint loc = parent()->contentsToWindow(rect.location());
-
-    event->expose.area.x = loc.x();
-    event->expose.area.y = loc.y();
-
-#ifdef GTK_API_VERSION_2
-    event->expose.region = gdk_region_rectangle(&event->expose.area);
-#else
-    event->expose.region = cairo_region_create_rectangle(&event->expose.area);
-#endif
-
-    /*
-     * This will be unref'ed by gdk_event_free.
-     */
-    g_object_ref(event->expose.window);
-
-    /*
-     * If we are going to paint do the translation and GtkAllocation manipulation.
-     */
-#ifdef GTK_API_VERSION_2
-    if (!gdk_region_empty(event->expose.region))
-#else
-    if (!cairo_region_is_empty(event->expose.region))
-#endif
-        gtk_widget_send_expose(widget, event);
-
-    gdk_event_free(event);
 }
-
-}

trunk/Source/WebCore/platform/gtk/GtkPluginWidget.h

@@ -34 +34 @@
     public:
         GtkPluginWidget(GtkWidget*);
+        virtual ~GtkPluginWidget();
         void invalidateRect(const IntRect&);
         void frameRectsChanged();
-        void paint(GraphicsContext*, const IntRect&);
     };
 }

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2012-02-08  Dan Vrátil  <dvratil@redhat.com>, Milan Crha <mcrha@redhat.com>
+
+        [GTK] Embedded GtkWidgets are not drawn
+        https://bugs.webkit.org/show_bug.cgi?id=63451
+
+        Insert plugin widgets to WebKitWebView container as it's children.
+        Chain up to parent in webkit_web_view_draw() to ensure the child widgets are drawn.
+
+        Reviewed by Martin Robinson.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::createPlugin):
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_draw):
+
 2012-02-08  Mario Sanchez Prada  <msanchez@igalia.com>
 

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

@@ -483 +483 @@
     g_signal_emit_by_name(getViewFromFrame(m_frame), "create-plugin-widget",
                           mimeTypeString.data(), urlString.data(), hash.get(), &gtkWidget);
-    if (gtkWidget)
+    if (gtkWidget) {
+        gtk_container_add(GTK_CONTAINER(getViewFromFrame(m_frame)), gtkWidget);
         return adoptRef(new GtkPluginWidget(gtkWidget));
+    }
 
     RefPtr<PluginView> pluginView = PluginView::create(core(m_frame), pluginSize, element, url, paramNames, paramValues, mimeType, loadManually);

trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

@@ -640 +640 @@
                                           cr.get(), IntSize(), IntRect(rects.get()[i]));
     }
+
+    // Chaining up to the parent forces child widgets to be drawn.
+    GTK_WIDGET_CLASS(webkit_web_view_parent_class)->expose(widget, event);
     return FALSE;
 }
@@ -668 +671 @@
     cairo_rectangle_list_destroy(rectList);
 
+    // Chaining up to the parent forces child widgets to be drawn.
+    GTK_WIDGET_CLASS(webkit_web_view_parent_class)->draw(widget, cr);
     return FALSE;
 }