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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 RefPtr<DatabaseBackendBase> database; | 67 RefPtr<DatabaseBackendBase> database; |
68 switch (type) { | 68 switch (type) { |
69 case DatabaseType::Async: | 69 case DatabaseType::Async: |
70 database = adoptRef(new Database(backendContext, name, expectedVersion,
displayName, estimatedSize)); | 70 database = adoptRef(new Database(backendContext, name, expectedVersion,
displayName, estimatedSize)); |
71 break; | 71 break; |
72 case DatabaseType::Sync: | 72 case DatabaseType::Sync: |
73 database = adoptRef(new DatabaseSync(backendContext, name, expectedVersi
on, displayName, estimatedSize)); | 73 database = adoptRef(new DatabaseSync(backendContext, name, expectedVersi
on, displayName, estimatedSize)); |
74 } | 74 } |
75 | 75 |
76 if (!database->openAndVerifyVersion(setVersionInNewDatabase, error, errorMes
sage)) | 76 if (!database->openAndVerifyVersion(setVersionInNewDatabase, error, errorMes
sage)) |
77 return 0; | 77 return nullptr; |
78 return database.release(); | 78 return database.release(); |
79 } | 79 } |
80 | 80 |
81 } // namespace WebCore | 81 } // namespace WebCore |
OLD | NEW |