Title: [151376] releases/WebKitGTK/webkit-2.0/Source/WebKit2
- Revision
- 151376
- Author
- [email protected]
- Date
- 2013-06-10 03:30:05 -0700 (Mon, 10 Jun 2013)
Log Message
Merge r150763 - [GTK] WebKitWebView child widgets are not rendered with recent GTK+
https://bugs.webkit.org/show_bug.cgi?id=116794
Reviewed by Xan Lopez.
Since rev d22fd7223c75f4720ddb982c659efb0d8d7543c4 of GTK+ expose
events are not propagated to child GdkWindows anymore, and child
widgets are rendered via gtk_container_propagate_draw(). Since all
our children have its own GdkWindow (auth widget, inspector view
and windowed plugins) we don't propagate the draw signal making
them invisible with current GTK+.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseDraw): Chain up to the parent draw(), so it's
propagated to the children. This shouldn't have any effect in
previous versions of GTK+ because gtk_container_propagate_draw()
returned early when the child widget had its own GdkWindow.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog (151375 => 151376)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog 2013-06-10 10:09:38 UTC (rev 151375)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog 2013-06-10 10:30:05 UTC (rev 151376)
@@ -1,3 +1,23 @@
+2013-05-27 Carlos Garcia Campos <[email protected]>
+
+ [GTK] WebKitWebView child widgets are not rendered with recent GTK+
+ https://bugs.webkit.org/show_bug.cgi?id=116794
+
+ Reviewed by Xan Lopez.
+
+ Since rev d22fd7223c75f4720ddb982c659efb0d8d7543c4 of GTK+ expose
+ events are not propagated to child GdkWindows anymore, and child
+ widgets are rendered via gtk_container_propagate_draw(). Since all
+ our children have its own GdkWindow (auth widget, inspector view
+ and windowed plugins) we don't propagate the draw signal making
+ them invisible with current GTK+.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseDraw): Chain up to the parent draw(), so it's
+ propagated to the children. This shouldn't have any effect in
+ previous versions of GTK+ because gtk_container_propagate_draw()
+ returned early when the child widget had its own GdkWindow.
+
2013-05-21 Andreas Kling <[email protected]>
REGRESSION(r150491): WebKit2.CloseThenTerminate asserting below WebContext::disconnectProcess().
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (151375 => 151376)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2013-06-10 10:09:38 UTC (rev 151375)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2013-06-10 10:30:05 UTC (rev 151376)
@@ -438,6 +438,8 @@
cairo_paint(cr);
}
+ GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->draw(widget, cr);
+
return FALSE;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes