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 25 matching lines...) Expand all Loading... |
36 #include "platform/CrossThreadFunctional.h" | 36 #include "platform/CrossThreadFunctional.h" |
37 #include "platform/WaitableEvent.h" | 37 #include "platform/WaitableEvent.h" |
38 #include "platform/WebThreadSupportingGC.h" | 38 #include "platform/WebThreadSupportingGC.h" |
39 #include "public/platform/Platform.h" | 39 #include "public/platform/Platform.h" |
40 #include "wtf/PtrUtil.h" | 40 #include "wtf/PtrUtil.h" |
41 #include <memory> | 41 #include <memory> |
42 | 42 |
43 namespace blink { | 43 namespace blink { |
44 | 44 |
45 DatabaseThread::DatabaseThread() | 45 DatabaseThread::DatabaseThread() |
46 : m_transactionClient(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 |
52 DatabaseThread::~DatabaseThread() { | 52 DatabaseThread::~DatabaseThread() { |
53 ASSERT(m_openDatabaseSet.isEmpty()); | 53 ASSERT(m_openDatabaseSet.isEmpty()); |
54 ASSERT(!m_thread); | 54 ASSERT(!m_thread); |
55 } | 55 } |
56 | 56 |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 MutexLocker lock(m_terminationRequestedMutex); | 168 MutexLocker lock(m_terminationRequestedMutex); |
169 ASSERT(!m_terminationRequested); | 169 ASSERT(!m_terminationRequested); |
170 } | 170 } |
171 #endif | 171 #endif |
172 // WebThread takes ownership of the task. | 172 // WebThread takes ownership of the task. |
173 m_thread->postTask(BLINK_FROM_HERE, | 173 m_thread->postTask(BLINK_FROM_HERE, |
174 crossThreadBind(&DatabaseTask::run, std::move(task))); | 174 crossThreadBind(&DatabaseTask::run, std::move(task))); |
175 } | 175 } |
176 | 176 |
177 } // namespace blink | 177 } // namespace blink |
OLD | NEW |