<!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>[202379] trunk/Source/WebCore</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/202379">202379</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-06-23 09:03:18 -0700 (Thu, 23 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Only call sqlite3_initialize() when a SQLite database is actually being opened
https://bugs.webkit.org/show_bug.cgi?id=159033
Reviewed by Brady Eidson.
Only call sqlite3_initialize() when a SQLite database is actually being opened
instead of doing it unconditionally. sqlite3_initialize() was previously called
in the SQLiteDatabase constructor which gets called on WebContent process
initialization because a DatabaseTracker is constructed on initialization and
DatabaseTracker has a SQLiteDatabase data member.
* platform/sql/SQLiteDatabase.cpp:
(WebCore::initializeSQLiteIfNecessary):
(WebCore::SQLiteDatabase::open):
(WebCore::SQLiteDatabase::SQLiteDatabase): Deleted.
* platform/sql/SQLiteDatabase.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformsqlSQLiteDatabasecpp">trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformsqlSQLiteDatabaseh">trunk/Source/WebCore/platform/sql/SQLiteDatabase.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202378 => 202379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-23 15:10:46 UTC (rev 202378)
+++ trunk/Source/WebCore/ChangeLog 2016-06-23 16:03:18 UTC (rev 202379)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-06-23 Chris Dumez <cdumez@apple.com>
+
+ Only call sqlite3_initialize() when a SQLite database is actually being opened
+ https://bugs.webkit.org/show_bug.cgi?id=159033
+
+ Reviewed by Brady Eidson.
+
+ Only call sqlite3_initialize() when a SQLite database is actually being opened
+ instead of doing it unconditionally. sqlite3_initialize() was previously called
+ in the SQLiteDatabase constructor which gets called on WebContent process
+ initialization because a DatabaseTracker is constructed on initialization and
+ DatabaseTracker has a SQLiteDatabase data member.
+
+ * platform/sql/SQLiteDatabase.cpp:
+ (WebCore::initializeSQLiteIfNecessary):
+ (WebCore::SQLiteDatabase::open):
+ (WebCore::SQLiteDatabase::SQLiteDatabase): Deleted.
+ * platform/sql/SQLiteDatabase.h:
+
</ins><span class="cx"> 2016-06-23 Adam Bergkvist <adam.bergkvist@ericsson.com>
</span><span class="cx">
</span><span class="cx"> WebRTC: Align 'update ICE connection/gathering state' steps with the WebRTC 1.0 specification
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformsqlSQLiteDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp (202378 => 202379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp 2016-06-23 15:10:46 UTC (rev 202378)
+++ trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp 2016-06-23 16:03:18 UTC (rev 202379)
</span><span class="lines">@@ -49,15 +49,7 @@
</span><span class="cx"> sqlite3_result_error(context, errorMessage.utf8().data(), -1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SQLiteDatabase::SQLiteDatabase()
- : m_db(0)
- , m_pageSize(-1)
- , m_transactionInProgress(false)
- , m_sharable(false)
- , m_openingThread(0)
- , m_openError(SQLITE_ERROR)
- , m_openErrorMessage()
- , m_lastChangesCount(0)
</del><ins>+static void initializeSQLiteIfNecessary()
</ins><span class="cx"> {
</span><span class="cx"> static std::once_flag flag;
</span><span class="cx"> std::call_once(flag, [] {
</span><span class="lines">@@ -77,6 +69,8 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SQLiteDatabase::SQLiteDatabase() = default;
+
</ins><span class="cx"> SQLiteDatabase::~SQLiteDatabase()
</span><span class="cx"> {
</span><span class="cx"> close();
</span><span class="lines">@@ -84,6 +78,8 @@
</span><span class="cx">
</span><span class="cx"> bool SQLiteDatabase::open(const String& filename, bool forWebSQLDatabase)
</span><span class="cx"> {
</span><ins>+ initializeSQLiteIfNecessary();
+
</ins><span class="cx"> close();
</span><span class="cx">
</span><span class="cx"> m_openError = SQLiteFileSystem::openDatabase(filename, &m_db, forWebSQLDatabase);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformsqlSQLiteDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/sql/SQLiteDatabase.h (202378 => 202379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/sql/SQLiteDatabase.h 2016-06-23 15:10:46 UTC (rev 202378)
+++ trunk/Source/WebCore/platform/sql/SQLiteDatabase.h 2016-06-23 16:03:18 UTC (rev 202379)
</span><span class="lines">@@ -145,24 +145,24 @@
</span><span class="cx">
</span><span class="cx"> void overrideUnauthorizedFunctions();
</span><span class="cx">
</span><del>- sqlite3* m_db;
- int m_pageSize;
</del><ins>+ sqlite3* m_db { nullptr };
+ int m_pageSize { -1 };
</ins><span class="cx">
</span><del>- bool m_transactionInProgress;
- bool m_sharable;
</del><ins>+ bool m_transactionInProgress { false };
+ bool m_sharable { false };
</ins><span class="cx">
</span><span class="cx"> Lock m_authorizerLock;
</span><span class="cx"> RefPtr<DatabaseAuthorizer> m_authorizer;
</span><span class="cx">
</span><span class="cx"> Lock m_lockingMutex;
</span><del>- ThreadIdentifier m_openingThread;
</del><ins>+ ThreadIdentifier m_openingThread { 0 };
</ins><span class="cx">
</span><span class="cx"> Lock m_databaseClosingMutex;
</span><span class="cx">
</span><del>- int m_openError;
</del><ins>+ int m_openError { SQLITE_ERROR };
</ins><span class="cx"> CString m_openErrorMessage;
</span><span class="cx">
</span><del>- int m_lastChangesCount;
</del><ins>+ int m_lastChangesCount { 0 };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>