[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 16:37:31 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b2e85e653931217047b8c0aef26f8f7d4b8a13f4
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 29 14:47:22 2010 +0000
2010-11-29 Bernhard Bauer <bauerb at chromium.org>
Reviewed by Jeremy Orlow.
Remove databaseFileName from IDBFactoryBackendImpl
https://bugs.webkit.org/show_bug.cgi?id=50150
No new tests, since functionality is unchanged.
* storage/IDBFactoryBackendImpl.cpp:
(WebCore::openSQLiteDatabase):
* storage/IDBFactoryBackendImpl.h:
2010-11-29 Bernhard Bauer <bauerb at chromium.org>
Reviewed by Jeremy Orlow.
Remove databaseFileName from WebIDBFactory
https://bugs.webkit.org/show_bug.cgi?id=50150
* WebKit.gyp:
* public/WebIDBFactory.h:
(WebKit::WebIDBFactory::open):
* src/WebIDBFactory.cpp: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72794 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 37d4037..2ae1de7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-29 Bernhard Bauer <bauerb at chromium.org>
+
+ Reviewed by Jeremy Orlow.
+
+ Remove databaseFileName from IDBFactoryBackendImpl
+ https://bugs.webkit.org/show_bug.cgi?id=50150
+
+ No new tests, since functionality is unchanged.
+
+ * storage/IDBFactoryBackendImpl.cpp:
+ (WebCore::openSQLiteDatabase):
+ * storage/IDBFactoryBackendImpl.h:
+
2010-11-29 Philippe Normand <pnormand at igalia.com>
Reviewed by Xan Lopez.
diff --git a/WebCore/storage/IDBFactoryBackendImpl.cpp b/WebCore/storage/IDBFactoryBackendImpl.cpp
index dece9d3..1f6b22e 100644
--- a/WebCore/storage/IDBFactoryBackendImpl.cpp
+++ b/WebCore/storage/IDBFactoryBackendImpl.cpp
@@ -74,7 +74,7 @@ static PassRefPtr<IDBSQLiteDatabase> openSQLiteDatabase(SecurityOrigin* security
return 0;
}
- path = pathByAppendingComponent(pathBase, IDBFactoryBackendImpl::databaseFileName(securityOrigin));
+ path = pathByAppendingComponent(pathBase, securityOrigin->databaseIdentifier() + ".indexeddb");
}
RefPtr<IDBSQLiteDatabase> sqliteDatabase = IDBSQLiteDatabase::create(fileIdentifier, factory);
@@ -153,12 +153,6 @@ void IDBFactoryBackendImpl::open(const String& name, PassRefPtr<IDBCallbacks> ca
m_databaseBackendMap.set(uniqueIdentifier, databaseBackend.get());
}
-String IDBFactoryBackendImpl::databaseFileName(SecurityOrigin* securityOrigin)
-{
- String databaseIdentifier = securityOrigin->databaseIdentifier();
- return databaseIdentifier + ".indexeddb";
-}
-
} // namespace WebCore
#endif // ENABLE(INDEXED_DATABASE)
diff --git a/WebCore/storage/IDBFactoryBackendImpl.h b/WebCore/storage/IDBFactoryBackendImpl.h
index 14240ff..dcaf848 100644
--- a/WebCore/storage/IDBFactoryBackendImpl.h
+++ b/WebCore/storage/IDBFactoryBackendImpl.h
@@ -56,8 +56,6 @@ public:
virtual void open(const String& name, PassRefPtr<IDBCallbacks>, PassRefPtr<SecurityOrigin>, Frame*, const String& dataDir, int64_t maximumSize);
- static String databaseFileName(SecurityOrigin*);
-
private:
IDBFactoryBackendImpl();
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 4f5b21a..6443cb1 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-29 Bernhard Bauer <bauerb at chromium.org>
+
+ Reviewed by Jeremy Orlow.
+
+ Remove databaseFileName from WebIDBFactory
+ https://bugs.webkit.org/show_bug.cgi?id=50150
+
+ * WebKit.gyp:
+ * public/WebIDBFactory.h:
+ (WebKit::WebIDBFactory::open):
+ * src/WebIDBFactory.cpp: Removed.
+
2010-11-26 Andrei Popescu <andreip at google.com>
Reviewed by Jeremy Orlow.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 51858d5..01bb092 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -463,7 +463,6 @@
'src/WebIDBDatabaseError.cpp',
'src/WebIDBDatabaseImpl.cpp',
'src/WebIDBDatabaseImpl.h',
- 'src/WebIDBFactory.cpp',
'src/WebIDBFactoryImpl.cpp',
'src/WebIDBFactoryImpl.h',
'src/WebIDBIndexImpl.cpp',
diff --git a/WebKit/chromium/public/WebIDBFactory.h b/WebKit/chromium/public/WebIDBFactory.h
index 241dee3..5e3337e 100755
--- a/WebKit/chromium/public/WebIDBFactory.h
+++ b/WebKit/chromium/public/WebIDBFactory.h
@@ -63,9 +63,6 @@ public:
// WEBKIT_ASSERT_NOT_REACHED();
open(name, "", callbacks, origin, webFrame, dataDir, maximumSize);
}
-
- // The file name that would be used for persisting a given indexed database on the file system.
- WEBKIT_API static WebString databaseFileName(const WebSecurityOrigin&);
};
} // namespace WebKit
diff --git a/WebKit/chromium/src/WebIDBFactory.cpp b/WebKit/chromium/src/WebIDBFactory.cpp
deleted file mode 100755
index 2905fd5..0000000
--- a/WebKit/chromium/src/WebIDBFactory.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER OR 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 "WebIDBFactory.h"
-
-#include "IDBFactoryBackendImpl.h"
-#include "WebSecurityOrigin.h"
-#include <wtf/UnusedParam.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-WebString WebIDBFactory::databaseFileName(const WebSecurityOrigin& origin)
-{
- return IDBFactoryBackendImpl::databaseFileName(origin.get());
-}
-
-}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list