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

Side by Side Diff: Source/modules/InitModules.cpp

Issue 930793002: Merge 190021 "Web SQL: Termiante database thread before finalizi..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2272/
Patch Set: Created 5 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « Source/modules/InitModules.h ('k') | Source/modules/webdatabase/DatabaseManager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "InitModules.h" 6 #include "InitModules.h"
7 7
8 #include "bindings/modules/v8/ModuleBindingsInitializer.h" 8 #include "bindings/modules/v8/ModuleBindingsInitializer.h"
9 #include "core/EventTypeNames.h" 9 #include "core/EventTypeNames.h"
10 #include "core/dom/Document.h" 10 #include "core/dom/Document.h"
11 #include "modules/EventModulesFactory.h" 11 #include "modules/EventModulesFactory.h"
12 #include "modules/EventModulesNames.h" 12 #include "modules/EventModulesNames.h"
13 #include "modules/EventTargetModulesNames.h" 13 #include "modules/EventTargetModulesNames.h"
14 #include "modules/IndexedDBNames.h" 14 #include "modules/IndexedDBNames.h"
15 #include "modules/webdatabase/DatabaseManager.h"
15 16
16 namespace blink { 17 namespace blink {
17 18
18 void ModulesInitializer::init() 19 void ModulesInitializer::init()
19 { 20 {
20 ASSERT(!isInitialized()); 21 ASSERT(!isInitialized());
21 22
22 // Strings must be initialized before calling CoreInitializer::init(). 23 // Strings must be initialized before calling CoreInitializer::init().
23 EventNames::initModules(); 24 EventNames::initModules();
24 EventTargetNames::initModules(); 25 EventTargetNames::initModules();
25 Document::registerEventFactory(EventModulesFactory::create()); 26 Document::registerEventFactory(EventModulesFactory::create());
26 ModuleBindingsInitializer::init(); 27 ModuleBindingsInitializer::init();
27 IndexedDBNames::init(); 28 IndexedDBNames::init();
28 29
29 CoreInitializer::init(); 30 CoreInitializer::init();
30 31
31 ASSERT(isInitialized()); 32 ASSERT(isInitialized());
32 } 33 }
33 34
35 void ModulesInitializer::terminateThreads()
36 {
37 DatabaseManager::terminateDatabaseThread();
38 }
39
34 } // namespace blink 40 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/InitModules.h ('k') | Source/modules/webdatabase/DatabaseManager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698