| 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" |
| 40 #include "platform/wtf/PtrUtil.h" |
| 39 #include "public/platform/Platform.h" | 41 #include "public/platform/Platform.h" |
| 40 #include "wtf/PtrUtil.h" | |
| 41 #include <memory> | |
| 42 | 42 |
| 43 namespace blink { | 43 namespace blink { |
| 44 | 44 |
| 45 DatabaseThread::DatabaseThread() | 45 DatabaseThread::DatabaseThread() |
| 46 : transaction_client_(WTF::MakeUnique<SQLTransactionClient>()), | 46 : transaction_client_(WTF::MakeUnique<SQLTransactionClient>()), |
| 47 cleanup_sync_(nullptr), | 47 cleanup_sync_(nullptr), |
| 48 termination_requested_(false) { | 48 termination_requested_(false) { |
| 49 DCHECK(IsMainThread()); | 49 DCHECK(IsMainThread()); |
| 50 } | 50 } |
| 51 | 51 |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 MutexLocker lock(termination_requested_mutex_); | 168 MutexLocker lock(termination_requested_mutex_); |
| 169 ASSERT(!termination_requested_); | 169 ASSERT(!termination_requested_); |
| 170 } | 170 } |
| 171 #endif | 171 #endif |
| 172 // WebThread takes ownership of the task. | 172 // WebThread takes ownership of the task. |
| 173 thread_->PostTask(BLINK_FROM_HERE, | 173 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 |