Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(291)

Unified Diff: Source/modules/webdatabase/DatabaseManager.cpp

Issue 563703002: Oilpan: Enable oilpan for callback classes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/webdatabase/DatabaseManager.cpp
diff --git a/Source/modules/webdatabase/DatabaseManager.cpp b/Source/modules/webdatabase/DatabaseManager.cpp
index fa725a3a7ff5400ceaa92627ee8fbb5a75144084..8e724b895926ef04e19f51c5d99e3390a4fb6e58 100644
--- a/Source/modules/webdatabase/DatabaseManager.cpp
+++ b/Source/modules/webdatabase/DatabaseManager.cpp
@@ -66,7 +66,7 @@ DatabaseManager::~DatabaseManager()
class DatabaseCreationCallbackTask FINAL : public ExecutionContextTask {
public:
- static PassOwnPtr<DatabaseCreationCallbackTask> create(PassRefPtrWillBeRawPtr<Database> database, PassOwnPtrWillBeRawPtr<DatabaseCallback> creationCallback)
+ static PassOwnPtr<DatabaseCreationCallbackTask> create(PassRefPtrWillBeRawPtr<Database> database, DatabaseCallback* creationCallback)
{
return adoptPtr(new DatabaseCreationCallbackTask(database, creationCallback));
}
@@ -77,14 +77,14 @@ public:
}
private:
- DatabaseCreationCallbackTask(PassRefPtrWillBeRawPtr<Database> database, PassOwnPtrWillBeRawPtr<DatabaseCallback> callback)
+ DatabaseCreationCallbackTask(PassRefPtrWillBeRawPtr<Database> database, DatabaseCallback* callback)
: m_database(database)
, m_creationCallback(callback)
{
}
RefPtrWillBePersistent<Database> m_database;
- OwnPtrWillBePersistent<DatabaseCallback> m_creationCallback;
+ Persistent<DatabaseCallback> m_creationCallback;
};
DatabaseContext* DatabaseManager::existingDatabaseContextFor(ExecutionContext* context)
@@ -190,7 +190,7 @@ PassRefPtrWillBeRawPtr<DatabaseBackend> DatabaseManager::openDatabaseBackend(Exe
PassRefPtrWillBeRawPtr<Database> DatabaseManager::openDatabase(ExecutionContext* context,
const String& name, const String& expectedVersion, const String& displayName,
- unsigned long estimatedSize, PassOwnPtrWillBeRawPtr<DatabaseCallback> creationCallback,
+ unsigned long estimatedSize, DatabaseCallback* creationCallback,
DatabaseError& error, String& errorMessage)
{
ASSERT(error == DatabaseError::None);
@@ -206,7 +206,7 @@ PassRefPtrWillBeRawPtr<Database> DatabaseManager::openDatabase(ExecutionContext*
databaseContextFor(context)->setHasOpenDatabases();
DatabaseClient::from(context)->didOpenDatabase(database, context->securityOrigin()->host(), name, expectedVersion);
- if (backend->isNew() && creationCallback.get()) {
+ if (backend->isNew() && creationCallback) {
WTF_LOG(StorageAPI, "Scheduling DatabaseCreationCallbackTask for database %p\n", database.get());
database->executionContext()->postTask(DatabaseCreationCallbackTask::create(database, creationCallback));
}

Powered by Google App Engine
This is Rietveld 408576698