Revert of "[sql] Remove part of WebDatabase SQLite patch." (patchset #1 of https://codereview.chrom…

third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemPosix.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 125 matching lines @@
 // Opens a file.
 //
 // vfs - pointer to the sqlite3_vfs object.
 // fileName - the name of the file.
 // id - the structure that will manipulate the newly opened file.
 // desiredFlags - the desired open mode flags.
 // usedFlags - the actual open mode flags that were used.
 int chromiumOpenInternal(sqlite3_vfs* vfs, const char* fileName, sqlite3_file* id, int desiredFlags, int* usedFlags)
 {
     chromium_sqlite3_initialize_unix_sqlite3_file(id);
-    int fd = Platform::current()->databaseOpenFile(String(fileName), desiredFlags);
-    if ((fd < 0) && (desiredFlags & SQLITE_OPEN_READWRITE)) {
-        int newFlags = (desiredFlags & ~(SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE)) | SQLITE_OPEN_READONLY;
-        fd = Platform::current()->databaseOpenFile(String(fileName), newFlags);
+    int fd = -1;
+    int result = chromium_sqlite3_get_reusable_file_handle(id, fileName, desiredFlags, &fd);
+    if (result != SQLITE_OK)
+        return result;
+
+    if (fd < 0) {
+        fd = Platform::current()->databaseOpenFile(String(fileName), desiredFlags);
+        if ((fd < 0) && (desiredFlags & SQLITE_OPEN_READWRITE)) {
+            int newFlags = (desiredFlags & ~(SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE)) | SQLITE_OPEN_READONLY;
+            fd = Platform::current()->databaseOpenFile(String(fileName), newFlags);
+        }
     }
     if (fd < 0) {
         chromium_sqlite3_destroy_reusable_file_handle(id);
         return SQLITE_CANTOPEN;
     }
 
     if (usedFlags)
         *usedFlags = desiredFlags;
     chromium_sqlite3_update_reusable_file_handle(id, fd, desiredFlags);
 
     fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
 
     // The mask 0x00007F00 gives us the 7 bits that determine the type of the file SQLite is trying to open.
     int fileType = desiredFlags & 0x00007F00;
     int noLock = (fileType != SQLITE_OPEN_MAIN_DB);
     sqlite3_vfs* wrappedVfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
-    int result = chromium_sqlite3_fill_in_unix_sqlite3_file(wrappedVfs, fd, -1, id, fileName, noLock);
+    result = chromium_sqlite3_fill_in_unix_sqlite3_file(wrappedVfs, fd, -1, id, fileName, noLock);
     if (result != SQLITE_OK)
         chromium_sqlite3_destroy_reusable_file_handle(id);
     return result;
 }
 
 int chromiumOpen(sqlite3_vfs* vfs, const char* fileName, sqlite3_file* id, int desiredFlags, int* usedFlags)
 {
     sqlite3_vfs* wrappedVfs = static_cast<sqlite3_vfs*>(vfs->pAppData);
     sqlite3_file* wrappedFile = static_cast<sqlite3_file*>(sqlite3_malloc(wrappedVfs->szOsFile));
     if (!wrappedFile)
@@ skipping 160 matching lines @@
         chromiumDlClose,
         chromiumRandomness,
         chromiumSleep,
         chromiumCurrentTime,
         chromiumGetLastError
     };
     sqlite3_vfs_register(&chromium_vfs, 0);
 }
 
 } // namespace blink