OLD | NEW |
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 25 matching lines...) Expand all Loading... |
36 #include "modules/webdatabase/AbstractDatabaseServer.h" | 36 #include "modules/webdatabase/AbstractDatabaseServer.h" |
37 #include "modules/webdatabase/Database.h" | 37 #include "modules/webdatabase/Database.h" |
38 #include "modules/webdatabase/DatabaseBackend.h" | 38 #include "modules/webdatabase/DatabaseBackend.h" |
39 #include "modules/webdatabase/DatabaseBackendBase.h" | 39 #include "modules/webdatabase/DatabaseBackendBase.h" |
40 #include "modules/webdatabase/DatabaseBackendSync.h" | 40 #include "modules/webdatabase/DatabaseBackendSync.h" |
41 #include "modules/webdatabase/DatabaseCallback.h" | 41 #include "modules/webdatabase/DatabaseCallback.h" |
42 #include "modules/webdatabase/DatabaseContext.h" | 42 #include "modules/webdatabase/DatabaseContext.h" |
43 #include "modules/webdatabase/DatabaseServer.h" | 43 #include "modules/webdatabase/DatabaseServer.h" |
44 #include "modules/webdatabase/DatabaseSync.h" | 44 #include "modules/webdatabase/DatabaseSync.h" |
45 #include "modules/webdatabase/DatabaseTask.h" | 45 #include "modules/webdatabase/DatabaseTask.h" |
46 #include "weborigin/SecurityOrigin.h" | 46 #include "platform/weborigin/SecurityOrigin.h" |
47 | 47 |
48 namespace WebCore { | 48 namespace WebCore { |
49 | 49 |
50 DatabaseManager& DatabaseManager::manager() | 50 DatabaseManager& DatabaseManager::manager() |
51 { | 51 { |
52 static DatabaseManager* dbManager = 0; | 52 static DatabaseManager* dbManager = 0; |
53 // FIXME: The following is vulnerable to a race between threads. Need to | 53 // FIXME: The following is vulnerable to a race between threads. Need to |
54 // implement a thread safe on-first-use static initializer. | 54 // implement a thread safe on-first-use static initializer. |
55 if (!dbManager) | 55 if (!dbManager) |
56 dbManager = new DatabaseManager(); | 56 dbManager = new DatabaseManager(); |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
299 if (databaseContext) | 299 if (databaseContext) |
300 m_server->interruptAllDatabasesForContext(databaseContext->backend().get
()); | 300 m_server->interruptAllDatabasesForContext(databaseContext->backend().get
()); |
301 } | 301 } |
302 | 302 |
303 void DatabaseManager::logErrorMessage(ExecutionContext* context, const String& m
essage) | 303 void DatabaseManager::logErrorMessage(ExecutionContext* context, const String& m
essage) |
304 { | 304 { |
305 context->addConsoleMessage(StorageMessageSource, ErrorMessageLevel, message)
; | 305 context->addConsoleMessage(StorageMessageSource, ErrorMessageLevel, message)
; |
306 } | 306 } |
307 | 307 |
308 } // namespace WebCore | 308 } // namespace WebCore |
OLD | NEW |