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

Unified Diff: Source/WebCore/workers/WorkerThread.cpp

Issue 13774005: Remove the ENABLE_SQL_DATABASE compile-time flag. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: python Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/page/ChromeClient.h ('k') | Source/WebKit/chromium/features.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/workers/WorkerThread.cpp
diff --git a/Source/WebCore/workers/WorkerThread.cpp b/Source/WebCore/workers/WorkerThread.cpp
index c8c492241bb53c72c321a23b1da05f4ae6364b13..c39855844f78aa312951edb5fcb0e3760c86ebf5 100644
--- a/Source/WebCore/workers/WorkerThread.cpp
+++ b/Source/WebCore/workers/WorkerThread.cpp
@@ -30,6 +30,8 @@
#include "WorkerThread.h"
+#include "DatabaseManager.h"
+#include "DatabaseTask.h"
#include "DedicatedWorkerContext.h"
#include "InspectorInstrumentation.h"
#include "KURL.h"
@@ -41,10 +43,6 @@
#include <wtf/Noncopyable.h>
#include <wtf/text/WTFString.h>
-#if ENABLE(SQL_DATABASE)
-#include "DatabaseManager.h"
-#include "DatabaseTask.h"
-#endif
#if PLATFORM(CHROMIUM)
#include <public/Platform.h>
@@ -227,11 +225,9 @@ public:
ASSERT_WITH_SECURITY_IMPLICATION(context->isWorkerContext());
WorkerContext* workerContext = static_cast<WorkerContext*>(context);
-#if ENABLE(SQL_DATABASE)
// FIXME: Should we stop the databases as part of stopActiveDOMObjects() below?
DatabaseTaskSynchronizer cleanupSync;
DatabaseManager::manager().stopDatabases(workerContext, &cleanupSync);
-#endif
workerContext->stopActiveDOMObjects();
@@ -241,11 +237,9 @@ public:
// which become dangling once Heap is destroyed.
workerContext->removeAllEventListeners();
-#if ENABLE(SQL_DATABASE)
// We wait for the database thread to clean up all its stuff so that we
// can do more stringent leak checks as we exit.
cleanupSync.waitForTaskCompletion();
-#endif
// Stick a shutdown command at the end of the queue, so that we deal
// with all the cleanup tasks the databases post first.
@@ -264,9 +258,7 @@ void WorkerThread::stop()
if (m_workerContext) {
m_workerContext->script()->scheduleExecutionTermination();
-#if ENABLE(SQL_DATABASE)
DatabaseManager::manager().interruptAllDatabasesForContext(m_workerContext.get());
-#endif
m_runLoop.postTaskAndTerminate(WorkerThreadShutdownStartTask::create());
return;
}
« no previous file with comments | « Source/WebCore/page/ChromeClient.h ('k') | Source/WebKit/chromium/features.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698