Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1069)

Side by Side Diff: third_party/WebKit/Source/modules/webdatabase/DatabaseThread.cpp

Issue 1818233003: Merge WTF::initializeMainThread into WTF::initialize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 18 matching lines...) Expand all
29 #include "modules/webdatabase/DatabaseThread.h" 29 #include "modules/webdatabase/DatabaseThread.h"
30 30
31 #include "modules/webdatabase/Database.h" 31 #include "modules/webdatabase/Database.h"
32 #include "modules/webdatabase/DatabaseTask.h" 32 #include "modules/webdatabase/DatabaseTask.h"
33 #include "modules/webdatabase/SQLTransactionClient.h" 33 #include "modules/webdatabase/SQLTransactionClient.h"
34 #include "modules/webdatabase/SQLTransactionCoordinator.h" 34 #include "modules/webdatabase/SQLTransactionCoordinator.h"
35 #include "platform/Logging.h" 35 #include "platform/Logging.h"
36 #include "platform/ThreadSafeFunctional.h" 36 #include "platform/ThreadSafeFunctional.h"
37 #include "platform/WebThreadSupportingGC.h" 37 #include "platform/WebThreadSupportingGC.h"
38 #include "public/platform/Platform.h" 38 #include "public/platform/Platform.h"
39 #include "wtf/MainThread.h"
40 39
41 namespace blink { 40 namespace blink {
42 41
43 DatabaseThread::DatabaseThread() 42 DatabaseThread::DatabaseThread()
44 : m_transactionClient(adoptPtr(new SQLTransactionClient())) 43 : m_transactionClient(adoptPtr(new SQLTransactionClient()))
45 , m_transactionCoordinator(new SQLTransactionCoordinator()) 44 , m_transactionCoordinator(new SQLTransactionCoordinator())
46 , m_cleanupSync(nullptr) 45 , m_cleanupSync(nullptr)
47 , m_terminationRequested(false) 46 , m_terminationRequested(false)
48 { 47 {
49 } 48 }
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 { 166 {
168 MutexLocker lock(m_terminationRequestedMutex); 167 MutexLocker lock(m_terminationRequestedMutex);
169 ASSERT(!m_terminationRequested); 168 ASSERT(!m_terminationRequested);
170 } 169 }
171 #endif 170 #endif
172 // WebThread takes ownership of the task. 171 // WebThread takes ownership of the task.
173 m_thread->postTask(BLINK_FROM_HERE, threadSafeBind(&DatabaseTask::run, task) ); 172 m_thread->postTask(BLINK_FROM_HERE, threadSafeBind(&DatabaseTask::run, task) );
174 } 173 }
175 174
176 } // namespace blink 175 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698