[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abarth at webkit.org
abarth at webkit.org
Wed Dec 22 12:27:52 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 23f8dedec6faebb8374bf4106273486584fda87a
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 24 07:34:52 2010 +0000
2010-08-24 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
Deploy adoptPtr in WebCore/storage
https://bugs.webkit.org/show_bug.cgi?id=44491
There are still some naked news for a future patch. The next step is
to make create methods.
* storage/Database.cpp:
(WebCore::DatabaseCreationCallbackTask::create):
(WebCore::DerefContextTask::create):
(WebCore::DeliverPendingCallbackTask::create):
* storage/DatabaseSync.cpp:
(WebCore::CloseSyncDatabaseOnContextThreadTask::create):
* storage/DatabaseTask.h:
(WebCore::Database::DatabaseOpenTask::create):
(WebCore::Database::DatabaseCloseTask::create):
(WebCore::Database::DatabaseTransactionTask::create):
(WebCore::Database::DatabaseTableNamesTask::create):
* storage/DatabaseThread.cpp:
(WebCore::DatabaseThread::DatabaseThread):
* storage/DatabaseTracker.cpp:
(WebCore::DatabaseTracker::populateOrigins):
(WebCore::DatabaseTracker::addOpenDatabase):
* storage/IDBKeyTree.h:
(WebCore::::put):
* storage/IDBPendingTransactionMonitor.cpp:
(WebCore::IDBPendingTransactionMonitor::addPendingTransaction):
* storage/LocalStorageTask.h:
(WebCore::LocalStorageTask::createImport):
(WebCore::LocalStorageTask::createSync):
(WebCore::LocalStorageTask::createDeleteEmptyDatabase):
(WebCore::LocalStorageTask::createTerminate):
* storage/LocalStorageThread.cpp:
(WebCore::LocalStorageThread::create):
* storage/SQLTransaction.cpp:
(WebCore::SQLTransaction::openTransactionAndPreflight):
* storage/SQLTransactionSync.cpp:
(WebCore::SQLTransactionSync::SQLTransactionSync):
(WebCore::SQLTransactionSync::begin):
* storage/StorageNamespaceImpl.cpp:
(WebCore::StorageNamespaceImpl::copy):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65871 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4249061..82ff1c0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,48 @@
+2010-08-24 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ Deploy adoptPtr in WebCore/storage
+ https://bugs.webkit.org/show_bug.cgi?id=44491
+
+ There are still some naked news for a future patch. The next step is
+ to make create methods.
+
+ * storage/Database.cpp:
+ (WebCore::DatabaseCreationCallbackTask::create):
+ (WebCore::DerefContextTask::create):
+ (WebCore::DeliverPendingCallbackTask::create):
+ * storage/DatabaseSync.cpp:
+ (WebCore::CloseSyncDatabaseOnContextThreadTask::create):
+ * storage/DatabaseTask.h:
+ (WebCore::Database::DatabaseOpenTask::create):
+ (WebCore::Database::DatabaseCloseTask::create):
+ (WebCore::Database::DatabaseTransactionTask::create):
+ (WebCore::Database::DatabaseTableNamesTask::create):
+ * storage/DatabaseThread.cpp:
+ (WebCore::DatabaseThread::DatabaseThread):
+ * storage/DatabaseTracker.cpp:
+ (WebCore::DatabaseTracker::populateOrigins):
+ (WebCore::DatabaseTracker::addOpenDatabase):
+ * storage/IDBKeyTree.h:
+ (WebCore::::put):
+ * storage/IDBPendingTransactionMonitor.cpp:
+ (WebCore::IDBPendingTransactionMonitor::addPendingTransaction):
+ * storage/LocalStorageTask.h:
+ (WebCore::LocalStorageTask::createImport):
+ (WebCore::LocalStorageTask::createSync):
+ (WebCore::LocalStorageTask::createDeleteEmptyDatabase):
+ (WebCore::LocalStorageTask::createTerminate):
+ * storage/LocalStorageThread.cpp:
+ (WebCore::LocalStorageThread::create):
+ * storage/SQLTransaction.cpp:
+ (WebCore::SQLTransaction::openTransactionAndPreflight):
+ * storage/SQLTransactionSync.cpp:
+ (WebCore::SQLTransactionSync::SQLTransactionSync):
+ (WebCore::SQLTransactionSync::begin):
+ * storage/StorageNamespaceImpl.cpp:
+ (WebCore::StorageNamespaceImpl::copy):
+
2010-08-24 Ilya Tikhonovsky <loislo at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebCore/storage/Database.cpp b/WebCore/storage/Database.cpp
index 961310d..089f9ee 100644
--- a/WebCore/storage/Database.cpp
+++ b/WebCore/storage/Database.cpp
@@ -65,7 +65,7 @@ class DatabaseCreationCallbackTask : public ScriptExecutionContext::Task {
public:
static PassOwnPtr<DatabaseCreationCallbackTask> create(PassRefPtr<Database> database, PassRefPtr<DatabaseCallback> creationCallback)
{
- return new DatabaseCreationCallbackTask(database, creationCallback);
+ return adoptPtr(new DatabaseCreationCallbackTask(database, creationCallback));
}
virtual void performTask(ScriptExecutionContext*)
@@ -142,7 +142,7 @@ class DerefContextTask : public ScriptExecutionContext::Task {
public:
static PassOwnPtr<DerefContextTask> create(PassRefPtr<ScriptExecutionContext> context)
{
- return new DerefContextTask(context);
+ return adoptPtr(new DerefContextTask(context));
}
virtual void performTask(ScriptExecutionContext* context)
@@ -329,7 +329,7 @@ class DeliverPendingCallbackTask : public ScriptExecutionContext::Task {
public:
static PassOwnPtr<DeliverPendingCallbackTask> create(PassRefPtr<SQLTransaction> transaction)
{
- return new DeliverPendingCallbackTask(transaction);
+ return adoptPtr(new DeliverPendingCallbackTask(transaction));
}
virtual void performTask(ScriptExecutionContext*)
diff --git a/WebCore/storage/DatabaseSync.cpp b/WebCore/storage/DatabaseSync.cpp
index 817fdcc..9c654a1 100644
--- a/WebCore/storage/DatabaseSync.cpp
+++ b/WebCore/storage/DatabaseSync.cpp
@@ -161,7 +161,7 @@ class CloseSyncDatabaseOnContextThreadTask : public ScriptExecutionContext::Task
public:
static PassOwnPtr<CloseSyncDatabaseOnContextThreadTask> create(PassRefPtr<DatabaseSync> database)
{
- return new CloseSyncDatabaseOnContextThreadTask(database);
+ return adoptPtr(new CloseSyncDatabaseOnContextThreadTask(database));
}
virtual void performTask(ScriptExecutionContext*)
diff --git a/WebCore/storage/DatabaseTask.h b/WebCore/storage/DatabaseTask.h
index 847846d..b61e465 100644
--- a/WebCore/storage/DatabaseTask.h
+++ b/WebCore/storage/DatabaseTask.h
@@ -98,7 +98,7 @@ class Database::DatabaseOpenTask : public DatabaseTask {
public:
static PassOwnPtr<DatabaseOpenTask> create(Database* db, bool setVersionInNewDatabase, DatabaseTaskSynchronizer* synchronizer, ExceptionCode& code, bool& success)
{
- return new DatabaseOpenTask(db, setVersionInNewDatabase, synchronizer, code, success);
+ return adoptPtr(new DatabaseOpenTask(db, setVersionInNewDatabase, synchronizer, code, success));
}
private:
@@ -118,7 +118,7 @@ class Database::DatabaseCloseTask : public DatabaseTask {
public:
static PassOwnPtr<DatabaseCloseTask> create(Database* db, DatabaseTaskSynchronizer* synchronizer)
{
- return new DatabaseCloseTask(db, synchronizer);
+ return adoptPtr(new DatabaseCloseTask(db, synchronizer));
}
private:
@@ -135,7 +135,7 @@ public:
// Transaction task is never synchronous, so no 'synchronizer' parameter.
static PassOwnPtr<DatabaseTransactionTask> create(PassRefPtr<SQLTransaction> transaction)
{
- return new DatabaseTransactionTask(transaction);
+ return adoptPtr(new DatabaseTransactionTask(transaction));
}
SQLTransaction* transaction() const { return m_transaction.get(); }
@@ -155,7 +155,7 @@ class Database::DatabaseTableNamesTask : public DatabaseTask {
public:
static PassOwnPtr<DatabaseTableNamesTask> create(Database* db, DatabaseTaskSynchronizer* synchronizer, Vector<String>& names)
{
- return new DatabaseTableNamesTask(db, synchronizer, names);
+ return adoptPtr(new DatabaseTableNamesTask(db, synchronizer, names));
}
private:
diff --git a/WebCore/storage/DatabaseThread.cpp b/WebCore/storage/DatabaseThread.cpp
index 99cf3b9..3b790ee 100644
--- a/WebCore/storage/DatabaseThread.cpp
+++ b/WebCore/storage/DatabaseThread.cpp
@@ -43,8 +43,8 @@ namespace WebCore {
DatabaseThread::DatabaseThread()
: m_threadID(0)
- , m_transactionClient(new SQLTransactionClient())
- , m_transactionCoordinator(new SQLTransactionCoordinator())
+ , m_transactionClient(adoptPtr(new SQLTransactionClient()))
+ , m_transactionCoordinator(adoptPtr(new SQLTransactionCoordinator()))
, m_cleanupSync(0)
{
m_selfRef = this;
diff --git a/WebCore/storage/DatabaseTracker.cpp b/WebCore/storage/DatabaseTracker.cpp
index e0ba422..1a13612 100644
--- a/WebCore/storage/DatabaseTracker.cpp
+++ b/WebCore/storage/DatabaseTracker.cpp
@@ -336,7 +336,7 @@ void DatabaseTracker::populateOrigins()
if (m_quotaMap)
return;
- m_quotaMap.set(new QuotaMap);
+ m_quotaMap = adoptPtr(new QuotaMap);
openTrackerDatabase(false);
if (!m_database.isOpen())
@@ -516,7 +516,7 @@ void DatabaseTracker::addOpenDatabase(AbstractDatabase* database)
MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard);
if (!m_openDatabaseMap)
- m_openDatabaseMap.set(new DatabaseOriginMap);
+ m_openDatabaseMap = adoptPtr(new DatabaseOriginMap);
String name(database->stringIdentifier());
DatabaseNameMap* nameMap = m_openDatabaseMap->get(database->securityOrigin());
diff --git a/WebCore/storage/IDBKeyTree.h b/WebCore/storage/IDBKeyTree.h
index 70d6f83..67fe649 100644
--- a/WebCore/storage/IDBKeyTree.h
+++ b/WebCore/storage/IDBKeyTree.h
@@ -131,7 +131,7 @@ void IDBKeyTree<ValueType>::put(IDBKey* key, ValueType* value)
{
TreeNode* node = m_tree.search(key);
if (!node) {
- node = new TreeNode();
+ node = leakPtr(new TreeNode());
node->key = key;
m_tree.insert(node);
}
diff --git a/WebCore/storage/IDBPendingTransactionMonitor.cpp b/WebCore/storage/IDBPendingTransactionMonitor.cpp
index d026099..59f4300 100644
--- a/WebCore/storage/IDBPendingTransactionMonitor.cpp
+++ b/WebCore/storage/IDBPendingTransactionMonitor.cpp
@@ -40,7 +40,7 @@ bool IDBPendingTransactionMonitor::hasPendingTransactions()
void IDBPendingTransactionMonitor::addPendingTransaction(int id)
{
if (!m_ids)
- m_ids = new Vector<int>();
+ m_ids = leakPtr(new Vector<int>());
m_ids->append(id);
}
diff --git a/WebCore/storage/LocalStorageTask.h b/WebCore/storage/LocalStorageTask.h
index 8d53ce4..a2e35ea 100644
--- a/WebCore/storage/LocalStorageTask.h
+++ b/WebCore/storage/LocalStorageTask.h
@@ -43,10 +43,10 @@ namespace WebCore {
~LocalStorageTask();
- static PassOwnPtr<LocalStorageTask> createImport(StorageAreaSync* area) { return new LocalStorageTask(AreaImport, area); }
- static PassOwnPtr<LocalStorageTask> createSync(StorageAreaSync* area) { return new LocalStorageTask(AreaSync, area); }
- static PassOwnPtr<LocalStorageTask> createDeleteEmptyDatabase(StorageAreaSync* area) { return new LocalStorageTask(DeleteEmptyDatabase, area); }
- static PassOwnPtr<LocalStorageTask> createTerminate(LocalStorageThread* thread) { return new LocalStorageTask(TerminateThread, thread); }
+ static PassOwnPtr<LocalStorageTask> createImport(StorageAreaSync* area) { return adoptPtr(new LocalStorageTask(AreaImport, area)); }
+ static PassOwnPtr<LocalStorageTask> createSync(StorageAreaSync* area) { return adoptPtr(new LocalStorageTask(AreaSync, area)); }
+ static PassOwnPtr<LocalStorageTask> createDeleteEmptyDatabase(StorageAreaSync* area) { return adoptPtr(new LocalStorageTask(DeleteEmptyDatabase, area)); }
+ static PassOwnPtr<LocalStorageTask> createTerminate(LocalStorageThread* thread) { return adoptPtr(new LocalStorageTask(TerminateThread, thread)); }
void performTask();
diff --git a/WebCore/storage/LocalStorageThread.cpp b/WebCore/storage/LocalStorageThread.cpp
index d4a7b4c..cbb81c5 100644
--- a/WebCore/storage/LocalStorageThread.cpp
+++ b/WebCore/storage/LocalStorageThread.cpp
@@ -35,7 +35,7 @@ namespace WebCore {
PassOwnPtr<LocalStorageThread> LocalStorageThread::create()
{
- return new LocalStorageThread;
+ return adoptPtr(new LocalStorageThread);
}
LocalStorageThread::LocalStorageThread()
diff --git a/WebCore/storage/SQLTransaction.cpp b/WebCore/storage/SQLTransaction.cpp
index b8837c9..feaa46e 100644
--- a/WebCore/storage/SQLTransaction.cpp
+++ b/WebCore/storage/SQLTransaction.cpp
@@ -255,7 +255,7 @@ void SQLTransaction::openTransactionAndPreflight()
m_database->sqliteDatabase().setMaximumSize(m_database->maximumSize());
ASSERT(!m_sqliteTransaction);
- m_sqliteTransaction.set(new SQLiteTransaction(m_database->sqliteDatabase(), m_readOnly));
+ m_sqliteTransaction = adoptPtr(new SQLiteTransaction(m_database->sqliteDatabase(), m_readOnly));
m_database->resetDeletes();
m_database->disableAuthorizer();
diff --git a/WebCore/storage/SQLTransactionSync.cpp b/WebCore/storage/SQLTransactionSync.cpp
index e56d7b4..87f1eff 100644
--- a/WebCore/storage/SQLTransactionSync.cpp
+++ b/WebCore/storage/SQLTransactionSync.cpp
@@ -58,7 +58,7 @@ SQLTransactionSync::SQLTransactionSync(DatabaseSync* db, PassRefPtr<SQLTransacti
, m_callback(callback)
, m_readOnly(readOnly)
, m_modifiedDatabase(false)
- , m_transactionClient(new SQLTransactionClient())
+ , m_transactionClient(adoptPtr(new SQLTransactionClient()))
{
ASSERT(m_database->scriptExecutionContext()->isContextThread());
}
@@ -130,7 +130,7 @@ ExceptionCode SQLTransactionSync::begin()
m_database->sqliteDatabase().setMaximumSize(m_database->maximumSize());
ASSERT(!m_sqliteTransaction);
- m_sqliteTransaction.set(new SQLiteTransaction(m_database->sqliteDatabase(), m_readOnly));
+ m_sqliteTransaction = adoptPtr(new SQLiteTransaction(m_database->sqliteDatabase(), m_readOnly));
m_database->resetDeletes();
m_database->disableAuthorizer();
diff --git a/WebCore/storage/StorageNamespaceImpl.cpp b/WebCore/storage/StorageNamespaceImpl.cpp
index 0f07e07..3a21489 100644
--- a/WebCore/storage/StorageNamespaceImpl.cpp
+++ b/WebCore/storage/StorageNamespaceImpl.cpp
@@ -93,12 +93,12 @@ PassRefPtr<StorageNamespace> StorageNamespaceImpl::copy()
ASSERT(!m_isShutdown);
ASSERT(m_storageType == SessionStorage);
- StorageNamespaceImpl* newNamespace = new StorageNamespaceImpl(m_storageType, m_path, m_quota);
+ RefPtr<StorageNamespaceImpl> newNamespace = adoptRef(new StorageNamespaceImpl(m_storageType, m_path, m_quota));
StorageAreaMap::iterator end = m_storageAreaMap.end();
for (StorageAreaMap::iterator i = m_storageAreaMap.begin(); i != end; ++i)
newNamespace->m_storageAreaMap.set(i->first, i->second->copy());
- return adoptRef(newNamespace);
+ return newNamespace.release();
}
PassRefPtr<StorageArea> StorageNamespaceImpl::storageArea(PassRefPtr<SecurityOrigin> prpOrigin)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list