Changeset 206072 in webkit

Timestamp:

Sep 17, 2016 3:52:16 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r206067 - [GTK] Move the rendering of auth dialog shadow to the auth dialog widget
​https://bugs.webkit.org/show_bug.cgi?id=162061

Reviewed by Michael Catanzaro.

Instead of rendering the shadow in the web view, we can let the auth dialog do it. This fixes the rendering of
the shadow in Wayland when using gdk_cairo_draw_from_gl().

• UIProcess/API/gtk/WebKitAuthenticationDialog.cpp:

(webkitAuthenticationDialogDraw): Draw the shadow before rendering the child.
(webkitAuthenticationDialogSizeAllocate): Center the child on the allocated space.
(webkit_authentication_dialog_class_init): Add size_allocate implementation.

• UIProcess/API/gtk/WebKitWebViewBase.cpp:

(webkitWebViewBaseDraw): Do not draw the shadow when auth dialog is present.
(webkitWebViewBaseSizeAllocate): Give the whole web view allocation to the auth dialog.

Location:

releases/WebKitGTK/webkit-2.14/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitAuthenticationDialog.cpp (modified) (3 diffs)
• UIProcess/API/gtk/WebKitWebViewBase.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-09-17  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Move the rendering of auth dialog shadow to the auth dialog widget
+        https://bugs.webkit.org/show_bug.cgi?id=162061
+
+        Reviewed by Michael Catanzaro.
+
+        Instead of rendering the shadow in the web view, we can let the auth dialog do it. This fixes the rendering of
+        the shadow in Wayland when using gdk_cairo_draw_from_gl().
+
+        * UIProcess/API/gtk/WebKitAuthenticationDialog.cpp:
+        (webkitAuthenticationDialogDraw): Draw the shadow before rendering the child.
+        (webkitAuthenticationDialogSizeAllocate): Center the child on the allocated space.
+        (webkit_authentication_dialog_class_init): Add size_allocate implementation.
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkitWebViewBaseDraw): Do not draw the shadow when auth dialog is present.
+        (webkitWebViewBaseSizeAllocate): Give the whole web view allocation to the auth dialog.
+
 2016-09-17  Carlos Garcia Campos  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp

@@ -205 +205 @@
     WebKitAuthenticationDialogPrivate* priv = WEBKIT_AUTHENTICATION_DIALOG(widget)->priv;
 
-    gtk_style_context_save(priv->styleContext.get());
-    gtk_style_context_add_class(priv->styleContext.get(), GTK_STYLE_CLASS_BACKGROUND);
-    gtk_render_background(priv->styleContext.get(), cr, 0, 0, gtk_widget_get_allocated_width(widget), gtk_widget_get_allocated_height(widget));
-    gtk_style_context_restore(priv->styleContext.get());
+    cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+    cairo_set_source_rgba(cr, 0, 0, 0, 0.5);
+    cairo_paint(cr);
+
+    if (GtkWidget* child = gtk_bin_get_child(GTK_BIN(widget))) {
+        GtkAllocation allocation;
+        gtk_widget_get_allocation(child, &allocation);
+
+        gtk_style_context_save(priv->styleContext.get());
+        gtk_style_context_add_class(priv->styleContext.get(), GTK_STYLE_CLASS_BACKGROUND);
+        gtk_render_background(priv->styleContext.get(), cr, allocation.x, allocation.y, allocation.width, allocation.height);
+        gtk_style_context_restore(priv->styleContext.get());
+    }
 
     GTK_WIDGET_CLASS(webkit_authentication_dialog_parent_class)->draw(widget, cr);
@@ -221 +230 @@
 
     GTK_WIDGET_CLASS(webkit_authentication_dialog_parent_class)->map(widget);
+}
+
+static void webkitAuthenticationDialogSizeAllocate(GtkWidget* widget, GtkAllocation* allocation)
+{
+    GTK_WIDGET_CLASS(webkit_authentication_dialog_parent_class)->size_allocate(widget, allocation);
+
+    GtkWidget* child = gtk_bin_get_child(GTK_BIN(widget));
+    if (!child)
+        return;
+
+    GtkRequisition naturalSize;
+    gtk_widget_get_preferred_size(child, 0, &naturalSize);
+
+    GtkAllocation childAllocation;
+    gtk_widget_get_allocation(child, &childAllocation);
+
+    childAllocation.x += (allocation->width - naturalSize.width) / 2;
+    childAllocation.y += (allocation->height - naturalSize.height) / 2;
+    childAllocation.width = naturalSize.width;
+    childAllocation.height = naturalSize.height;
+    gtk_widget_size_allocate(child, &childAllocation);
 }
 
@@ -255 +285 @@
     widgetClass->draw = webkitAuthenticationDialogDraw;
     widgetClass->map = webkitAuthenticationDialogMap;
+    widgetClass->size_allocate = webkitAuthenticationDialogSizeAllocate;
 }
 

releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp

@@ -543 +543 @@
     }
 
-    if (webViewBase->priv->authenticationDialog) {
-        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
-        cairo_set_source_rgba(cr, 0, 0, 0, 0.5);
-        cairo_paint(cr);
-    }
-
     GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->draw(widget, cr);
 
@@ -603 +597 @@
     // after calculating the inspector allocation.
     if (priv->authenticationDialog) {
-        GtkRequisition naturalSize;
-        gtk_widget_get_preferred_size(priv->authenticationDialog, 0, &naturalSize);
-
-        GtkAllocation childAllocation = {
-            (viewRect.width() - naturalSize.width) / 2,
-            (viewRect.height() - naturalSize.height) / 2,
-            naturalSize.width,
-            naturalSize.height
-        };
+        GtkRequisition minimumSize;
+        gtk_widget_get_preferred_size(priv->authenticationDialog, &minimumSize, nullptr);
+
+        GtkAllocation childAllocation = { 0, 0, std::max(minimumSize.width, viewRect.width()), std::max(minimumSize.height, viewRect.height()) };
         gtk_widget_size_allocate(priv->authenticationDialog, &childAllocation);
     }