Oilpan: Prepare to move SQLError to oilpan heap.

Source/modules/webdatabase/SQLTransaction.cpp

 /*
  * Copyright (C) 2007, 2008, 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 139 matching lines @@
     if (callback) {
         m_executeSqlAllowed = true;
         shouldDeliverErrorCallback = !callback->handleEvent(this);
         m_executeSqlAllowed = false;
     }
 
     // Spec 4.3.2 5: If the transaction callback was null or raised an exception, jump to the error callback
     SQLTransactionState nextState = SQLTransactionState::RunStatements;
     if (shouldDeliverErrorCallback) {
         m_database->reportStartTransactionResult(5, SQLError::UNKNOWN_ERR, 0);
-        m_transactionError = SQLError::create(SQLError::UNKNOWN_ERR, "the SQLTransactionCallback was null or threw an exception");
+        m_transactionError = SQLErrorData::create(SQLError::UNKNOWN_ERR, "the SQLTransactionCallback was null or threw an exception");
         nextState = SQLTransactionState::DeliverTransactionErrorCallback;
     }
     m_database->reportStartTransactionResult(0, -1, 0); // OK
     return nextState;
 }
 
 SQLTransactionState SQLTransaction::deliverTransactionErrorCallback()
 {
     // Spec 4.3.2.10: If exists, invoke error callback with the last
     // error to have occurred in this transaction.
     OwnPtr<SQLTransactionErrorCallback> errorCallback = m_errorCallbackWrapper.unwrap();
     if (errorCallback) {
         // If we get here with an empty m_transactionError, then the backend
         // must be waiting in the idle state waiting for this state to finish.
         // Hence, it's thread safe to fetch the backend transactionError without
         // a lock.
-        if (!m_transactionError)
-            m_transactionError = m_backend->transactionError();
+        if (!m_transactionError && m_backend->transactionError())
+            m_transactionError = SQLErrorData::create(*m_backend->transactionError());

[haraken, 2014/03/25 11:50:05]

I think you should add ASSERT(m_backend->transactionError()) instead of the '&&
m_backend->transactionError()' check.

As far as I see the previous code, it's not possible that both
m_transactionError and m_backend->transactionError() are 0.

[tkent, 2014/03/25 22:07:13]

Done.

 
         ASSERT(m_transactionError);
-        errorCallback->handleEvent(m_transactionError.get());
+        RefPtrWillBeRawPtr<SQLError> error = SQLError::create(*m_transactionError);
+        errorCallback->handleEvent(error.get());
 
         m_transactionError = nullptr;
     }
 
     clearCallbackWrappers();
 
     // Spec 4.3.2.10: Rollback the transaction.
     return SQLTransactionState::CleanupAfterTransactionErrorCallback;
 }
 
 SQLTransactionState SQLTransaction::deliverStatementCallback()
 {
     // Spec 4.3.2.6.6 and 4.3.2.6.3: If the statement callback went wrong, jump to the transaction error callback
     // Otherwise, continue to loop through the statement queue
     m_executeSqlAllowed = true;
 
     AbstractSQLStatement* currentAbstractStatement = m_backend->currentStatement();
     SQLStatement* currentStatement = static_cast<SQLStatement*>(currentAbstractStatement);
     ASSERT(currentStatement);
 
     bool result = currentStatement->performCallback(this);
 
     m_executeSqlAllowed = false;
 
     if (result) {
         m_database->reportCommitTransactionResult(2, SQLError::UNKNOWN_ERR, 0);
-        m_transactionError = SQLError::create(SQLError::UNKNOWN_ERR, "the statement callback raised an exception or statement error callback did not return false");
+        m_transactionError = SQLErrorData::create(SQLError::UNKNOWN_ERR, "the statement callback raised an exception or statement error callback did not return false");
         return nextStateForTransactionError();
     }
     return SQLTransactionState::RunStatements;
 }
 
 SQLTransactionState SQLTransaction::deliverQuotaIncreaseCallback()
 {
     ASSERT(m_backend->currentStatement());
 
     bool shouldRetryCurrentStatement = m_database->transactionClient()->didExceedQuota(database());
@@ skipping 90 matching lines @@
     m_successCallbackWrapper.clear();
     m_errorCallbackWrapper.clear();
 }
 
 PassOwnPtr<SQLTransactionErrorCallback> SQLTransaction::releaseErrorCallback()
 {
     return m_errorCallbackWrapper.unwrap();
 }
 
 } // namespace WebCore