<!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>[162057] trunk/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/162057">162057</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-14 23:56:42 -0800 (Tue, 14 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] UI process crashes when closing the window right after printing with javascript
https://bugs.webkit.org/show_bug.cgi?id=126981
Reviewed by Gustavo Noronha Silva.
The UI process crashes because when the page is closed, the web
view is destroyed before the print operation has actually
finished. Use a weak pointer to make sure the web view pointer is
set to NULL when the it's destroyed and emit the finished callback
always so that the user can clean up the operation even when the
web view has been closed.
* UIProcess/API/gtk/WebKitPrintOperation.cpp:
(drawPagesForPrintingCompleted):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitPrintOperationcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (162056 => 162057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-15 07:47:47 UTC (rev 162056)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-15 07:56:42 UTC (rev 162057)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-01-14 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] UI process crashes when closing the window right after printing with javascript
+ https://bugs.webkit.org/show_bug.cgi?id=126981
+
+ Reviewed by Gustavo Noronha Silva.
+
+ The UI process crashes because when the page is closed, the web
+ view is destroyed before the print operation has actually
+ finished. Use a weak pointer to make sure the web view pointer is
+ set to NULL when the it's destroyed and emit the finished callback
+ always so that the user can clean up the operation even when the
+ web view has been closed.
+
+ * UIProcess/API/gtk/WebKitPrintOperation.cpp:
+ (drawPagesForPrintingCompleted):
+
+2014-01-14 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] UI process crashes when the web process crashes while printing
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126977
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitPrintOperationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp (162056 => 162057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp 2014-01-15 07:47:47 UTC (rev 162056)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp 2014-01-15 07:56:42 UTC (rev 162057)
</span><span class="lines">@@ -65,13 +65,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct _WebKitPrintOperationPrivate {
</span><del>- ~_WebKitPrintOperationPrivate()
- {
- g_signal_handler_disconnect(webView, webViewDestroyedId);
- }
-
</del><span class="cx"> WebKitWebView* webView;
</span><del>- gulong webViewDestroyedId;
</del><span class="cx"> PrintInfo::PrintMode printMode;
</span><span class="cx">
</span><span class="cx"> GRefPtr<GtkPrintSettings> printSettings;
</span><span class="lines">@@ -82,11 +76,6 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_DEFINE_TYPE(WebKitPrintOperation, webkit_print_operation, G_TYPE_OBJECT)
</span><span class="cx">
</span><del>-static void webViewDestroyed(GtkWidget* webView, GObject* printOperation)
-{
- g_object_unref(printOperation);
-}
-
</del><span class="cx"> static void webkitPrintOperationConstructed(GObject* object)
</span><span class="cx"> {
</span><span class="cx"> WebKitPrintOperation* printOperation = WEBKIT_PRINT_OPERATION(object);
</span><span class="lines">@@ -95,7 +84,7 @@
</span><span class="cx"> if (G_OBJECT_CLASS(webkit_print_operation_parent_class)->constructed)
</span><span class="cx"> G_OBJECT_CLASS(webkit_print_operation_parent_class)->constructed(object);
</span><span class="cx">
</span><del>- priv->webViewDestroyedId = g_signal_connect(priv->webView, "destroy", G_CALLBACK(webViewDestroyed), printOperation);
</del><ins>+ g_object_add_weak_pointer(G_OBJECT(priv->webView), (gpointer*)&priv->webView);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void webkitPrintOperationGetProperty(GObject* object, guint propId, GValue* value, GParamSpec* paramSpec)
</span><span class="lines">@@ -263,11 +252,12 @@
</span><span class="cx"> static void drawPagesForPrintingCompleted(WKErrorRef wkPrintError, WKErrorRef, void* context)
</span><span class="cx"> {
</span><span class="cx"> GRefPtr<WebKitPrintOperation> printOperation = adoptGRef(WEBKIT_PRINT_OPERATION(context));
</span><del>- WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(printOperation->priv->webView));
</del><span class="cx">
</span><span class="cx"> // When running synchronously WebPageProxy::printFrame() calls endPrinting().
</span><del>- if (printOperation->priv->printMode == PrintInfo::PrintModeAsync)
</del><ins>+ if (printOperation->priv->printMode == PrintInfo::PrintModeAsync && printOperation->priv->webView) {
+ WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(printOperation->priv->webView));
</ins><span class="cx"> page->endPrinting();
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> const WebCore::ResourceError& resourceError = wkPrintError ? toImpl(wkPrintError)->platformError() : WebCore::ResourceError();
</span><span class="cx"> if (!resourceError.isNull()) {
</span></span></pre>
</div>
</div>
</body>
</html>