Title: [165884] releases/WebKitGTK/webkit-2.2/Source/WebKit2
- Revision
- 165884
- Author
- [email protected]
- Date
- 2014-03-19 02:34:17 -0700 (Wed, 19 Mar 2014)
Log Message
Merge r165371 - [GTK] The web process can finish while a print operation is still ongoing
https://bugs.webkit.org/show_bug.cgi?id=129871
Reviewed by Martin Robinson.
This can happen when the last page is closed while the print job
is sending data to the printer.
* WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp: Disable web
process termination when the print job is sending data to the
printer and enable it again when job finishes.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog (165883 => 165884)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog 2014-03-19 09:19:24 UTC (rev 165883)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog 2014-03-19 09:34:17 UTC (rev 165884)
@@ -1,3 +1,17 @@
+2014-03-10 Carlos Garcia Campos <[email protected]>
+
+ [GTK] The web process can finish while a print operation is still ongoing
+ https://bugs.webkit.org/show_bug.cgi?id=129871
+
+ Reviewed by Martin Robinson.
+
+ This can happen when the last page is closed while the print job
+ is sending data to the printer.
+
+ * WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp: Disable web
+ process termination when the print job is sending data to the
+ printer and enable it again when job finishes.
+
2014-03-12 Carlos Garcia Campos <[email protected]>
[GTK] Runtime error when page is closed while print operation is in progress
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp (165883 => 165884)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp 2014-03-19 09:19:24 UTC (rev 165883)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp 2014-03-19 09:34:17 UTC (rev 165884)
@@ -29,6 +29,7 @@
#include "WebCoreArgumentCoders.h"
#include "WebPage.h"
#include "WebPageProxyMessages.h"
+#include "WebProcess.h"
#include <WebCore/ErrorsGtk.h>
#include <WebCore/IntRect.h>
#include <WebCore/NotImplemented.h>
@@ -144,10 +145,14 @@
static void printJobFinished(WebPrintOperationGtkUnix* printOperation)
{
printOperation->deref();
+ WebProcess::shared().enableTermination();
}
void endPrint()
{
+ // Disable web process termination until the print job finishes.
+ WebProcess::shared().disableTermination();
+
cairo_surface_finish(gtk_print_job_get_surface(m_printJob.get(), 0));
// Make sure the operation is alive until the job is sent.
ref();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
