diff options
| author | dgrogan@chromium.org <dgrogan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-16 11:20:57 +0000 |
|---|---|---|
| committer | dgrogan@chromium.org <dgrogan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-16 11:20:57 +0000 |
| commit | 0d7734242df28c3a31eec154be017802b0499879 (patch) | |
| tree | 396502db0e040e7476df53296a0efee1021277bb /webkit/fileapi | |
| parent | d356d7e1e4cba3c8a1e358d912921c65dbb0942a (diff) | |
| download | chromium_src-0d7734242df28c3a31eec154be017802b0499879.zip chromium_src-0d7734242df28c3a31eec154be017802b0499879.tar.gz chromium_src-0d7734242df28c3a31eec154be017802b0499879.tar.bz2 | |
Move chromium-specific files from leveldb's repository to chromium, stage 2.
Stages:
1. Remove chromium files from leveldb repo. [Done]
2. Put chromium leveldb files in third_party/leveldatabase and leveldb in third_party/leveldatabase/src. Update leveldb references in chrome to use third_party/leveldatabase/src instead of third_party/leveldb. Leave third_party/leveldb so it can be referred to by WebCore.gyp.
3. Change third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp to use third_party/leveldatabase.
4. Delete third_party/leveldb
Eventually: 5. Rename third_party/leveldatabase back to third_party/leveldb
We can't avoid the leveldb-checkout duplication by just changing third_party/leveldb from an unversioned to a versioned directory. Doing so would break everyone's gclient sync update.
BUG=89378
TEST=indexeddb layout and browser tests
Review URL: http://codereview.chromium.org/7522008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi')
| -rw-r--r-- | webkit/fileapi/file_system_directory_database.cc | 4 | ||||
| -rw-r--r-- | webkit/fileapi/file_system_directory_database.h | 2 | ||||
| -rw-r--r-- | webkit/fileapi/file_system_origin_database.cc | 4 | ||||
| -rw-r--r-- | webkit/fileapi/file_system_origin_database.h | 2 | ||||
| -rw-r--r-- | webkit/fileapi/webkit_fileapi.gypi | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/webkit/fileapi/file_system_directory_database.cc b/webkit/fileapi/file_system_directory_database.cc index 7c5d8de..c7e5b37 100644 --- a/webkit/fileapi/file_system_directory_database.cc +++ b/webkit/fileapi/file_system_directory_database.cc @@ -10,8 +10,8 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" -#include "third_party/leveldb/include/leveldb/iterator.h" -#include "third_party/leveldb/include/leveldb/write_batch.h" +#include "third_party/leveldatabase/src/include/leveldb/iterator.h" +#include "third_party/leveldatabase/src/include/leveldb/write_batch.h" namespace { diff --git a/webkit/fileapi/file_system_directory_database.h b/webkit/fileapi/file_system_directory_database.h index d363499..78cae7d 100644 --- a/webkit/fileapi/file_system_directory_database.h +++ b/webkit/fileapi/file_system_directory_database.h @@ -11,7 +11,7 @@ #include "base/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" -#include "third_party/leveldb/include/leveldb/db.h" +#include "third_party/leveldatabase/src/include/leveldb/db.h" namespace leveldb { class WriteBatch; diff --git a/webkit/fileapi/file_system_origin_database.cc b/webkit/fileapi/file_system_origin_database.cc index ca267e8..5762ee9 100644 --- a/webkit/fileapi/file_system_origin_database.cc +++ b/webkit/fileapi/file_system_origin_database.cc @@ -10,8 +10,8 @@ #include "base/stringprintf.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" -#include "third_party/leveldb/include/leveldb/iterator.h" -#include "third_party/leveldb/include/leveldb/write_batch.h" +#include "third_party/leveldatabase/src/include/leveldb/iterator.h" +#include "third_party/leveldatabase/src/include/leveldb/write_batch.h" namespace { diff --git a/webkit/fileapi/file_system_origin_database.h b/webkit/fileapi/file_system_origin_database.h index 63a4b815..0501ff6 100644 --- a/webkit/fileapi/file_system_origin_database.h +++ b/webkit/fileapi/file_system_origin_database.h @@ -11,7 +11,7 @@ #include "base/file_path.h" #include "base/memory/scoped_ptr.h" -#include "third_party/leveldb/include/leveldb/db.h" +#include "third_party/leveldatabase/src/include/leveldb/db.h" namespace fileapi { diff --git a/webkit/fileapi/webkit_fileapi.gypi b/webkit/fileapi/webkit_fileapi.gypi index ab1ad84..e8708c1 100644 --- a/webkit/fileapi/webkit_fileapi.gypi +++ b/webkit/fileapi/webkit_fileapi.gypi @@ -10,7 +10,7 @@ 'dependencies': [ '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/net/net.gyp:net', - '<(DEPTH)/third_party/leveldb/leveldb.gyp:leveldb', + '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '<(DEPTH)/webkit/support/webkit_support.gyp:quota', ], 'sources': [ |