<!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>[182437] 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/182437">182437</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-04-06 13:49:40 -0700 (Mon, 06 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2][iOS] Regression(<a href="http://trac.webkit.org/projects/webkit/changeset/182323">r182323</a>): ASSERTION FAILED: WebCore::SQLiteDatabaseTracker::hasTransactionInProgress() in NetworkCache::Statistics::initialize()
https://bugs.webkit.org/show_bug.cgi?id=143451
<rdar://problem/20437994>
Reviewed by Anders Carlsson.
Initialize WebProcess::m_webSQLiteDatabaseTracker and
NetworkProcess::m_webSQLiteDatabaseTracker in their respective class
constructors instead of doing it later in the initializeWebProcess() /
initializeNetworkProcess() methods.
If we do it later, it can happen that the tracker gets set after
a SQLiteTransactionInProgressAutoCounter initialization and before
the actual transaction. When this happens, the
SQLiteTransactionInProgressAutoCounter variable fails to increment the
transaction count. Then when the transaction is executed,
SQLiteDatabaseTracker::hasTransactionInProgress() can return false.
This would lead to possible assertions on start up on iOS.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::NetworkProcess):
(WebKit::NetworkProcess::initializeNetworkProcess):
* NetworkProcess/NetworkProcess.h:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess):
(WebKit::WebProcess::initializeConnection):
* WebProcess/WebProcess.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182436 => 182437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-06 20:39:11 UTC (rev 182436)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-06 20:49:40 UTC (rev 182437)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-04-06 Chris Dumez <cdumez@apple.com>
+
+ [WK2][iOS] Regression(r182323): ASSERTION FAILED: WebCore::SQLiteDatabaseTracker::hasTransactionInProgress() in NetworkCache::Statistics::initialize()
+ https://bugs.webkit.org/show_bug.cgi?id=143451
+ <rdar://problem/20437994>
+
+ Reviewed by Anders Carlsson.
+
+ Initialize WebProcess::m_webSQLiteDatabaseTracker and
+ NetworkProcess::m_webSQLiteDatabaseTracker in their respective class
+ constructors instead of doing it later in the initializeWebProcess() /
+ initializeNetworkProcess() methods.
+
+ If we do it later, it can happen that the tracker gets set after
+ a SQLiteTransactionInProgressAutoCounter initialization and before
+ the actual transaction. When this happens, the
+ SQLiteTransactionInProgressAutoCounter variable fails to increment the
+ transaction count. Then when the transaction is executed,
+ SQLiteDatabaseTracker::hasTransactionInProgress() can return false.
+ This would lead to possible assertions on start up on iOS.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::NetworkProcess):
+ (WebKit::NetworkProcess::initializeNetworkProcess):
+ * NetworkProcess/NetworkProcess.h:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::WebProcess):
+ (WebKit::WebProcess::initializeConnection):
+ * WebProcess/WebProcess.h:
+
</ins><span class="cx"> 2015-04-06 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> https://trac.webkit.org/changeset/182338 introduced a build failure that I
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (182436 => 182437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-04-06 20:39:11 UTC (rev 182436)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-04-06 20:49:40 UTC (rev 182437)
</span><span class="lines">@@ -64,10 +64,6 @@
</span><span class="cx"> #include "NetworkCacheCoders.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-#include "WebSQLiteDatabaseTracker.h"
-#endif
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -86,6 +82,9 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> , m_clearCacheDispatchGroup(0)
</span><span class="cx"> #endif
</span><ins>+#if PLATFORM(IOS)
+ , m_webSQLiteDatabaseTracker(*this)
+#endif
</ins><span class="cx"> {
</span><span class="cx"> NetworkProcessPlatformStrategies::initialize();
</span><span class="cx">
</span><span class="lines">@@ -198,10 +197,6 @@
</span><span class="cx"> if (parameters.shouldUseTestingNetworkSession)
</span><span class="cx"> NetworkStorageSession::switchToNewTestingSession();
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- m_webSQLiteDatabaseTracker = std::make_unique<WebSQLiteDatabaseTracker>(*this);
-#endif
-
</del><span class="cx"> NetworkProcessSupplementMap::const_iterator it = m_supplements.begin();
</span><span class="cx"> NetworkProcessSupplementMap::const_iterator end = m_supplements.end();
</span><span class="cx"> for (; it != end; ++it)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (182436 => 182437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-04-06 20:39:11 UTC (rev 182436)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-04-06 20:49:40 UTC (rev 182437)
</span><span class="lines">@@ -39,6 +39,10 @@
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+#include "WebSQLiteDatabaseTracker.h"
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> class CertificateInfo;
</span><span class="cx"> }
</span><span class="lines">@@ -50,10 +54,6 @@
</span><span class="cx"> struct NetworkProcessCreationParameters;
</span><span class="cx"> struct SecurityOriginData;
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-class WebSQLiteDatabaseTracker;
-#endif
-
</del><span class="cx"> class NetworkProcess : public ChildProcess, private DownloadManager::Client {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(NetworkProcess);
</span><span class="cx"> friend class NeverDestroyed<NetworkProcess>;
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- std::unique_ptr<WebSQLiteDatabaseTracker> m_webSQLiteDatabaseTracker;
</del><ins>+ WebSQLiteDatabaseTracker m_webSQLiteDatabaseTracker;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (182436 => 182437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-04-06 20:39:11 UTC (rev 182436)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-04-06 20:49:40 UTC (rev 182437)
</span><span class="lines">@@ -118,10 +118,6 @@
</span><span class="cx"> #include "WebNotificationManager.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-#include "WebSQLiteDatabaseTracker.h"
-#endif
-
</del><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><span class="cx"> #include "WebBatteryManager.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -181,6 +177,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_nonVisibleProcessCleanupTimer(*this, &WebProcess::nonVisibleProcessCleanupTimerFired)
</span><span class="cx"> , m_webOriginDataManager(std::make_unique<WebOriginDataManager>(*this, *this))
</span><ins>+#if PLATFORM(IOS)
+ , m_webSQLiteDatabaseTracker(*this)
+#endif
</ins><span class="cx"> {
</span><span class="cx"> // Initialize our platform strategies.
</span><span class="cx"> WebPlatformStrategies::initialize();
</span><span class="lines">@@ -236,10 +235,6 @@
</span><span class="cx"> #if ENABLE(SEC_ITEM_SHIM)
</span><span class="cx"> SecItemShim::singleton().initializeConnection(connection);
</span><span class="cx"> #endif
</span><del>-
-#if PLATFORM(IOS)
- m_webSQLiteDatabaseTracker = std::make_unique<WebSQLiteDatabaseTracker>(*this);
-#endif
</del><span class="cx">
</span><span class="cx"> WebProcessSupplementMap::const_iterator it = m_supplements.begin();
</span><span class="cx"> WebProcessSupplementMap::const_iterator end = m_supplements.end();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (182436 => 182437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-04-06 20:39:11 UTC (rev 182436)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-04-06 20:49:40 UTC (rev 182437)
</span><span class="lines">@@ -52,6 +52,10 @@
</span><span class="cx"> #include <WebCore/MachSendRight.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+#include "WebSQLiteDatabaseTracker.h"
+#endif
+
</ins><span class="cx"> namespace API {
</span><span class="cx"> class Object;
</span><span class="cx"> }
</span><span class="lines">@@ -90,10 +94,6 @@
</span><span class="cx"> class WebToDatabaseProcessConnection;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-class WebSQLiteDatabaseTracker;
-#endif
-
</del><span class="cx"> class WebProcess : public ChildProcess, public WebOriginDataManagerSupplement, private DownloadManager::Client {
</span><span class="cx"> friend class NeverDestroyed<DownloadManager>;
</span><span class="cx"> public:
</span><span class="lines">@@ -379,7 +379,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<WebOriginDataManager> m_webOriginDataManager;
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- std::unique_ptr<WebSQLiteDatabaseTracker> m_webSQLiteDatabaseTracker;
</del><ins>+ WebSQLiteDatabaseTracker m_webSQLiteDatabaseTracker;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>