OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Apple Inc. All rights reserved. | 2 * Copyright (C) 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 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 } | 48 } |
49 | 49 |
50 void DatabaseBackend::trace(Visitor* visitor) | 50 void DatabaseBackend::trace(Visitor* visitor) |
51 { | 51 { |
52 visitor->trace(m_transactionQueue); | 52 visitor->trace(m_transactionQueue); |
53 DatabaseBackendBase::trace(visitor); | 53 DatabaseBackendBase::trace(visitor); |
54 } | 54 } |
55 | 55 |
56 bool DatabaseBackend::openAndVerifyVersion(bool setVersionInNewDatabase, Databas
eError& error, String& errorMessage) | 56 bool DatabaseBackend::openAndVerifyVersion(bool setVersionInNewDatabase, Databas
eError& error, String& errorMessage) |
57 { | 57 { |
58 TaskSynchronizer synchronizer; | 58 DatabaseTaskSynchronizer synchronizer; |
59 if (!databaseContext()->databaseThread() || databaseContext()->databaseThrea
d()->terminationRequested(&synchronizer)) | 59 if (!databaseContext()->databaseThread() || databaseContext()->databaseThrea
d()->terminationRequested(&synchronizer)) |
60 return false; | 60 return false; |
61 | 61 |
62 DatabaseTracker::tracker().prepareToOpenDatabase(this); | 62 DatabaseTracker::tracker().prepareToOpenDatabase(this); |
63 bool success = false; | 63 bool success = false; |
64 OwnPtr<DatabaseOpenTask> task = DatabaseOpenTask::create(this, setVersionInN
ewDatabase, &synchronizer, error, errorMessage, success); | 64 OwnPtr<DatabaseOpenTask> task = DatabaseOpenTask::create(this, setVersionInN
ewDatabase, &synchronizer, error, errorMessage, success); |
65 databaseContext()->databaseThread()->scheduleTask(task.release()); | 65 databaseContext()->databaseThread()->scheduleTask(task.release()); |
66 synchronizer.waitForTaskCompletion(); | 66 synchronizer.waitForTaskCompletion(); |
67 | 67 |
68 return success; | 68 return success; |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 { | 162 { |
163 return databaseContext()->databaseThread()->transactionClient(); | 163 return databaseContext()->databaseThread()->transactionClient(); |
164 } | 164 } |
165 | 165 |
166 SQLTransactionCoordinator* DatabaseBackend::transactionCoordinator() const | 166 SQLTransactionCoordinator* DatabaseBackend::transactionCoordinator() const |
167 { | 167 { |
168 return databaseContext()->databaseThread()->transactionCoordinator(); | 168 return databaseContext()->databaseThread()->transactionCoordinator(); |
169 } | 169 } |
170 | 170 |
171 } // namespace WebCore | 171 } // namespace WebCore |
OLD | NEW |