diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
| commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
| tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/sql | |
| parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) | |
| download | qtwebengine-chromium-e6430e577f105ad8813c92e75c54660c4985026e.tar.gz | |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/sql')
| -rw-r--r-- | chromium/sql/OWNERS | 5 | ||||
| -rw-r--r-- | chromium/sql/connection.cc | 5 | ||||
| -rw-r--r-- | chromium/sql/connection.h | 7 |
3 files changed, 11 insertions, 6 deletions
diff --git a/chromium/sql/OWNERS b/chromium/sql/OWNERS index a4209042eed..dc520c7af28 100644 --- a/chromium/sql/OWNERS +++ b/chromium/sql/OWNERS @@ -1,5 +1,8 @@ -michaeln@chromium.org +# Primary pwnall@chromium.org +# Secondary +michaeln@chromium.org + # TEAM: storage-dev@chromium.org # COMPONENT: Blink>Storage diff --git a/chromium/sql/connection.cc b/chromium/sql/connection.cc index c80758f3d6b..d7477f57dbf 100644 --- a/chromium/sql/connection.cc +++ b/chromium/sql/connection.cc @@ -31,6 +31,7 @@ #include "base/synchronization/lock.h" #include "base/threading/thread_task_runner_handle.h" #include "base/trace_event/memory_dump_manager.h" +#include "build/build_config.h" #include "sql/connection_memory_dump_provider.h" #include "sql/meta_table.h" #include "sql/statement.h" @@ -1726,7 +1727,7 @@ bool Connection::OpenInternal(const std::string& file_name, } // TODO(shess): OS_WIN support? -#if defined(OS_POSIX) +#if defined(OS_POSIX) && !defined(OS_FUCHSIA) if (restrict_to_user_) { DCHECK_NE(file_name, std::string(":memory")); base::FilePath file_path(file_name); @@ -1747,7 +1748,7 @@ bool Connection::OpenInternal(const std::string& file_name, base::SetPosixFilePermissions(wal_path, mode); } } -#endif // defined(OS_POSIX) +#endif // defined(OS_POSIX) && !defined(OS_FUCHSIA) // SQLite uses a lookaside buffer to improve performance of small mallocs. // Chromium already depends on small mallocs being efficient, so we disable diff --git a/chromium/sql/connection.h b/chromium/sql/connection.h index 838d552cdfd..8b9640785e9 100644 --- a/chromium/sql/connection.h +++ b/chromium/sql/connection.h @@ -7,7 +7,6 @@ #include <stddef.h> #include <stdint.h> -#include <map> #include <memory> #include <set> #include <string> @@ -15,6 +14,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/containers/flat_map.h" #include "base/gtest_prod_util.h" #include "base/macros.h" #include "base/memory/ref_counted.h" @@ -756,8 +756,9 @@ class SQL_EXPORT Connection { bool restrict_to_user_; // All cached statements. Keeping a reference to these statements means that - // they'll remain active. - typedef std::map<StatementID, scoped_refptr<StatementRef> > + // they'll remain active. Using flat_map here because number of cached + // statements is expected to be small, see //base/containers/README.md. + typedef base::flat_map<StatementID, scoped_refptr<StatementRef>> CachedStatementMap; CachedStatementMap statement_cache_; |