<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[206072] releases/WebKitGTK/webkit-2.14/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/206072">206072</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-17 03:52:16 -0700 (Sat, 17 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/206067">r206067</a> - [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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessAPIgtkWebKitAuthenticationDialogcpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog (206071 => 206072)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-09-17 10:51:30 UTC (rev 206071)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-09-17 10:52:16 UTC (rev 206072)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-09-17 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [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>
+
</ins><span class="cx"> [ThreadedCompositor] Scrolling artifacts on accelerated subframes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149060
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessAPIgtkWebKitAuthenticationDialogcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp (206071 => 206072)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp 2016-09-17 10:51:30 UTC (rev 206071)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp 2016-09-17 10:52:16 UTC (rev 206072)
</span><span class="lines">@@ -204,11 +204,20 @@
</span><span class="cx"> {
</span><span class="cx"> WebKitAuthenticationDialogPrivate* priv = WEBKIT_AUTHENTICATION_DIALOG(widget)->priv;
</span><span class="cx">
</span><del>- 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());
</del><ins>+ cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+ cairo_set_source_rgba(cr, 0, 0, 0, 0.5);
+ cairo_paint(cr);
</ins><span class="cx">
</span><ins>+ 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());
+ }
+
</ins><span class="cx"> GTK_WIDGET_CLASS(webkit_authentication_dialog_parent_class)->draw(widget, cr);
</span><span class="cx">
</span><span class="cx"> return FALSE;
</span><span class="lines">@@ -222,6 +231,27 @@
</span><span class="cx"> GTK_WIDGET_CLASS(webkit_authentication_dialog_parent_class)->map(widget);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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);
+}
+
</ins><span class="cx"> static void webkitAuthenticationDialogConstructed(GObject* object)
</span><span class="cx"> {
</span><span class="cx"> G_OBJECT_CLASS(webkit_authentication_dialog_parent_class)->constructed(object);
</span><span class="lines">@@ -254,6 +284,7 @@
</span><span class="cx"> GtkWidgetClass* widgetClass = GTK_WIDGET_CLASS(klass);
</span><span class="cx"> widgetClass->draw = webkitAuthenticationDialogDraw;
</span><span class="cx"> widgetClass->map = webkitAuthenticationDialogMap;
</span><ins>+ widgetClass->size_allocate = webkitAuthenticationDialogSizeAllocate;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GtkWidget* webkitAuthenticationDialogNew(WebKitAuthenticationRequest* request, CredentialStorageMode mode)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (206071 => 206072)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-09-17 10:51:30 UTC (rev 206071)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-09-17 10:52:16 UTC (rev 206072)
</span><span class="lines">@@ -542,12 +542,6 @@
</span><span class="cx"> drawingArea->paint(cr, clipRect, unpaintedRegion);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (webViewBase->priv->authenticationDialog) {
- cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
- cairo_set_source_rgba(cr, 0, 0, 0, 0.5);
- cairo_paint(cr);
- }
-
</del><span class="cx"> GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->draw(widget, cr);
</span><span class="cx">
</span><span class="cx"> return FALSE;
</span><span class="lines">@@ -602,15 +596,10 @@
</span><span class="cx"> // never overlaps the web inspector. Thus, we need to calculate the allocation here
</span><span class="cx"> // after calculating the inspector allocation.
</span><span class="cx"> if (priv->authenticationDialog) {
</span><del>- GtkRequisition naturalSize;
- gtk_widget_get_preferred_size(priv->authenticationDialog, 0, &naturalSize);
</del><ins>+ GtkRequisition minimumSize;
+ gtk_widget_get_preferred_size(priv->authenticationDialog, &minimumSize, nullptr);
</ins><span class="cx">
</span><del>- GtkAllocation childAllocation = {
- (viewRect.width() - naturalSize.width) / 2,
- (viewRect.height() - naturalSize.height) / 2,
- naturalSize.width,
- naturalSize.height
- };
</del><ins>+ GtkAllocation childAllocation = { 0, 0, std::max(minimumSize.width, viewRect.width()), std::max(minimumSize.height, viewRect.height()) };
</ins><span class="cx"> gtk_widget_size_allocate(priv->authenticationDialog, &childAllocation);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>