Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / webdatabase / DatabaseServer.cpp

diff --git a/src/third_party/WebKit/Source/modules/webdatabase/DatabaseServer.cpp b/src/third_party/WebKit/Source/modules/webdatabase/DatabaseServer.cpp
index 7ff2a8e..2cd8a4d 100644 (file)
--- a/src/third_party/WebKit/Source/modules/webdatabase/DatabaseServer.cpp
+++ b/src/third_party/WebKit/Source/modules/webdatabase/DatabaseServer.cpp
@@ -33,7 +33,7 @@
 #include "modules/webdatabase/DatabaseSync.h"
 #include "modules/webdatabase/DatabaseTracker.h"
 
-namespace WebCore {
+namespace blink {
 
 String DatabaseServer::fullPathForDatabase(SecurityOrigin* origin, const String& name, bool createIfDoesNotExist)
 {
@@ -50,32 +50,32 @@ void DatabaseServer::interruptAllDatabasesForContext(const DatabaseContext* cont
     DatabaseTracker::tracker().interruptAllDatabasesForContext(context);
 }
 
-PassRefPtr<DatabaseBackendBase> DatabaseServer::openDatabase(RefPtr<DatabaseContext>& backendContext,
+PassRefPtrWillBeRawPtr<DatabaseBackendBase> DatabaseServer::openDatabase(DatabaseContext* backendContext,
     DatabaseType type, const String& name, const String& expectedVersion, const String& displayName,
     unsigned long estimatedSize, bool setVersionInNewDatabase, DatabaseError &error, String& errorMessage)
 {
-    RefPtr<DatabaseBackendBase> database;
-    if (DatabaseTracker::tracker().canEstablishDatabase(backendContext.get(), name, displayName, estimatedSize, error))
+    RefPtrWillBeRawPtr<DatabaseBackendBase> database = nullptr;
+    if (DatabaseTracker::tracker().canEstablishDatabase(backendContext, name, displayName, estimatedSize, error))
         database = createDatabase(backendContext, type, name, expectedVersion, displayName, estimatedSize, setVersionInNewDatabase, error, errorMessage);
     return database.release();
 }
 
-PassRefPtr<DatabaseBackendBase> DatabaseServer::createDatabase(RefPtr<DatabaseContext>& backendContext,
+PassRefPtrWillBeRawPtr<DatabaseBackendBase> DatabaseServer::createDatabase(DatabaseContext* backendContext,
     DatabaseType type, const String& name, const String& expectedVersion, const String& displayName,
     unsigned long estimatedSize, bool setVersionInNewDatabase, DatabaseError& error, String& errorMessage)
 {
-    RefPtr<DatabaseBackendBase> database;
+    RefPtrWillBeRawPtr<DatabaseBackendBase> database = nullptr;
     switch (type) {
     case DatabaseType::Async:
-        database = adoptRef(new Database(backendContext, name, expectedVersion, displayName, estimatedSize));
+        database = adoptRefWillBeNoop(new Database(backendContext, name, expectedVersion, displayName, estimatedSize));
         break;
     case DatabaseType::Sync:
-        database = adoptRef(new DatabaseSync(backendContext, name, expectedVersion, displayName, estimatedSize));
+        database = adoptRefWillBeNoop(new DatabaseSync(backendContext, name, expectedVersion, displayName, estimatedSize));
     }
 
     if (!database->openAndVerifyVersion(setVersionInNewDatabase, error, errorMessage))
-        return 0;
+        return nullptr;
     return database.release();
 }
 
-} // namespace WebCore
+} // namespace blink