Oilpan: Prepare to move SQLResultSet and SQLResultSetRowList to oilpan heap.

Source/modules/webdatabase/SQLStatementBackend.cpp

 /*
  * Copyright (C) 2007, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 66 matching lines @@
     return adoptRefWillBeNoop(new SQLStatementBackend(frontend, statement, arguments, permissions));
 }
 
 SQLStatementBackend::SQLStatementBackend(PassOwnPtr<AbstractSQLStatement> frontend,
     const String& statement, const Vector<SQLValue>& arguments, int permissions)
     : m_frontend(frontend)
     , m_statement(statement.isolatedCopy())
     , m_arguments(arguments)
     , m_hasCallback(m_frontend->hasCallback())
     , m_hasErrorCallback(m_frontend->hasErrorCallback())
+    , m_resultSet(SQLResultSet::create())
     , m_permissions(permissions)
 {
     m_frontend->setBackend(this);
 }
 
-void SQLStatementBackend::trace(Visitor*)
+void SQLStatementBackend::trace(Visitor* visitor)
 {
+    visitor->trace(m_resultSet);
 }
 
 AbstractSQLStatement* SQLStatementBackend::frontend()
 {
     return m_frontend.get();
 }
 
 PassRefPtr<SQLError> SQLStatementBackend::sqlError() const
 {
     return m_error;
 }
 
-PassRefPtr<SQLResultSet> SQLStatementBackend::sqlResultSet() const
+SQLResultSet* SQLStatementBackend::sqlResultSet() const
 {
-    return m_resultSet;
+    return m_resultSet->isValid() ? m_resultSet.get() : 0;
 }
 
 bool SQLStatementBackend::execute(DatabaseBackend* db)
 {
-    ASSERT(!m_resultSet);
+    ASSERT(!m_resultSet->isValid());
 
     // If we're re-running this statement after a quota violation, we need to clear that error now
     clearFailureDueToQuota();
 
     // This transaction might have been marked bad while it was being set up on the main thread,
     // so if there is still an error, return false.
     if (m_error)
         return false;
 
     db->setAuthorizerPermissions(m_permissions);
@@ skipping 30 matching lines @@
         }
 
         if (result != SQLResultOk) {
             WTF_LOG(StorageAPI, "Failed to bind value index %i to statement for query '%s'", i + 1, m_statement.ascii().data());
             db->reportExecuteStatementResult(3, SQLError::DATABASE_ERR, result);
             m_error = SQLError::create(SQLError::DATABASE_ERR, "could not bind value", result, database->lastErrorMsg());
             return false;
         }
     }
 
-    RefPtr<SQLResultSet> resultSet = SQLResultSet::create();
-
     // Step so we can fetch the column names.
     result = statement.step();
     if (result == SQLResultRow) {
         int columnCount = statement.columnCount();
-        SQLResultSetRowList* rows = resultSet->rows();
+        SQLResultSetRowList* rows = m_resultSet->rows();
 
         for (int i = 0; i < columnCount; i++)
             rows->addColumn(statement.getColumnName(i));
 
         do {
             for (int i = 0; i < columnCount; i++)
                 rows->addResult(statement.getColumnValue(i));
 
             result = statement.step();
         } while (result == SQLResultRow);
 
         if (result != SQLResultDone) {
             db->reportExecuteStatementResult(4, SQLError::DATABASE_ERR, result);
             m_error = SQLError::create(SQLError::DATABASE_ERR, "could not iterate results", result, database->lastErrorMsg());
             return false;
         }
     } else if (result == SQLResultDone) {
         // Didn't find anything, or was an insert
         if (db->lastActionWasInsert())
-            resultSet->setInsertId(database->lastInsertRowID());
+            m_resultSet->setInsertId(database->lastInsertRowID());
     } else if (result == SQLResultFull) {
         // Return the Quota error - the delegate will be asked for more space and this statement might be re-run
         setFailureDueToQuota(db);
         return false;
     } else if (result == SQLResultConstraint) {
         db->reportExecuteStatementResult(6, SQLError::CONSTRAINT_ERR, result);
         m_error = SQLError::create(SQLError::CONSTRAINT_ERR, "could not execute statement due to a constaint failure", result, database->lastErrorMsg());
         return false;
     } else {
         db->reportExecuteStatementResult(5, SQLError::DATABASE_ERR, result);
         m_error = SQLError::create(SQLError::DATABASE_ERR, "could not execute statement", result, database->lastErrorMsg());
         return false;
     }
 
     // FIXME: If the spec allows triggers, and we want to be "accurate" in a different way, we'd use
     // sqlite3_total_changes() here instead of sqlite3_changed, because that includes rows modified from within a trigger
     // For now, this seems sufficient
-    resultSet->setRowsAffected(database->lastChanges());
+    m_resultSet->setRowsAffected(database->lastChanges());
 
-    m_resultSet = resultSet;
+    m_resultSet->setValid();

[haraken, 2014/03/25 07:55:30]

In my understanding, setValid() should be always coupled with setRowsAffected().
If so, shall we set m_valid to true in setRowsAffected()? Then setValid() won't
be necessary.

[tkent, 2014/03/25 08:40:32]

Right.  Done.

     db->reportExecuteStatementResult(0, -1, 0); // OK
     return true;
 }
 
 void SQLStatementBackend::setVersionMismatchedError(DatabaseBackend* database)
 {
-    ASSERT(!m_error && !m_resultSet);
+    ASSERT(!m_error && !m_resultSet->isValid());
     database->reportExecuteStatementResult(7, SQLError::VERSION_ERR, 0);
     m_error = SQLError::create(SQLError::VERSION_ERR, "current version of the database and `oldVersion` argument do not match");
 }
 
 void SQLStatementBackend::setFailureDueToQuota(DatabaseBackend* database)
 {
-    ASSERT(!m_error && !m_resultSet);
+    ASSERT(!m_error && !m_resultSet->isValid());
     database->reportExecuteStatementResult(8, SQLError::QUOTA_ERR, 0);
     m_error = SQLError::create(SQLError::QUOTA_ERR, "there was not enough remaining storage space, or the storage quota was reached and the user declined to allow more space");
 }
 
 void SQLStatementBackend::clearFailureDueToQuota()
 {
     if (lastExecutionFailedDueToQuota())
         m_error = nullptr;
 }
 
 bool SQLStatementBackend::lastExecutionFailedDueToQuota() const
 {
     return m_error && m_error->code() == SQLError::QUOTA_ERR;
 }
 
 } // namespace WebCore