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 14 matching lines...) Expand all Loading... |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 #include "modules/webdatabase/DatabaseServer.h" | 27 #include "modules/webdatabase/DatabaseServer.h" |
28 | 28 |
29 #include "modules/webdatabase/Database.h" | 29 #include "modules/webdatabase/Database.h" |
30 #include "modules/webdatabase/DatabaseBackend.h" | 30 #include "modules/webdatabase/DatabaseBackend.h" |
31 #include "modules/webdatabase/DatabaseBackendSync.h" | 31 #include "modules/webdatabase/DatabaseBackendSync.h" |
32 #include "modules/webdatabase/DatabaseContext.h" | 32 #include "modules/webdatabase/DatabaseContext.h" |
33 #include "modules/webdatabase/DatabaseSync.h" | 33 #include "modules/webdatabase/DatabaseSync.h" |
34 #include "modules/webdatabase/DatabaseTracker.h" | 34 #include "modules/webdatabase/DatabaseTracker.h" |
35 #include "wtf/UnusedParam.h" | |
36 | 35 |
37 namespace WebCore { | 36 namespace WebCore { |
38 | 37 |
39 String DatabaseServer::fullPathForDatabase(SecurityOrigin* origin, const String&
name, bool createIfDoesNotExist) | 38 String DatabaseServer::fullPathForDatabase(SecurityOrigin* origin, const String&
name, bool createIfDoesNotExist) |
40 { | 39 { |
41 return DatabaseTracker::tracker().fullPathForDatabase(origin, name, createIf
DoesNotExist); | 40 return DatabaseTracker::tracker().fullPathForDatabase(origin, name, createIf
DoesNotExist); |
42 } | 41 } |
43 | 42 |
44 void DatabaseServer::closeDatabasesImmediately(const String& originIdentifier, c
onst String& name) | 43 void DatabaseServer::closeDatabasesImmediately(const String& originIdentifier, c
onst String& name) |
45 { | 44 { |
(...skipping 27 matching lines...) Expand all Loading... |
73 case DatabaseType::Sync: | 72 case DatabaseType::Sync: |
74 database = adoptRef(new DatabaseSync(backendContext, name, expectedVersi
on, displayName, estimatedSize)); | 73 database = adoptRef(new DatabaseSync(backendContext, name, expectedVersi
on, displayName, estimatedSize)); |
75 } | 74 } |
76 | 75 |
77 if (!database->openAndVerifyVersion(setVersionInNewDatabase, error, errorMes
sage)) | 76 if (!database->openAndVerifyVersion(setVersionInNewDatabase, error, errorMes
sage)) |
78 return 0; | 77 return 0; |
79 return database.release(); | 78 return database.release(); |
80 } | 79 } |
81 | 80 |
82 } // namespace WebCore | 81 } // namespace WebCore |
OLD | NEW |