Merge r155814 - [GTK] The web inspector is not rendered when docked i…

…n WebKit2 when AC is used

https://bugs.webkit.org/show_bug.cgi?id=121381

Reviewed by Martin Robinson.

When accelerated compositing results are rendered we return early
from webkitWebViewBaseDraw and other WebView children are not
drawn. We need to chain up the draw signal handler, so that the
GtkContainer propagates the draw to all its children.

* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseDraw):

Source/WebKit2/ChangeLog

@@ -1,3 +1,18 @@
+2013-09-15  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] The web inspector is not rendered when docked in WebKit2 when AC is used
+        https://bugs.webkit.org/show_bug.cgi?id=121381
+
+        Reviewed by Martin Robinson.
+
+        When accelerated compositing results are rendered we return early
+        from webkitWebViewBaseDraw and other WebView children are not
+        drawn. We need to chain up the draw signal handler, so that the
+        GtkContainer propagates the draw to all its children.
+
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkitWebViewBaseDraw):
+
 2013-08-28  Zan Dobersek  <zdobersek@igalia.com>
 
         [GTK][WK2] Only set up a RedirectedXCompositeWindow if running under an X11 display

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

@@ -418,7 +418,7 @@ static gboolean webkitWebViewBaseDraw(GtkWidget* widget, cairo_t* cr)
 
 #if USE(TEXTURE_MAPPER_GL)
     if (webkitWebViewRenderAcceleratedCompositingResults(webViewBase, drawingArea, cr, &clipRect))
-        return FALSE;
+        return GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->draw(widget, cr);
 #endif
 
     WebCore::Region unpaintedRegion; // This is simply unused.