diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-06-03 14:33:32 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-06-08 12:24:51 +0100 |
| commit | 5af96e2c7b73ebc627c6894727826a7576d31758 (patch) | |
| tree | f9d5e6f6175ccd7e3d14de9b290f08937a0d17ba /WebCore/storage/chromium | |
| parent | 8cc4fcf4f6adcbc0e0aebfc24fbad9a4cddf2cfb (diff) | |
| download | external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.zip external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.tar.gz external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.tar.bz2 | |
Merge webkit.org at r60469 : Initial merge by git.
Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
Diffstat (limited to 'WebCore/storage/chromium')
| -rw-r--r-- | WebCore/storage/chromium/DatabaseTrackerChromium.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/storage/chromium/DatabaseTrackerChromium.cpp b/WebCore/storage/chromium/DatabaseTrackerChromium.cpp index 7db981d..9d2a942 100644 --- a/WebCore/storage/chromium/DatabaseTrackerChromium.cpp +++ b/WebCore/storage/chromium/DatabaseTrackerChromium.cpp @@ -48,11 +48,11 @@ namespace WebCore { DatabaseTracker& DatabaseTracker::tracker() { - DEFINE_STATIC_LOCAL(DatabaseTracker, tracker, ()); + DEFINE_STATIC_LOCAL(DatabaseTracker, tracker, ("")); return tracker; } -DatabaseTracker::DatabaseTracker() +DatabaseTracker::DatabaseTracker(const String&) { SQLiteFileSystem::registerSQLiteVFS(); } |