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

Side by Side Diff: Source/modules/webdatabase/DatabaseManager.h

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.cpp ('k') | Source/modules/webdatabase/DatabaseManager.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 28 matching lines...) Expand all
39 class DatabaseCallback; 39 class DatabaseCallback;
40 class DatabaseContext; 40 class DatabaseContext;
41 class ExceptionState; 41 class ExceptionState;
42 class SecurityOrigin; 42 class SecurityOrigin;
43 class ExecutionContext; 43 class ExecutionContext;
44 44
45 class DatabaseManager { 45 class DatabaseManager {
46 WTF_MAKE_NONCOPYABLE(DatabaseManager); WTF_MAKE_FAST_ALLOCATED; 46 WTF_MAKE_NONCOPYABLE(DatabaseManager); WTF_MAKE_FAST_ALLOCATED;
47 public: 47 public:
48 static DatabaseManager& manager(); 48 static DatabaseManager& manager();
49 static void terminateDatabaseThread();
49 50
50 // These 2 methods are for DatabaseContext (un)registration, and should only 51 // These 2 methods are for DatabaseContext (un)registration, and should only
51 // be called by the DatabaseContext constructor and destructor. 52 // be called by the DatabaseContext constructor and destructor.
52 void registerDatabaseContext(DatabaseContext*); 53 void registerDatabaseContext(DatabaseContext*);
53 void unregisterDatabaseContext(DatabaseContext*); 54 void unregisterDatabaseContext(DatabaseContext*);
54 55
55 #if ENABLE(ASSERT) 56 #if ENABLE(ASSERT)
56 void didConstructDatabaseContext(); 57 void didConstructDatabaseContext();
57 void didDestructDatabaseContext(); 58 void didDestructDatabaseContext();
58 #else 59 #else
(...skipping 28 matching lines...) Expand all
87 ContextMap m_contextMap; 88 ContextMap m_contextMap;
88 #if ENABLE(ASSERT) 89 #if ENABLE(ASSERT)
89 int m_databaseContextRegisteredCount; 90 int m_databaseContextRegisteredCount;
90 int m_databaseContextInstanceCount; 91 int m_databaseContextInstanceCount;
91 #endif 92 #endif
92 }; 93 };
93 94
94 } // namespace blink 95 } // namespace blink
95 96
96 #endif // DatabaseManager_h 97 #endif // DatabaseManager_h
OLDNEW
« no previous file with comments | « Source/modules/InitModules.cpp ('k') | Source/modules/webdatabase/DatabaseManager.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698