Changeset 179774 in webkit

Timestamp:

Feb 6, 2015, 7:06:58 PM (12 years ago)

Author:

Chris Dumez

Message:

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):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/icon/IconDatabase.cpp (modified) (1 diff)
• WebCore/platform/sql/SQLiteStatement.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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):
+
 2015-02-06  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/loader/icon/IconDatabase.cpp

@@ -1813 +1813 @@
 inline void readySQLiteStatement(std::unique_ptr<SQLiteStatement>& statement, SQLiteDatabase& db, const String& str)
 {
-    if (statement && (statement->database() != &db || statement->isExpired())) {
+    if (statement && (&statement->database() != &db || statement->isExpired())) {
         if (statement->isExpired())
             LOG(IconDatabase, "SQLiteStatement associated with %s is expired", str.ascii().data());

trunk/Source/WebCore/platform/sql/SQLiteStatement.h

@@ -91 +91 @@
     bool returnDoubleResults(int col, Vector<double>&);
 
-    SQLiteDatabase* database() { return &m_database; }
+    SQLiteDatabase& database() { return m_database; }
     
     const String& query() const { return m_query; }

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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):
+
 2015-02-06  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp

@@ -330 +330 @@
         }
 
-        SQLiteStatement objectStoreStatement(*m_statement->database(), "SELECT value FROM Records WHERE key = CAST(? AS TEXT) and objectStoreID = ?;");
+        SQLiteStatement objectStoreStatement(m_statement->database(), "SELECT value FROM Records WHERE key = CAST(? AS TEXT) and objectStoreID = ?;");
 
         if (objectStoreStatement.prepare() != SQLResultOk
             || objectStoreStatement.bindBlob(1, m_currentValueBuffer.data(), m_currentValueBuffer.size()) != SQLResultOk
             || objectStoreStatement.bindInt64(2, m_objectStoreID) != SQLResultOk) {
-            LOG_ERROR("Could not create index cursor statement into object store records (%i) '%s'", m_statement->database()->lastError(), m_statement->database()->lastErrorMsg());
+            LOG_ERROR("Could not create index cursor statement into object store records (%i) '%s'", m_statement->database().lastError(), m_statement->database().lastErrorMsg());
             m_completed = true;
             m_errored = true;
@@ -350 +350 @@
             return AdvanceResult::ShouldAdvanceAgain;
         } else {
-            LOG_ERROR("Could not step index cursor statement into object store records (%i) '%s'", m_statement->database()->lastError(), m_statement->database()->lastErrorMsg());
+            LOG_ERROR("Could not step index cursor statement into object store records (%i) '%s'", m_statement->database().lastError(), m_statement->database().lastErrorMsg());
             m_completed = true;
             m_errored = true;