| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2013 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2013 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 27 */ | 27 */ |
| 28 | 28 |
| 29 #include "modules/webdatabase/DatabaseTask.h" | 29 #include "modules/webdatabase/DatabaseTask.h" |
| 30 | 30 |
| 31 #include "modules/webdatabase/Database.h" | 31 #include "modules/webdatabase/Database.h" |
| 32 #include "modules/webdatabase/DatabaseContext.h" | 32 #include "modules/webdatabase/DatabaseContext.h" |
| 33 #include "modules/webdatabase/DatabaseThread.h" | 33 #include "modules/webdatabase/DatabaseThread.h" |
| 34 #include "platform/Logging.h" | 34 #include "modules/webdatabase/StorageLog.h" |
| 35 | 35 |
| 36 namespace blink { | 36 namespace blink { |
| 37 | 37 |
| 38 DatabaseTask::DatabaseTask(Database* database, TaskSynchronizer* synchronizer) | 38 DatabaseTask::DatabaseTask(Database* database, TaskSynchronizer* synchronizer) |
| 39 : m_database(database) | 39 : m_database(database) |
| 40 , m_synchronizer(synchronizer) | 40 , m_synchronizer(synchronizer) |
| 41 #if !LOG_DISABLED | 41 #if !LOG_DISABLED |
| 42 , m_complete(false) | 42 , m_complete(false) |
| 43 #endif | 43 #endif |
| 44 { | 44 { |
| (...skipping 13 matching lines...) Expand all Loading... |
| 58 ASSERT(!m_complete); | 58 ASSERT(!m_complete); |
| 59 #endif | 59 #endif |
| 60 | 60 |
| 61 if (!m_synchronizer && !m_database->getDatabaseContext()->databaseThread()->
isDatabaseOpen(m_database.get())) { | 61 if (!m_synchronizer && !m_database->getDatabaseContext()->databaseThread()->
isDatabaseOpen(m_database.get())) { |
| 62 taskCancelled(); | 62 taskCancelled(); |
| 63 #if !LOG_DISABLED | 63 #if !LOG_DISABLED |
| 64 m_complete = true; | 64 m_complete = true; |
| 65 #endif | 65 #endif |
| 66 return; | 66 return; |
| 67 } | 67 } |
| 68 | 68 #if DCHECK_IS_ON() |
| 69 WTF_LOG(StorageAPI, "Performing %s %p\n", debugTaskName(), this); | 69 STORAGE_DVLOG(1) << "Performing " << debugTaskName() << " " << this; |
| 70 | 70 #endif |
| 71 m_database->resetAuthorizer(); | 71 m_database->resetAuthorizer(); |
| 72 doPerformTask(); | 72 doPerformTask(); |
| 73 | 73 |
| 74 if (m_synchronizer) | 74 if (m_synchronizer) |
| 75 m_synchronizer->taskCompleted(); | 75 m_synchronizer->taskCompleted(); |
| 76 | 76 |
| 77 #if !LOG_DISABLED | 77 #if !LOG_DISABLED |
| 78 m_complete = true; | 78 m_complete = true; |
| 79 #endif | 79 #endif |
| 80 } | 80 } |
| (...skipping 12 matching lines...) Expand all Loading... |
| 93 } | 93 } |
| 94 | 94 |
| 95 void Database::DatabaseOpenTask::doPerformTask() | 95 void Database::DatabaseOpenTask::doPerformTask() |
| 96 { | 96 { |
| 97 String errorMessage; | 97 String errorMessage; |
| 98 m_success = database()->performOpenAndVerify(m_setVersionInNewDatabase, m_er
ror, errorMessage); | 98 m_success = database()->performOpenAndVerify(m_setVersionInNewDatabase, m_er
ror, errorMessage); |
| 99 if (!m_success) | 99 if (!m_success) |
| 100 m_errorMessage = errorMessage.isolatedCopy(); | 100 m_errorMessage = errorMessage.isolatedCopy(); |
| 101 } | 101 } |
| 102 | 102 |
| 103 #if !LOG_DISABLED | 103 #if DCHECK_IS_ON() |
| 104 const char* Database::DatabaseOpenTask::debugTaskName() const | 104 const char* Database::DatabaseOpenTask::debugTaskName() const |
| 105 { | 105 { |
| 106 return "DatabaseOpenTask"; | 106 return "DatabaseOpenTask"; |
| 107 } | 107 } |
| 108 #endif | 108 #endif |
| 109 | 109 |
| 110 // *** DatabaseCloseTask *** | 110 // *** DatabaseCloseTask *** |
| 111 // Closes the database. | 111 // Closes the database. |
| 112 | 112 |
| 113 Database::DatabaseCloseTask::DatabaseCloseTask(Database* database, TaskSynchroni
zer* synchronizer) | 113 Database::DatabaseCloseTask::DatabaseCloseTask(Database* database, TaskSynchroni
zer* synchronizer) |
| 114 : DatabaseTask(database, synchronizer) | 114 : DatabaseTask(database, synchronizer) |
| 115 { | 115 { |
| 116 } | 116 } |
| 117 | 117 |
| 118 void Database::DatabaseCloseTask::doPerformTask() | 118 void Database::DatabaseCloseTask::doPerformTask() |
| 119 { | 119 { |
| 120 database()->close(); | 120 database()->close(); |
| 121 } | 121 } |
| 122 | 122 |
| 123 #if !LOG_DISABLED | 123 #if DCHECK_IS_ON() |
| 124 const char* Database::DatabaseCloseTask::debugTaskName() const | 124 const char* Database::DatabaseCloseTask::debugTaskName() const |
| 125 { | 125 { |
| 126 return "DatabaseCloseTask"; | 126 return "DatabaseCloseTask"; |
| 127 } | 127 } |
| 128 #endif | 128 #endif |
| 129 | 129 |
| 130 // *** DatabaseTransactionTask *** | 130 // *** DatabaseTransactionTask *** |
| 131 // Starts a transaction that will report its results via a callback. | 131 // Starts a transaction that will report its results via a callback. |
| 132 | 132 |
| 133 Database::DatabaseTransactionTask::DatabaseTransactionTask(SQLTransactionBackend
* transaction) | 133 Database::DatabaseTransactionTask::DatabaseTransactionTask(SQLTransactionBackend
* transaction) |
| (...skipping 17 matching lines...) Expand all Loading... |
| 151 // then we must either have an error or an interruption. Give the | 151 // then we must either have an error or an interruption. Give the |
| 152 // transaction a chance to clean up since it may not have been able to | 152 // transaction a chance to clean up since it may not have been able to |
| 153 // run to its clean up state. | 153 // run to its clean up state. |
| 154 | 154 |
| 155 // Transaction phase 2 cleanup. See comment on "What happens if a | 155 // Transaction phase 2 cleanup. See comment on "What happens if a |
| 156 // transaction is interrupted?" at the top of SQLTransactionBackend.cpp. | 156 // transaction is interrupted?" at the top of SQLTransactionBackend.cpp. |
| 157 | 157 |
| 158 m_transaction->notifyDatabaseThreadIsShuttingDown(); | 158 m_transaction->notifyDatabaseThreadIsShuttingDown(); |
| 159 } | 159 } |
| 160 | 160 |
| 161 #if !LOG_DISABLED | 161 #if DCHECK_IS_ON() |
| 162 const char* Database::DatabaseTransactionTask::debugTaskName() const | 162 const char* Database::DatabaseTransactionTask::debugTaskName() const |
| 163 { | 163 { |
| 164 return "DatabaseTransactionTask"; | 164 return "DatabaseTransactionTask"; |
| 165 } | 165 } |
| 166 #endif | 166 #endif |
| 167 | 167 |
| 168 // *** DatabaseTableNamesTask *** | 168 // *** DatabaseTableNamesTask *** |
| 169 // Retrieves a list of all tables in the database - for WebInspector support. | 169 // Retrieves a list of all tables in the database - for WebInspector support. |
| 170 | 170 |
| 171 Database::DatabaseTableNamesTask::DatabaseTableNamesTask(Database* database, Tas
kSynchronizer* synchronizer, Vector<String>& names) | 171 Database::DatabaseTableNamesTask::DatabaseTableNamesTask(Database* database, Tas
kSynchronizer* synchronizer, Vector<String>& names) |
| 172 : DatabaseTask(database, synchronizer) | 172 : DatabaseTask(database, synchronizer) |
| 173 , m_tableNames(names) | 173 , m_tableNames(names) |
| 174 { | 174 { |
| 175 ASSERT(synchronizer); // A task with output parameters is supposed to be syn
chronous. | 175 ASSERT(synchronizer); // A task with output parameters is supposed to be syn
chronous. |
| 176 } | 176 } |
| 177 | 177 |
| 178 void Database::DatabaseTableNamesTask::doPerformTask() | 178 void Database::DatabaseTableNamesTask::doPerformTask() |
| 179 { | 179 { |
| 180 m_tableNames = database()->performGetTableNames(); | 180 m_tableNames = database()->performGetTableNames(); |
| 181 } | 181 } |
| 182 | 182 |
| 183 #if !LOG_DISABLED | 183 #if DCHECK_IS_ON() |
| 184 const char* Database::DatabaseTableNamesTask::debugTaskName() const | 184 const char* Database::DatabaseTableNamesTask::debugTaskName() const |
| 185 { | 185 { |
| 186 return "DatabaseTableNamesTask"; | 186 return "DatabaseTableNamesTask"; |
| 187 } | 187 } |
| 188 #endif | 188 #endif |
| 189 | 189 |
| 190 } // namespace blink | 190 } // namespace blink |
| OLD | NEW |