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 10 matching lines...) Expand all Loading... |
21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
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/DatabaseThread.h" | 29 #include "modules/webdatabase/DatabaseThread.h" |
30 | 30 |
| 31 #include <memory> |
31 #include "modules/webdatabase/Database.h" | 32 #include "modules/webdatabase/Database.h" |
32 #include "modules/webdatabase/DatabaseTask.h" | 33 #include "modules/webdatabase/DatabaseTask.h" |
33 #include "modules/webdatabase/SQLTransactionClient.h" | 34 #include "modules/webdatabase/SQLTransactionClient.h" |
34 #include "modules/webdatabase/SQLTransactionCoordinator.h" | 35 #include "modules/webdatabase/SQLTransactionCoordinator.h" |
35 #include "modules/webdatabase/StorageLog.h" | 36 #include "modules/webdatabase/StorageLog.h" |
36 #include "platform/CrossThreadFunctional.h" | 37 #include "platform/CrossThreadFunctional.h" |
37 #include "platform/WaitableEvent.h" | 38 #include "platform/WaitableEvent.h" |
38 #include "platform/WebThreadSupportingGC.h" | 39 #include "platform/WebThreadSupportingGC.h" |
39 #include "public/platform/Platform.h" | 40 #include "public/platform/Platform.h" |
40 #include "wtf/PtrUtil.h" | 41 #include "wtf/PtrUtil.h" |
41 #include <memory> | |
42 | 42 |
43 namespace blink { | 43 namespace blink { |
44 | 44 |
45 DatabaseThread::DatabaseThread() | 45 DatabaseThread::DatabaseThread() |
46 : m_transactionClient(WTF::makeUnique<SQLTransactionClient>()), | 46 : m_transactionClient(WTF::makeUnique<SQLTransactionClient>()), |
47 m_cleanupSync(nullptr), | 47 m_cleanupSync(nullptr), |
48 m_terminationRequested(false) { | 48 m_terminationRequested(false) { |
49 DCHECK(isMainThread()); | 49 DCHECK(isMainThread()); |
50 } | 50 } |
51 | 51 |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
167 MutexLocker lock(m_terminationRequestedMutex); | 167 MutexLocker lock(m_terminationRequestedMutex); |
168 ASSERT(!m_terminationRequested); | 168 ASSERT(!m_terminationRequested); |
169 } | 169 } |
170 #endif | 170 #endif |
171 // WebThread takes ownership of the task. | 171 // WebThread takes ownership of the task. |
172 m_thread->postTask(BLINK_FROM_HERE, | 172 m_thread->postTask(BLINK_FROM_HERE, |
173 crossThreadBind(&DatabaseTask::run, std::move(task))); | 173 crossThreadBind(&DatabaseTask::run, std::move(task))); |
174 } | 174 } |
175 | 175 |
176 } // namespace blink | 176 } // namespace blink |
OLD | NEW |