| 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 |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "modules/webdatabase/DatabaseManager.h" | 27 #include "modules/webdatabase/DatabaseManager.h" |
| 28 | 28 |
| 29 #include "bindings/v8/ScriptController.h" | |
| 30 #include "core/dom/ExceptionCode.h" | 29 #include "core/dom/ExceptionCode.h" |
| 31 #include "core/dom/ScriptExecutionContext.h" | 30 #include "core/dom/ScriptExecutionContext.h" |
| 32 #include "core/inspector/InspectorDatabaseInstrumentation.h" | 31 #include "core/inspector/InspectorDatabaseInstrumentation.h" |
| 33 #include "core/platform/Logging.h" | 32 #include "core/platform/Logging.h" |
| 34 #include "modules/webdatabase/AbstractDatabaseServer.h" | 33 #include "modules/webdatabase/AbstractDatabaseServer.h" |
| 35 #include "modules/webdatabase/Database.h" | 34 #include "modules/webdatabase/Database.h" |
| 36 #include "modules/webdatabase/DatabaseBackend.h" | 35 #include "modules/webdatabase/DatabaseBackend.h" |
| 37 #include "modules/webdatabase/DatabaseBackendBase.h" | 36 #include "modules/webdatabase/DatabaseBackendBase.h" |
| 38 #include "modules/webdatabase/DatabaseBackendContext.h" | 37 #include "modules/webdatabase/DatabaseBackendContext.h" |
| 39 #include "modules/webdatabase/DatabaseBackendSync.h" | 38 #include "modules/webdatabase/DatabaseBackendSync.h" |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 } | 214 } |
| 216 | 215 |
| 217 return backend.release(); | 216 return backend.release(); |
| 218 } | 217 } |
| 219 | 218 |
| 220 PassRefPtr<Database> DatabaseManager::openDatabase(ScriptExecutionContext* conte
xt, | 219 PassRefPtr<Database> DatabaseManager::openDatabase(ScriptExecutionContext* conte
xt, |
| 221 const String& name, const String& expectedVersion, const String& displayName
, | 220 const String& name, const String& expectedVersion, const String& displayName
, |
| 222 unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, | 221 unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, |
| 223 DatabaseError& error) | 222 DatabaseError& error) |
| 224 { | 223 { |
| 225 ScriptController::initializeThreading(); | |
| 226 ASSERT(error == DatabaseError::None); | 224 ASSERT(error == DatabaseError::None); |
| 227 | 225 |
| 228 bool setVersionInNewDatabase = !creationCallback; | 226 bool setVersionInNewDatabase = !creationCallback; |
| 229 String errorMessage; | 227 String errorMessage; |
| 230 RefPtr<DatabaseBackendBase> backend = openDatabaseBackend(context, DatabaseT
ype::Async, name, | 228 RefPtr<DatabaseBackendBase> backend = openDatabaseBackend(context, DatabaseT
ype::Async, name, |
| 231 expectedVersion, displayName, estimatedSize, setVersionInNewDatabase, er
ror, errorMessage); | 229 expectedVersion, displayName, estimatedSize, setVersionInNewDatabase, er
ror, errorMessage); |
| 232 if (!backend) | 230 if (!backend) |
| 233 return 0; | 231 return 0; |
| 234 | 232 |
| 235 RefPtr<Database> database = Database::create(context, backend); | 233 RefPtr<Database> database = Database::create(context, backend); |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 304 if (databaseContext) | 302 if (databaseContext) |
| 305 m_server->interruptAllDatabasesForContext(databaseContext->backend().get
()); | 303 m_server->interruptAllDatabasesForContext(databaseContext->backend().get
()); |
| 306 } | 304 } |
| 307 | 305 |
| 308 void DatabaseManager::logErrorMessage(ScriptExecutionContext* context, const Str
ing& message) | 306 void DatabaseManager::logErrorMessage(ScriptExecutionContext* context, const Str
ing& message) |
| 309 { | 307 { |
| 310 context->addConsoleMessage(StorageMessageSource, ErrorMessageLevel, message)
; | 308 context->addConsoleMessage(StorageMessageSource, ErrorMessageLevel, message)
; |
| 311 } | 309 } |
| 312 | 310 |
| 313 } // namespace WebCore | 311 } // namespace WebCore |
| OLD | NEW |