| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "modules/webdatabase/sqlite/SQLiteFileSystem.h" | 32 #include "modules/webdatabase/sqlite/SQLiteFileSystem.h" |
| 33 | 33 |
| 34 #include "platform/heap/Handle.h" |
| 34 #include <sqlite3.h> | 35 #include <sqlite3.h> |
| 35 #include "wtf/text/CString.h" | 36 #include "wtf/text/CString.h" |
| 36 | 37 |
| 37 // SQLiteFileSystem::registerSQLiteVFS() is implemented in the | 38 // SQLiteFileSystem::registerSQLiteVFS() is implemented in the |
| 38 // platform-specific files SQLiteFileSystemChromium{Win|Posix}.cpp | 39 // platform-specific files SQLiteFileSystemChromium{Win|Posix}.cpp |
| 39 namespace WebCore { | 40 namespace WebCore { |
| 40 | 41 |
| 41 SQLiteFileSystem::SQLiteFileSystem() | 42 SQLiteFileSystem::SQLiteFileSystem() |
| 42 { | 43 { |
| 43 } | 44 } |
| 44 | 45 |
| 45 int SQLiteFileSystem::openDatabase(const String& filename, sqlite3** database, b
ool forWebSQLDatabase) | 46 int SQLiteFileSystem::openDatabase(const String& filename, sqlite3** database, b
ool forWebSQLDatabase) |
| 46 { | 47 { |
| 48 ThreadState::SafePointScope scope(ThreadState::HeapPointersOnStack); |
| 47 if (!forWebSQLDatabase) | 49 if (!forWebSQLDatabase) |
| 48 return sqlite3_open(filename.utf8().data(), database); | 50 return sqlite3_open(filename.utf8().data(), database); |
| 49 | 51 |
| 50 return sqlite3_open_v2(filename.utf8().data(), database, SQLITE_OPEN_READWRI
TE | SQLITE_OPEN_CREATE, "chromium_vfs"); | 52 return sqlite3_open_v2(filename.utf8().data(), database, SQLITE_OPEN_READWRI
TE | SQLITE_OPEN_CREATE, "chromium_vfs"); |
| 51 } | 53 } |
| 52 | 54 |
| 53 } // namespace WebCore | 55 } // namespace WebCore |
| OLD | NEW |