| 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 22 matching lines...) Expand all Loading... |
| 33 #include "core/inspector/ConsoleMessage.h" | 33 #include "core/inspector/ConsoleMessage.h" |
| 34 #include "core/probe/CoreProbes.h" | 34 #include "core/probe/CoreProbes.h" |
| 35 #include "modules/webdatabase/Database.h" | 35 #include "modules/webdatabase/Database.h" |
| 36 #include "modules/webdatabase/DatabaseCallback.h" | 36 #include "modules/webdatabase/DatabaseCallback.h" |
| 37 #include "modules/webdatabase/DatabaseClient.h" | 37 #include "modules/webdatabase/DatabaseClient.h" |
| 38 #include "modules/webdatabase/DatabaseContext.h" | 38 #include "modules/webdatabase/DatabaseContext.h" |
| 39 #include "modules/webdatabase/DatabaseTask.h" | 39 #include "modules/webdatabase/DatabaseTask.h" |
| 40 #include "modules/webdatabase/DatabaseTracker.h" | 40 #include "modules/webdatabase/DatabaseTracker.h" |
| 41 #include "modules/webdatabase/StorageLog.h" | 41 #include "modules/webdatabase/StorageLog.h" |
| 42 #include "platform/weborigin/SecurityOrigin.h" | 42 #include "platform/weborigin/SecurityOrigin.h" |
| 43 #include "platform/wtf/PtrUtil.h" |
| 43 #include "public/platform/WebTraceLocation.h" | 44 #include "public/platform/WebTraceLocation.h" |
| 44 #include "wtf/PtrUtil.h" | |
| 45 | 45 |
| 46 namespace blink { | 46 namespace blink { |
| 47 | 47 |
| 48 static DatabaseManager* g_database_manager; | 48 static DatabaseManager* g_database_manager; |
| 49 | 49 |
| 50 DatabaseManager& DatabaseManager::Manager() { | 50 DatabaseManager& DatabaseManager::Manager() { |
| 51 DCHECK(IsMainThread()); | 51 DCHECK(IsMainThread()); |
| 52 if (!g_database_manager) | 52 if (!g_database_manager) |
| 53 g_database_manager = new DatabaseManager(); | 53 g_database_manager = new DatabaseManager(); |
| 54 return *g_database_manager; | 54 return *g_database_manager; |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 origin, name, create_if_does_not_exist); | 220 origin, name, create_if_does_not_exist); |
| 221 } | 221 } |
| 222 | 222 |
| 223 void DatabaseManager::LogErrorMessage(ExecutionContext* context, | 223 void DatabaseManager::LogErrorMessage(ExecutionContext* context, |
| 224 const String& message) { | 224 const String& message) { |
| 225 context->AddConsoleMessage(ConsoleMessage::Create( | 225 context->AddConsoleMessage(ConsoleMessage::Create( |
| 226 kStorageMessageSource, kErrorMessageLevel, message)); | 226 kStorageMessageSource, kErrorMessageLevel, message)); |
| 227 } | 227 } |
| 228 | 228 |
| 229 } // namespace blink | 229 } // namespace blink |
| OLD | NEW |