| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. |
| 3 * Copyright (C) 2009, 2011 Google Inc. All Rights Reserved. | 3 * Copyright (C) 2009, 2011 Google Inc. All Rights Reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 * | 25 * |
| 26 */ | 26 */ |
| 27 | 27 |
| 28 #include "config.h" | 28 #include "config.h" |
| 29 | 29 |
| 30 #include "modules/webdatabase/WorkerGlobalScopeWebDatabase.h" | 30 #include "modules/webdatabase/WorkerGlobalScopeWebDatabase.h" |
| 31 | 31 |
| 32 #include "RuntimeEnabledFeatures.h" | 32 #include "RuntimeEnabledFeatures.h" |
| 33 #include "bindings/v8/ExceptionState.h" | |
| 34 #include "core/dom/ExceptionCode.h" | |
| 35 #include "core/workers/WorkerGlobalScope.h" | 33 #include "core/workers/WorkerGlobalScope.h" |
| 36 #include "modules/webdatabase/Database.h" | 34 #include "modules/webdatabase/Database.h" |
| 37 #include "modules/webdatabase/DatabaseCallback.h" | 35 #include "modules/webdatabase/DatabaseCallback.h" |
| 38 #include "modules/webdatabase/DatabaseManager.h" | 36 #include "modules/webdatabase/DatabaseManager.h" |
| 39 #include "modules/webdatabase/DatabaseSync.h" | 37 #include "modules/webdatabase/DatabaseSync.h" |
| 40 #include "weborigin/SecurityOrigin.h" | 38 #include "weborigin/SecurityOrigin.h" |
| 41 | 39 |
| 42 namespace WebCore { | 40 namespace WebCore { |
| 43 | 41 |
| 44 PassRefPtr<Database> WorkerGlobalScopeWebDatabase::openDatabase(WorkerGlobalScop
e* context, const String& name, const String& version, const String& displayName
, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, Ex
ceptionState& es) | 42 PassRefPtr<Database> WorkerGlobalScopeWebDatabase::openDatabase(WorkerGlobalScop
e* context, const String& name, const String& version, const String& displayName
, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, Ex
ceptionCode& ec) |
| 45 { | 43 { |
| 46 DatabaseManager& dbManager = DatabaseManager::manager(); | 44 DatabaseManager& dbManager = DatabaseManager::manager(); |
| 47 RefPtr<Database> database; | 45 RefPtr<Database> database; |
| 48 DatabaseError error = DatabaseError::None; | 46 DatabaseError error = DatabaseError::None; |
| 49 if (RuntimeEnabledFeatures::databaseEnabled() && context->securityOrigin()->
canAccessDatabase(context->topOrigin())) { | 47 if (RuntimeEnabledFeatures::databaseEnabled() && context->securityOrigin()->
canAccessDatabase(context->topOrigin())) { |
| 50 database = dbManager.openDatabase(context, name, version, displayName, e
stimatedSize, creationCallback, error); | 48 database = dbManager.openDatabase(context, name, version, displayName, e
stimatedSize, creationCallback, error); |
| 51 ASSERT(database || error != DatabaseError::None); | 49 ASSERT(database || error != DatabaseError::None); |
| 52 es.throwDOMException(DatabaseManager::exceptionCodeForDatabaseError(erro
r)); | 50 ec = DatabaseManager::exceptionCodeForDatabaseError(error); |
| 53 } else { | 51 } else { |
| 54 es.throwDOMException(SecurityError); | 52 ec = SecurityError; |
| 55 } | 53 } |
| 56 | 54 |
| 57 return database.release(); | 55 return database.release(); |
| 58 } | 56 } |
| 59 | 57 |
| 60 PassRefPtr<DatabaseSync> WorkerGlobalScopeWebDatabase::openDatabaseSync(WorkerGl
obalScope* context, const String& name, const String& version, const String& dis
playName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCall
back, ExceptionState& es) | 58 PassRefPtr<DatabaseSync> WorkerGlobalScopeWebDatabase::openDatabaseSync(WorkerGl
obalScope* context, const String& name, const String& version, const String& dis
playName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCall
back, ExceptionCode& ec) |
| 61 { | 59 { |
| 62 DatabaseManager& dbManager = DatabaseManager::manager(); | 60 DatabaseManager& dbManager = DatabaseManager::manager(); |
| 63 RefPtr<DatabaseSync> database; | 61 RefPtr<DatabaseSync> database; |
| 64 DatabaseError error = DatabaseError::None; | 62 DatabaseError error = DatabaseError::None; |
| 65 if (RuntimeEnabledFeatures::databaseEnabled() && context->securityOrigin()->
canAccessDatabase(context->topOrigin())) { | 63 if (RuntimeEnabledFeatures::databaseEnabled() && context->securityOrigin()->
canAccessDatabase(context->topOrigin())) { |
| 66 database = dbManager.openDatabaseSync(context, name, version, displayNam
e, estimatedSize, creationCallback, error); | 64 database = dbManager.openDatabaseSync(context, name, version, displayNam
e, estimatedSize, creationCallback, error); |
| 67 | 65 |
| 68 ASSERT(database || error != DatabaseError::None); | 66 ASSERT(database || error != DatabaseError::None); |
| 69 es.throwDOMException(DatabaseManager::exceptionCodeForDatabaseError(erro
r)); | 67 ec = DatabaseManager::exceptionCodeForDatabaseError(error); |
| 70 } else { | 68 } else { |
| 71 es.throwDOMException(SecurityError); | 69 ec = SecurityError; |
| 72 } | 70 } |
| 73 | 71 |
| 74 return database.release(); | 72 return database.release(); |
| 75 } | 73 } |
| 76 | 74 |
| 77 } // namespace WebCore | 75 } // namespace WebCore |
| OLD | NEW |