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/DatabaseCallback.h" | 40 #include "modules/webdatabase/DatabaseCallback.h" |
41 #include "modules/webdatabase/DatabaseClient.h" | 41 #include "modules/webdatabase/DatabaseClient.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/DatabaseTask.h" | 44 #include "modules/webdatabase/DatabaseTask.h" |
45 #include "platform/weborigin/SecurityOrigin.h" | 45 #include "platform/weborigin/SecurityOrigin.h" |
| 46 #include "wtf/MainThread.h" |
46 | 47 |
47 namespace blink { | 48 namespace blink { |
48 | 49 |
49 DatabaseManager& DatabaseManager::manager() | 50 DatabaseManager& DatabaseManager::manager() |
50 { | 51 { |
51 ASSERT(isMainThread()); | 52 ASSERT(isMainThread()); |
52 DEFINE_STATIC_LOCAL(DatabaseManager, dbManager, ()); | 53 DEFINE_STATIC_LOCAL(DatabaseManager, dbManager, ()); |
53 return dbManager; | 54 return dbManager; |
54 } | 55 } |
55 | 56 |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 { | 224 { |
224 return m_server->fullPathForDatabase(origin, name, createIfDoesNotExist); | 225 return m_server->fullPathForDatabase(origin, name, createIfDoesNotExist); |
225 } | 226 } |
226 | 227 |
227 void DatabaseManager::logErrorMessage(ExecutionContext* context, const String& m
essage) | 228 void DatabaseManager::logErrorMessage(ExecutionContext* context, const String& m
essage) |
228 { | 229 { |
229 context->addConsoleMessage(ConsoleMessage::create(StorageMessageSource, Erro
rMessageLevel, message)); | 230 context->addConsoleMessage(ConsoleMessage::create(StorageMessageSource, Erro
rMessageLevel, message)); |
230 } | 231 } |
231 | 232 |
232 } // namespace blink | 233 } // namespace blink |
OLD | NEW |