webkit/tools/test_shell/simple_database_system.cc - Issue 3108030: Move bundled copy of sqlite one level deeper to better separate it...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: webkit/tools/test_shell/simple_database_system.cc

Issue 3108030: Move bundled copy of sqlite one level deeper to better separate it... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « webkit/database/vfs_backend.cc ('k') | no next file » | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "webkit/tools/test_shell/simple_database_system.h"	5 #include "webkit/tools/test_shell/simple_database_system.h"

6	6

7 #include "base/auto_reset.h"	7 #include "base/auto_reset.h"

8 #include "base/file_util.h"	8 #include "base/file_util.h"

9 #include "base/message_loop.h"	9 #include "base/message_loop.h"

10 #include "base/utf_string_conversions.h"	10 #include "base/utf_string_conversions.h"

11 #include "third_party/sqlite/preprocessed/sqlite3.h"	11 #include "third_party/sqlite/sqlite3.h"

12 #include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h"	12 #include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h"

13 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"	13 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"

14 #include "webkit/database/database_util.h"	14 #include "webkit/database/database_util.h"

15 #include "webkit/database/vfs_backend.h"	15 #include "webkit/database/vfs_backend.h"

16	16

17 using webkit_database::DatabaseTracker;	17 using webkit_database::DatabaseTracker;

18 using webkit_database::DatabaseUtil;	18 using webkit_database::DatabaseUtil;

19 using webkit_database::VfsBackend;	19 using webkit_database::VfsBackend;

20	20

21 SimpleDatabaseSystem* SimpleDatabaseSystem::instance_ = NULL;	21 SimpleDatabaseSystem* SimpleDatabaseSystem::instance_ = NULL;

(...skipping 161 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
183	183

184 FilePath SimpleDatabaseSystem::GetFullFilePathForVfsFile(	184 FilePath SimpleDatabaseSystem::GetFullFilePathForVfsFile(

185 const string16& vfs_file_name) {	185 const string16& vfs_file_name) {

186 if (vfs_file_name.empty()) // temp file, used for vacuuming	186 if (vfs_file_name.empty()) // temp file, used for vacuuming

187 return FilePath();	187 return FilePath();

188	188

189 AutoLock file_names_auto_lock(file_names_lock_);	189 AutoLock file_names_auto_lock(file_names_lock_);

190 DCHECK(file_names_.find(vfs_file_name) != file_names_.end());	190 DCHECK(file_names_.find(vfs_file_name) != file_names_.end());

191 return file_names_[vfs_file_name];	191 return file_names_[vfs_file_name];

192 }	192 }

OLD	NEW