Changeset 65871 in webkit


Ignore:
Timestamp:
Aug 24, 2010 12:34:52 AM (14 years ago)
Author:
abarth@webkit.org
Message:

2010-08-24 Adam Barth <​abarth@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):
Location:
trunk/WebCore
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r65870 r65871  
     12010-08-24  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Deploy adoptPtr in WebCore/storage
     6        https://bugs.webkit.org/show_bug.cgi?id=44491
     7
     8        There are still some naked news for a future patch.  The next step is
     9        to make create methods.
     10
     11        * storage/Database.cpp:
     12        (WebCore::DatabaseCreationCallbackTask::create):
     13        (WebCore::DerefContextTask::create):
     14        (WebCore::DeliverPendingCallbackTask::create):
     15        * storage/DatabaseSync.cpp:
     16        (WebCore::CloseSyncDatabaseOnContextThreadTask::create):
     17        * storage/DatabaseTask.h:
     18        (WebCore::Database::DatabaseOpenTask::create):
     19        (WebCore::Database::DatabaseCloseTask::create):
     20        (WebCore::Database::DatabaseTransactionTask::create):
     21        (WebCore::Database::DatabaseTableNamesTask::create):
     22        * storage/DatabaseThread.cpp:
     23        (WebCore::DatabaseThread::DatabaseThread):
     24        * storage/DatabaseTracker.cpp:
     25        (WebCore::DatabaseTracker::populateOrigins):
     26        (WebCore::DatabaseTracker::addOpenDatabase):
     27        * storage/IDBKeyTree.h:
     28        (WebCore::::put):
     29        * storage/IDBPendingTransactionMonitor.cpp:
     30        (WebCore::IDBPendingTransactionMonitor::addPendingTransaction):
     31        * storage/LocalStorageTask.h:
     32        (WebCore::LocalStorageTask::createImport):
     33        (WebCore::LocalStorageTask::createSync):
     34        (WebCore::LocalStorageTask::createDeleteEmptyDatabase):
     35        (WebCore::LocalStorageTask::createTerminate):
     36        * storage/LocalStorageThread.cpp:
     37        (WebCore::LocalStorageThread::create):
     38        * storage/SQLTransaction.cpp:
     39        (WebCore::SQLTransaction::openTransactionAndPreflight):
     40        * storage/SQLTransactionSync.cpp:
     41        (WebCore::SQLTransactionSync::SQLTransactionSync):
     42        (WebCore::SQLTransactionSync::begin):
     43        * storage/StorageNamespaceImpl.cpp:
     44        (WebCore::StorageNamespaceImpl::copy):
     45
    1462010-08-24  Ilya Tikhonovsky  <loislo@chromium.org>
    247

  • trunk/WebCore/storage/Database.cpp

    r65108 r65871  
    6666    static PassOwnPtr<DatabaseCreationCallbackTask> create(PassRefPtr<Database> database, PassRefPtr<DatabaseCallback> creationCallback)
    6767    {
    68         return new DatabaseCreationCallbackTask(database, creationCallback);
     68        return adoptPtr(new DatabaseCreationCallbackTask(database, creationCallback));
    6969    }
    7070
    … …  
    143143    static PassOwnPtr<DerefContextTask> create(PassRefPtr<ScriptExecutionContext> context)
    144144    {
    145         return new DerefContextTask(context);
     145        return adoptPtr(new DerefContextTask(context));
    146146    }
    147147
    … …  
    330330    static PassOwnPtr<DeliverPendingCallbackTask> create(PassRefPtr<SQLTransaction> transaction)
    331331    {
    332         return new DeliverPendingCallbackTask(transaction);
     332        return adoptPtr(new DeliverPendingCallbackTask(transaction));
    333333    }
    334334

  • trunk/WebCore/storage/DatabaseSync.cpp

    r65005 r65871  
    162162    static PassOwnPtr<CloseSyncDatabaseOnContextThreadTask> create(PassRefPtr<DatabaseSync> database)
    163163    {
    164         return new CloseSyncDatabaseOnContextThreadTask(database);
     164        return adoptPtr(new CloseSyncDatabaseOnContextThreadTask(database));
    165165    }
    166166

  • trunk/WebCore/storage/DatabaseTask.h

    r65108 r65871  
    9999    static PassOwnPtr<DatabaseOpenTask> create(Database* db, bool setVersionInNewDatabase, DatabaseTaskSynchronizer* synchronizer, ExceptionCode& code, bool& success)
    100100    {
    101         return new DatabaseOpenTask(db, setVersionInNewDatabase, synchronizer, code, success);
     101        return adoptPtr(new DatabaseOpenTask(db, setVersionInNewDatabase, synchronizer, code, success));
    102102    }
    103103
    … …  
    119119    static PassOwnPtr<DatabaseCloseTask> create(Database* db, DatabaseTaskSynchronizer* synchronizer)
    120120    {
    121         return new DatabaseCloseTask(db, synchronizer);
     121        return adoptPtr(new DatabaseCloseTask(db, synchronizer));
    122122    }
    123123
    … …  
    136136    static PassOwnPtr<DatabaseTransactionTask> create(PassRefPtr<SQLTransaction> transaction)
    137137    {
    138         return new DatabaseTransactionTask(transaction);
     138        return adoptPtr(new DatabaseTransactionTask(transaction));
    139139    }
    140140
    … …  
    156156    static PassOwnPtr<DatabaseTableNamesTask> create(Database* db, DatabaseTaskSynchronizer* synchronizer, Vector<String>& names)
    157157    {
    158         return new DatabaseTableNamesTask(db, synchronizer, names);
     158        return adoptPtr(new DatabaseTableNamesTask(db, synchronizer, names));
    159159    }
    160160

  • trunk/WebCore/storage/DatabaseThread.cpp

    r65108 r65871  
    4444DatabaseThread::DatabaseThread()
    4545    : m_threadID(0)
    46     , m_transactionClient(new SQLTransactionClient())
    47     , m_transactionCoordinator(new SQLTransactionCoordinator())
     46    , m_transactionClient(adoptPtr(new SQLTransactionClient()))
     47    , m_transactionCoordinator(adoptPtr(new SQLTransactionCoordinator()))
    4848    , m_cleanupSync(0)
    4949{

  • trunk/WebCore/storage/DatabaseTracker.cpp

    r65427 r65871  
    337337        return;
    338338
    339     m_quotaMap.set(new QuotaMap);
     339    m_quotaMap = adoptPtr(new QuotaMap);
    340340
    341341    openTrackerDatabase(false);
    … …  
    517517
    518518        if (!m_openDatabaseMap)
    519             m_openDatabaseMap.set(new DatabaseOriginMap);
     519            m_openDatabaseMap = adoptPtr(new DatabaseOriginMap);
    520520
    521521        String name(database->stringIdentifier());

  • trunk/WebCore/storage/IDBKeyTree.h

    r63064 r65871  
    132132    TreeNode* node = m_tree.search(key);
    133133    if (!node) {
    134         node = new TreeNode();
     134        node = leakPtr(new TreeNode());
    135135        node->key = key;
    136136        m_tree.insert(node);

  • trunk/WebCore/storage/IDBPendingTransactionMonitor.cpp

    r65670 r65871  
    4141{
    4242    if (!m_ids)
    43         m_ids = new Vector<int>();
     43        m_ids = leakPtr(new Vector<int>());
    4444    m_ids->append(id);
    4545}

  • trunk/WebCore/storage/LocalStorageTask.h

    r61542 r65871  
    4444        ~LocalStorageTask();
    4545
    46         static PassOwnPtr<LocalStorageTask> createImport(StorageAreaSync* area) { return new LocalStorageTask(AreaImport, area); }
    47         static PassOwnPtr<LocalStorageTask> createSync(StorageAreaSync* area) { return new LocalStorageTask(AreaSync, area); }
    48         static PassOwnPtr<LocalStorageTask> createDeleteEmptyDatabase(StorageAreaSync* area) { return new LocalStorageTask(DeleteEmptyDatabase, area); }
    49         static PassOwnPtr<LocalStorageTask> createTerminate(LocalStorageThread* thread) { return new LocalStorageTask(TerminateThread, thread); }
     46        static PassOwnPtr<LocalStorageTask> createImport(StorageAreaSync* area) { return adoptPtr(new LocalStorageTask(AreaImport, area)); }
     47        static PassOwnPtr<LocalStorageTask> createSync(StorageAreaSync* area) { return adoptPtr(new LocalStorageTask(AreaSync, area)); }
     48        static PassOwnPtr<LocalStorageTask> createDeleteEmptyDatabase(StorageAreaSync* area) { return adoptPtr(new LocalStorageTask(DeleteEmptyDatabase, area)); }
     49        static PassOwnPtr<LocalStorageTask> createTerminate(LocalStorageThread* thread) { return adoptPtr(new LocalStorageTask(TerminateThread, thread)); }
    5050
    5151        void performTask();

  • trunk/WebCore/storage/LocalStorageThread.cpp

    r50558 r65871  
    3636PassOwnPtr<LocalStorageThread> LocalStorageThread::create()
    3737{
    38     return new LocalStorageThread;
     38    return adoptPtr(new LocalStorageThread);
    3939}
    4040

  • trunk/WebCore/storage/SQLTransaction.cpp

    r65755 r65871  
    256256
    257257    ASSERT(!m_sqliteTransaction);
    258     m_sqliteTransaction.set(new SQLiteTransaction(m_database->sqliteDatabase(), m_readOnly));
     258    m_sqliteTransaction = adoptPtr(new SQLiteTransaction(m_database->sqliteDatabase(), m_readOnly));
    259259
    260260    m_database->resetDeletes();

  • trunk/WebCore/storage/SQLTransactionSync.cpp

    r64537 r65871  
    5959    , m_readOnly(readOnly)
    6060    , m_modifiedDatabase(false)
    61     , m_transactionClient(new SQLTransactionClient())
     61    , m_transactionClient(adoptPtr(new SQLTransactionClient()))
    6262{
    6363    ASSERT(m_database->scriptExecutionContext()->isContextThread());
    … …  
    131131
    132132    ASSERT(!m_sqliteTransaction);
    133     m_sqliteTransaction.set(new SQLiteTransaction(m_database->sqliteDatabase(), m_readOnly));
     133    m_sqliteTransaction = adoptPtr(new SQLiteTransaction(m_database->sqliteDatabase(), m_readOnly));
    134134
    135135    m_database->resetDeletes();

  • trunk/WebCore/storage/StorageNamespaceImpl.cpp

    r65077 r65871  
    9494    ASSERT(m_storageType == SessionStorage);
    9595
    96     StorageNamespaceImpl* newNamespace = new StorageNamespaceImpl(m_storageType, m_path, m_quota);
     96    RefPtr<StorageNamespaceImpl> newNamespace = adoptRef(new StorageNamespaceImpl(m_storageType, m_path, m_quota));
    9797
    9898    StorageAreaMap::iterator end = m_storageAreaMap.end();
    9999    for (StorageAreaMap::iterator i = m_storageAreaMap.begin(); i != end; ++i)
    100100        newNamespace->m_storageAreaMap.set(i->first, i->second->copy());
    101     return adoptRef(newNamespace);
     101    return newNamespace.release();
    102102}
    103103
Note: See TracChangeset for help on using the changeset viewer.