<!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>[179744] 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/179744">179744</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-06 06:46:17 -0800 (Fri, 06 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: !m_adoptionIsRequired in WTF::RefCountedBase::ref
https://bugs.webkit.org/show_bug.cgi?id=141035
Reviewed by Sergio Villar Senin.
Rename PrinterListGtk::singleton() as PrinterListGtk::getOrCreate(), and
make it return nullptr when the shared PrinterListGtk object is
still being created. This can happen if the nested loop used by
gtk_enumerate_printers dispatches a GSource that starts a new
synchronous print operation. In that case we just ignore the
second print operation, since there's already one ongoing.
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::print): Return early if
PrinterListGtk::getOrCreate() return nullptr.
* WebProcess/WebPage/gtk/PrinterListGtk.cpp:
(WebKit::PrinterListGtk::getOrCreate): Return nullptr if the
PrinterListGtk is still enumerating the printers.
(WebKit::PrinterListGtk::PrinterListGtk): Initialize
m_enumeratingPrinters to true before calling
gtk_enumerate_printers, and to false once it finishes.
(WebKit::PrinterListGtk::singleton): Deleted.
(WebKit::PrinterListGtk::enumeratePrintersFunction): Deleted.
* WebProcess/WebPage/gtk/PrinterListGtk.h:
* WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp: Add an
assertion here since PrinterListGtk::getOrCreate() should never
return nullptr at this point.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkPrinterListGtkcpp">trunk/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkPrinterListGtkh">trunk/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkWebPrintOperationGtkcpp">trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (179743 => 179744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-02-06 10:03:56 UTC (rev 179743)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-06 14:46:17 UTC (rev 179744)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-02-06 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ ASSERTION FAILED: !m_adoptionIsRequired in WTF::RefCountedBase::ref
+ https://bugs.webkit.org/show_bug.cgi?id=141035
+
+ Reviewed by Sergio Villar Senin.
+
+ Rename PrinterListGtk::singleton() as PrinterListGtk::getOrCreate(), and
+ make it return nullptr when the shared PrinterListGtk object is
+ still being created. This can happen if the nested loop used by
+ gtk_enumerate_printers dispatches a GSource that starts a new
+ synchronous print operation. In that case we just ignore the
+ second print operation, since there's already one ongoing.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::print): Return early if
+ PrinterListGtk::getOrCreate() return nullptr.
+ * WebProcess/WebPage/gtk/PrinterListGtk.cpp:
+ (WebKit::PrinterListGtk::getOrCreate): Return nullptr if the
+ PrinterListGtk is still enumerating the printers.
+ (WebKit::PrinterListGtk::PrinterListGtk): Initialize
+ m_enumeratingPrinters to true before calling
+ gtk_enumerate_printers, and to false once it finishes.
+ (WebKit::PrinterListGtk::singleton): Deleted.
+ (WebKit::PrinterListGtk::enumeratePrintersFunction): Deleted.
+ * WebProcess/WebPage/gtk/PrinterListGtk.h:
+ * WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp: Add an
+ assertion here since PrinterListGtk::getOrCreate() should never
+ return nullptr at this point.
+
</ins><span class="cx"> 2015-02-05 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Null deref in ViewGestureController::beginSwipeGesture when swiping while script is navigating
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (179743 => 179744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-02-06 10:03:56 UTC (rev 179743)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-02-06 14:46:17 UTC (rev 179744)
</span><span class="lines">@@ -662,7 +662,17 @@
</span><span class="cx"> // the print operation is finished unexpectely and the web process crashes, see https://bugs.webkit.org/show_bug.cgi?id=126979.
</span><span class="cx"> // The PrinterListGtk class gets the list of printers in the constructor so we just need to ensure there's an instance alive
</span><span class="cx"> // during the synchronous print operation.
</span><del>- RefPtr<PrinterListGtk> printerList = PrinterListGtk::singleton();
</del><ins>+ RefPtr<PrinterListGtk> printerList = PrinterListGtk::getOrCreate();
+ if (!printerList) {
+ // PrinterListGtk::getOrCreate() returns nullptr when called while a printers enumeration is ongoing.
+ // This can happen if a synchronous print is started by a JavaScript and another one is inmeditaley started
+ // from a JavaScript event listener. The second print operation is handled by the nested main loop used by GTK+
+ // to enumerate the printers, and we end up here trying to get a reference of an object that is being constructed.
+ // It's very unlikely that the user wants to print twice in a row, and other browsers don't do two print operations
+ // in this particular case either. So, the safest solution is to return early here and ignore the second print.
+ // See https://bugs.webkit.org/show_bug.cgi?id=141035
+ return;
+ }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> unsigned syncSendFlags = IPC::InformPlatformProcessWillSuspend;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkPrinterListGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.cpp (179743 => 179744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.cpp 2015-02-06 10:03:56 UTC (rev 179743)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.cpp 2015-02-06 14:46:17 UTC (rev 179744)
</span><span class="lines">@@ -34,27 +34,26 @@
</span><span class="cx">
</span><span class="cx"> PrinterListGtk* PrinterListGtk::s_sharedPrinterList = nullptr;
</span><span class="cx">
</span><del>-RefPtr<PrinterListGtk> PrinterListGtk::singleton()
</del><ins>+RefPtr<PrinterListGtk> PrinterListGtk::getOrCreate()
</ins><span class="cx"> {
</span><span class="cx"> if (s_sharedPrinterList)
</span><del>- return s_sharedPrinterList;
</del><ins>+ return s_sharedPrinterList->isEnumeratingPrinters() ? nullptr : s_sharedPrinterList;
</ins><span class="cx">
</span><span class="cx"> return adoptRef(new PrinterListGtk);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-gboolean PrinterListGtk::enumeratePrintersFunction(GtkPrinter* printer)
-{
- ASSERT(s_sharedPrinterList);
- s_sharedPrinterList->addPrinter(printer);
- return FALSE;
-}
-
</del><span class="cx"> PrinterListGtk::PrinterListGtk()
</span><span class="cx"> : m_defaultPrinter(nullptr)
</span><ins>+ , m_enumeratingPrinters(true)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!s_sharedPrinterList);
</span><span class="cx"> s_sharedPrinterList = this;
</span><del>- gtk_enumerate_printers(reinterpret_cast<GtkPrinterFunc>(&enumeratePrintersFunction), nullptr, nullptr, TRUE);
</del><ins>+ gtk_enumerate_printers([](GtkPrinter* printer, gpointer) -> gboolean {
+ ASSERT(s_sharedPrinterList);
+ s_sharedPrinterList->addPrinter(printer);
+ return FALSE;
+ }, nullptr, nullptr, TRUE);
+ m_enumeratingPrinters = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PrinterListGtk::~PrinterListGtk()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkPrinterListGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.h (179743 => 179744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.h 2015-02-06 10:03:56 UTC (rev 179743)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.h 2015-02-06 14:46:17 UTC (rev 179744)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> class PrinterListGtk: public RefCounted<PrinterListGtk> {
</span><span class="cx"> public:
</span><del>- static RefPtr<PrinterListGtk> singleton();
</del><ins>+ static RefPtr<PrinterListGtk> getOrCreate();
</ins><span class="cx"> ~PrinterListGtk();
</span><span class="cx">
</span><span class="cx"> GtkPrinter* findPrinter(const char*) const;
</span><span class="lines">@@ -47,11 +47,12 @@
</span><span class="cx"> private:
</span><span class="cx"> PrinterListGtk();
</span><span class="cx">
</span><del>- static gboolean enumeratePrintersFunction(GtkPrinter*);
</del><span class="cx"> void addPrinter(GtkPrinter*);
</span><ins>+ bool isEnumeratingPrinters() const { return m_enumeratingPrinters; }
</ins><span class="cx">
</span><span class="cx"> Vector<GRefPtr<GtkPrinter>, 4> m_printerList;
</span><span class="cx"> GtkPrinter* m_defaultPrinter;
</span><ins>+ bool m_enumeratingPrinters;
</ins><span class="cx"> static PrinterListGtk* s_sharedPrinterList;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkWebPrintOperationGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp (179743 => 179744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp 2015-02-06 10:03:56 UTC (rev 179743)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp 2015-02-06 14:46:17 UTC (rev 179744)
</span><span class="lines">@@ -67,7 +67,8 @@
</span><span class="cx"> m_printContext = printContext;
</span><span class="cx"> m_callbackID = callbackID;
</span><span class="cx">
</span><del>- RefPtr<PrinterListGtk> printerList = PrinterListGtk::singleton();
</del><ins>+ RefPtr<PrinterListGtk> printerList = PrinterListGtk::getOrCreate();
+ ASSERT(printerList);
</ins><span class="cx"> const char* printerName = gtk_print_settings_get_printer(m_printSettings.get());
</span><span class="cx"> GtkPrinter* printer = printerName ? printerList->findPrinter(printerName) : printerList->defaultPrinter();
</span><span class="cx"> if (!printer) {
</span></span></pre>
</div>
</div>
</body>
</html>