| 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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 if (m_deleted) | 138 if (m_deleted) |
| 139 return String(); | 139 return String(); |
| 140 return DatabaseBackendBase::version(); | 140 return DatabaseBackendBase::version(); |
| 141 } | 141 } |
| 142 | 142 |
| 143 void Database::markAsDeletedAndClose() | 143 void Database::markAsDeletedAndClose() |
| 144 { | 144 { |
| 145 if (m_deleted || !databaseContext()->databaseThread()) | 145 if (m_deleted || !databaseContext()->databaseThread()) |
| 146 return; | 146 return; |
| 147 | 147 |
| 148 LOG(StorageAPI, "Marking %s (%p) as deleted", stringIdentifier().ascii().dat
a(), this); | 148 LOG_INFO(StorageAPI, "Marking %s (%p) as deleted", stringIdentifier().ascii(
).data(), this); |
| 149 m_deleted = true; | 149 m_deleted = true; |
| 150 | 150 |
| 151 DatabaseTaskSynchronizer synchronizer; | 151 DatabaseTaskSynchronizer synchronizer; |
| 152 if (databaseContext()->databaseThread()->terminationRequested(&synchronizer)
) { | 152 if (databaseContext()->databaseThread()->terminationRequested(&synchronizer)
) { |
| 153 LOG(StorageAPI, "Database handle %p is on a terminated DatabaseThread, c
annot be marked for normal closure\n", this); | 153 LOG_INFO(StorageAPI, "Database handle %p is on a terminated DatabaseThre
ad, cannot be marked for normal closure\n", this); |
| 154 return; | 154 return; |
| 155 } | 155 } |
| 156 | 156 |
| 157 OwnPtr<DatabaseCloseTask> task = DatabaseCloseTask::create(this, &synchroniz
er); | 157 OwnPtr<DatabaseCloseTask> task = DatabaseCloseTask::create(this, &synchroniz
er); |
| 158 databaseContext()->databaseThread()->scheduleImmediateTask(task.release()); | 158 databaseContext()->databaseThread()->scheduleImmediateTask(task.release()); |
| 159 synchronizer.waitForTaskCompletion(); | 159 synchronizer.waitForTaskCompletion(); |
| 160 } | 160 } |
| 161 | 161 |
| 162 void Database::closeImmediately() | 162 void Database::closeImmediately() |
| 163 { | 163 { |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 void Database::reportCommitTransactionResult(int errorSite, int webSqlErrorCode,
int sqliteErrorCode) | 295 void Database::reportCommitTransactionResult(int errorSite, int webSqlErrorCode,
int sqliteErrorCode) |
| 296 { | 296 { |
| 297 backend()->reportCommitTransactionResult(errorSite, webSqlErrorCode, sqliteE
rrorCode); | 297 backend()->reportCommitTransactionResult(errorSite, webSqlErrorCode, sqliteE
rrorCode); |
| 298 } | 298 } |
| 299 | 299 |
| 300 #endif | 300 #endif |
| 301 | 301 |
| 302 } // namespace WebCore | 302 } // namespace WebCore |
| 303 | 303 |
| 304 #endif // ENABLE(SQL_DATABASE) | 304 #endif // ENABLE(SQL_DATABASE) |
| OLD | NEW |