Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Side by Side Diff: Source/modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp

Issue 17648006: Rename WorkerContext to WorkerGlobalScope (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
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/WorkerContextWebDatabase.h" 30 #include "modules/webdatabase/WorkerGlobalScopeWebDatabase.h"
31 31
32 #include "RuntimeEnabledFeatures.h" 32 #include "RuntimeEnabledFeatures.h"
33 #include "core/workers/WorkerContext.h" 33 #include "core/workers/WorkerGlobalScope.h"
34 #include "modules/webdatabase/Database.h" 34 #include "modules/webdatabase/Database.h"
35 #include "modules/webdatabase/DatabaseCallback.h" 35 #include "modules/webdatabase/DatabaseCallback.h"
36 #include "modules/webdatabase/DatabaseManager.h" 36 #include "modules/webdatabase/DatabaseManager.h"
37 #include "modules/webdatabase/DatabaseSync.h" 37 #include "modules/webdatabase/DatabaseSync.h"
38 #include "weborigin/SecurityOrigin.h" 38 #include "weborigin/SecurityOrigin.h"
39 39
40 namespace WebCore { 40 namespace WebCore {
41 41
42 PassRefPtr<Database> WorkerContextWebDatabase::openDatabase(WorkerContext* conte xt, const String& name, const String& version, const String& displayName, unsign ed long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionC ode& ec) 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)
43 { 43 {
44 DatabaseManager& dbManager = DatabaseManager::manager(); 44 DatabaseManager& dbManager = DatabaseManager::manager();
45 RefPtr<Database> database; 45 RefPtr<Database> database;
46 DatabaseError error = DatabaseError::None; 46 DatabaseError error = DatabaseError::None;
47 if (RuntimeEnabledFeatures::databaseEnabled() && context->securityOrigin()-> canAccessDatabase(context->topOrigin())) { 47 if (RuntimeEnabledFeatures::databaseEnabled() && context->securityOrigin()-> canAccessDatabase(context->topOrigin())) {
48 database = dbManager.openDatabase(context, name, version, displayName, e stimatedSize, creationCallback, error); 48 database = dbManager.openDatabase(context, name, version, displayName, e stimatedSize, creationCallback, error);
49 ASSERT(database || error != DatabaseError::None); 49 ASSERT(database || error != DatabaseError::None);
50 ec = DatabaseManager::exceptionCodeForDatabaseError(error); 50 ec = DatabaseManager::exceptionCodeForDatabaseError(error);
51 } else 51 } else
52 ec = SECURITY_ERR; 52 ec = SECURITY_ERR;
53 53
54 return database.release(); 54 return database.release();
55 } 55 }
56 56
57 PassRefPtr<DatabaseSync> WorkerContextWebDatabase::openDatabaseSync(WorkerContex t* context, const String& name, const String& version, const String& displayName , unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, Ex ceptionCode& ec) 57 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)
58 { 58 {
59 DatabaseManager& dbManager = DatabaseManager::manager(); 59 DatabaseManager& dbManager = DatabaseManager::manager();
60 RefPtr<DatabaseSync> database; 60 RefPtr<DatabaseSync> database;
61 DatabaseError error = DatabaseError::None; 61 DatabaseError error = DatabaseError::None;
62 if (RuntimeEnabledFeatures::databaseEnabled() && context->securityOrigin()-> canAccessDatabase(context->topOrigin())) { 62 if (RuntimeEnabledFeatures::databaseEnabled() && context->securityOrigin()-> canAccessDatabase(context->topOrigin())) {
63 database = dbManager.openDatabaseSync(context, name, version, displayNam e, estimatedSize, creationCallback, error); 63 database = dbManager.openDatabaseSync(context, name, version, displayNam e, estimatedSize, creationCallback, error);
64 64
65 ASSERT(database || error != DatabaseError::None); 65 ASSERT(database || error != DatabaseError::None);
66 ec = DatabaseManager::exceptionCodeForDatabaseError(error); 66 ec = DatabaseManager::exceptionCodeForDatabaseError(error);
67 } else 67 } else
68 ec = SECURITY_ERR; 68 ec = SECURITY_ERR;
69 69
70 return database.release(); 70 return database.release();
71 } 71 }
72 72
73 } // namespace WebCore 73 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/webdatabase/WorkerGlobalScopeWebDatabase.h ('k') | Source/modules/webdatabase/WorkerGlobalScopeWebDatabase.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698