<!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>[179774] trunk/Source</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/179774">179774</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-02-06 19:06:58 -0800 (Fri, 06 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Have SQLiteStatement::database() return a reference
https://bugs.webkit.org/show_bug.cgi?id=141348
Reviewed by Andreas Kling.
Have SQLiteStatement::database() return a reference as it can never
return null.
Source/WebCore:
* loader/icon/IconDatabase.cpp:
(WebCore::readySQLiteStatement):
* platform/sql/SQLiteStatement.h:
(WebCore::SQLiteStatement::database):
Source/WebKit2:
* DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp:
(WebKit::SQLiteIDBCursor::internalAdvanceOnce):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadericonIconDatabasecpp">trunk/Source/WebCore/loader/icon/IconDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformsqlSQLiteStatementh">trunk/Source/WebCore/platform/sql/SQLiteStatement.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBsqliteSQLiteIDBCursorcpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179773 => 179774)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-07 01:38:15 UTC (rev 179773)
+++ trunk/Source/WebCore/ChangeLog 2015-02-07 03:06:58 UTC (rev 179774)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-02-06 Chris Dumez <cdumez@apple.com>
+
+ Have SQLiteStatement::database() return a reference
+ https://bugs.webkit.org/show_bug.cgi?id=141348
+
+ Reviewed by Andreas Kling.
+
+ Have SQLiteStatement::database() return a reference as it can never
+ return null.
+
+ * loader/icon/IconDatabase.cpp:
+ (WebCore::readySQLiteStatement):
+ * platform/sql/SQLiteStatement.h:
+ (WebCore::SQLiteStatement::database):
+
</ins><span class="cx"> 2015-02-06 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Add youtube-nocookie URL to isYouTubeURL predicate
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconDatabase.cpp (179773 => 179774)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2015-02-07 01:38:15 UTC (rev 179773)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2015-02-07 03:06:58 UTC (rev 179774)
</span><span class="lines">@@ -1812,7 +1812,7 @@
</span><span class="cx"> // 2 - Lazy construction of the Statement in the first place, in case we've never made this query before
</span><span class="cx"> inline void readySQLiteStatement(std::unique_ptr<SQLiteStatement>& statement, SQLiteDatabase& db, const String& str)
</span><span class="cx"> {
</span><del>- if (statement && (statement->database() != &db || statement->isExpired())) {
</del><ins>+ if (statement && (&statement->database() != &db || statement->isExpired())) {
</ins><span class="cx"> if (statement->isExpired())
</span><span class="cx"> LOG(IconDatabase, "SQLiteStatement associated with %s is expired", str.ascii().data());
</span><span class="cx"> statement = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformsqlSQLiteStatementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/sql/SQLiteStatement.h (179773 => 179774)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/sql/SQLiteStatement.h 2015-02-07 01:38:15 UTC (rev 179773)
+++ trunk/Source/WebCore/platform/sql/SQLiteStatement.h 2015-02-07 03:06:58 UTC (rev 179774)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> bool returnInt64Results(int col, Vector<int64_t>&);
</span><span class="cx"> bool returnDoubleResults(int col, Vector<double>&);
</span><span class="cx">
</span><del>- SQLiteDatabase* database() { return &m_database; }
</del><ins>+ SQLiteDatabase& database() { return m_database; }
</ins><span class="cx">
</span><span class="cx"> const String& query() const { return m_query; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (179773 => 179774)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-02-07 01:38:15 UTC (rev 179773)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-07 03:06:58 UTC (rev 179774)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-02-06 Chris Dumez <cdumez@apple.com>
+
+ Have SQLiteStatement::database() return a reference
+ https://bugs.webkit.org/show_bug.cgi?id=141348
+
+ Reviewed by Andreas Kling.
+
+ Have SQLiteStatement::database() return a reference as it can never
+ return null.
+
+ * DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp:
+ (WebKit::SQLiteIDBCursor::internalAdvanceOnce):
+
</ins><span class="cx"> 2015-02-06 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Report network process crashes during layout tests
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBsqliteSQLiteIDBCursorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp (179773 => 179774)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp 2015-02-07 01:38:15 UTC (rev 179773)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp 2015-02-07 03:06:58 UTC (rev 179774)
</span><span class="lines">@@ -329,12 +329,12 @@
</span><span class="cx"> return AdvanceResult::Failure;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- SQLiteStatement objectStoreStatement(*m_statement->database(), "SELECT value FROM Records WHERE key = CAST(? AS TEXT) and objectStoreID = ?;");
</del><ins>+ SQLiteStatement objectStoreStatement(m_statement->database(), "SELECT value FROM Records WHERE key = CAST(? AS TEXT) and objectStoreID = ?;");
</ins><span class="cx">
</span><span class="cx"> if (objectStoreStatement.prepare() != SQLResultOk
</span><span class="cx"> || objectStoreStatement.bindBlob(1, m_currentValueBuffer.data(), m_currentValueBuffer.size()) != SQLResultOk
</span><span class="cx"> || objectStoreStatement.bindInt64(2, m_objectStoreID) != SQLResultOk) {
</span><del>- LOG_ERROR("Could not create index cursor statement into object store records (%i) '%s'", m_statement->database()->lastError(), m_statement->database()->lastErrorMsg());
</del><ins>+ LOG_ERROR("Could not create index cursor statement into object store records (%i) '%s'", m_statement->database().lastError(), m_statement->database().lastErrorMsg());
</ins><span class="cx"> m_completed = true;
</span><span class="cx"> m_errored = true;
</span><span class="cx"> return AdvanceResult::Failure;
</span><span class="lines">@@ -349,7 +349,7 @@
</span><span class="cx"> // Skip over it.
</span><span class="cx"> return AdvanceResult::ShouldAdvanceAgain;
</span><span class="cx"> } else {
</span><del>- LOG_ERROR("Could not step index cursor statement into object store records (%i) '%s'", m_statement->database()->lastError(), m_statement->database()->lastErrorMsg());
</del><ins>+ LOG_ERROR("Could not step index cursor statement into object store records (%i) '%s'", m_statement->database().lastError(), m_statement->database().lastErrorMsg());
</ins><span class="cx"> m_completed = true;
</span><span class="cx"> m_errored = true;
</span><span class="cx"> return AdvanceResult::Failure;
</span></span></pre>
</div>
</div>
</body>
</html>