From dcc8cf2e65d1aa555cce12431a16547e66b469ee Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 27 Apr 2010 16:31:00 +0100 Subject: Merge webkit.org at r58033 : Initial merge by git Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1 --- WebCore/storage/chromium/DatabaseObserver.h | 7 +++- .../storage/chromium/DatabaseTrackerChromium.cpp | 10 ++--- WebCore/storage/chromium/IndexedDatabase.cpp | 45 ++++++++++++++++++++++ WebCore/storage/chromium/QuotaTracker.cpp | 2 +- WebCore/storage/chromium/QuotaTracker.h | 2 +- 5 files changed, 56 insertions(+), 10 deletions(-) create mode 100644 WebCore/storage/chromium/IndexedDatabase.cpp (limited to 'WebCore/storage/chromium') diff --git a/WebCore/storage/chromium/DatabaseObserver.h b/WebCore/storage/chromium/DatabaseObserver.h index 535c0d2..4e266c1 100644 --- a/WebCore/storage/chromium/DatabaseObserver.h +++ b/WebCore/storage/chromium/DatabaseObserver.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Google Inc. All rights reserved. + * Copyright (C) 2010 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 @@ -34,11 +34,14 @@ namespace WebCore { class Database; +class ScriptExecutionContext; +class String; // The implementation of this class is in the WebKit API (Chromium source tree) -// in webkit/api/src/DatabaseObserver.cpp. +// in WebKit/chromium/src/DatabaseObserver.cpp. class DatabaseObserver { public: + static bool canEstablishDatabase(ScriptExecutionContext*, const String&, const String&, unsigned long); static void databaseOpened(Database*); static void databaseModified(Database*); static void databaseClosed(Database*); diff --git a/WebCore/storage/chromium/DatabaseTrackerChromium.cpp b/WebCore/storage/chromium/DatabaseTrackerChromium.cpp index ac58e07..7db981d 100644 --- a/WebCore/storage/chromium/DatabaseTrackerChromium.cpp +++ b/WebCore/storage/chromium/DatabaseTrackerChromium.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Google Inc. All rights reserved. + * Copyright (C) 2010 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 @@ -31,7 +31,6 @@ #include "config.h" #include "DatabaseTracker.h" -#include "CString.h" #include "Database.h" #include "DatabaseObserver.h" #include "DatabaseThread.h" @@ -43,6 +42,7 @@ #include #include #include +#include namespace WebCore { @@ -57,11 +57,9 @@ DatabaseTracker::DatabaseTracker() SQLiteFileSystem::registerSQLiteVFS(); } -bool DatabaseTracker::canEstablishDatabase(ScriptExecutionContext*, const String&, const String&, unsigned long) +bool DatabaseTracker::canEstablishDatabase(ScriptExecutionContext* scriptExecutionContext, const String& name, const String& displayName, unsigned long estimatedSize) { - // In Chromium, a database can always be established (even though we might not - // be able to write anything to it if the quota for this origin was exceeded) - return true; + return DatabaseObserver::canEstablishDatabase(scriptExecutionContext, name, displayName, estimatedSize); } void DatabaseTracker::setDatabaseDetails(SecurityOrigin*, const String&, const String&, unsigned long) diff --git a/WebCore/storage/chromium/IndexedDatabase.cpp b/WebCore/storage/chromium/IndexedDatabase.cpp new file mode 100644 index 0000000..6f53f92 --- /dev/null +++ b/WebCore/storage/chromium/IndexedDatabase.cpp @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2010 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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#include "config.h" +#include "IndexedDatabase.h" + +#include "ChromiumBridge.h" + +#if ENABLE(INDEXED_DATABASE) + +namespace WebCore { + +PassRefPtr IndexedDatabase::create() +{ + return ChromiumBridge::indexedDatabase(); +} + +} // namespace WebCore + +#endif // ENABLE(INDEXED_DATABASE) + diff --git a/WebCore/storage/chromium/QuotaTracker.cpp b/WebCore/storage/chromium/QuotaTracker.cpp index b49639d..9e64942 100644 --- a/WebCore/storage/chromium/QuotaTracker.cpp +++ b/WebCore/storage/chromium/QuotaTracker.cpp @@ -31,8 +31,8 @@ #include "config.h" #include "QuotaTracker.h" -#include "CString.h" #include +#include namespace WebCore { diff --git a/WebCore/storage/chromium/QuotaTracker.h b/WebCore/storage/chromium/QuotaTracker.h index 9146910..41c27fe 100644 --- a/WebCore/storage/chromium/QuotaTracker.h +++ b/WebCore/storage/chromium/QuotaTracker.h @@ -31,10 +31,10 @@ #ifndef QuotaTracker_h #define QuotaTracker_h -#include "CString.h" #include "SecurityOrigin.h" #include "StringHash.h" #include +#include namespace WebCore { -- cgit v1.1