Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / filesystem / DOMFileSystem.cpp

diff --git a/src/third_party/WebKit/Source/modules/filesystem/DOMFileSystem.cpp b/src/third_party/WebKit/Source/modules/filesystem/DOMFileSystem.cpp
index 94a3538..4b2d151 100644 (file)
--- a/src/third_party/WebKit/Source/modules/filesystem/DOMFileSystem.cpp
+++ b/src/third_party/WebKit/Source/modules/filesystem/DOMFileSystem.cpp
@@ -67,19 +67,19 @@ DOMFileSystem* DOMFileSystem::createIsolatedFileSystem(ExecutionContext* context
 
     StringBuilder filesystemName;
     filesystemName.append(createDatabaseIdentifierFromSecurityOrigin(context->securityOrigin()));
-    filesystemName.append(":Isolated_");
+    filesystemName.appendLiteral(":Isolated_");
     filesystemName.append(filesystemId);
 
     // The rootURL created here is going to be attached to each filesystem request and
     // is to be validated each time the request is being handled.
     StringBuilder rootURL;
-    rootURL.append("filesystem:");
+    rootURL.appendLiteral("filesystem:");
     rootURL.append(context->securityOrigin()->toString());
-    rootURL.append("/");
+    rootURL.append('/');
     rootURL.append(isolatedPathPrefix);
-    rootURL.append("/");
+    rootURL.append('/');
     rootURL.append(filesystemId);
-    rootURL.append("/");
+    rootURL.append('/');
 
     return DOMFileSystem::create(context, filesystemName.toString(), FileSystemTypeIsolated, KURL(ParsedURLString, rootURL.toString()));
 }
@@ -89,7 +89,6 @@ DOMFileSystem::DOMFileSystem(ExecutionContext* context, const String& name, File
     , ActiveDOMObject(context)
     , m_numberOfPendingCallbacks(0)
 {
-    ScriptWrappable::init(this);
 }
 
 DirectoryEntry* DOMFileSystem::root()
@@ -114,7 +113,7 @@ bool DOMFileSystem::hasPendingActivity() const
     return m_numberOfPendingCallbacks;
 }
 
-void DOMFileSystem::reportError(PassOwnPtr<ErrorCallback> errorCallback, PassRefPtrWillBeRawPtr<FileError> fileError)
+void DOMFileSystem::reportError(ErrorCallback* errorCallback, PassRefPtrWillBeRawPtr<FileError> fileError)
 {
     scheduleCallback(errorCallback, fileError);
 }
@@ -123,9 +122,15 @@ namespace {
 
 class ConvertToFileWriterCallback : public FileWriterBaseCallback {
 public:
-    static PassOwnPtr<ConvertToFileWriterCallback> create(PassOwnPtr<FileWriterCallback> callback)
+    static ConvertToFileWriterCallback* create(FileWriterCallback* callback)
     {
-        return adoptPtr(new ConvertToFileWriterCallback(callback));
+        return new ConvertToFileWriterCallback(callback);
+    }
+
+    void trace(Visitor* visitor)
+    {
+        visitor->trace(m_callback);
+        FileWriterBaseCallback::trace(visitor);
     }
 
     void handleEvent(FileWriterBase* fileWriterBase)
@@ -133,16 +138,16 @@ public:
         m_callback->handleEvent(static_cast<FileWriter*>(fileWriterBase));
     }
 private:
-    ConvertToFileWriterCallback(PassOwnPtr<FileWriterCallback> callback)
+    explicit ConvertToFileWriterCallback(FileWriterCallback* callback)
         : m_callback(callback)
     {
     }
-    OwnPtr<FileWriterCallback> m_callback;
+    Member<FileWriterCallback> m_callback;
 };
 
 }
 
-void DOMFileSystem::createWriter(const FileEntry* fileEntry, PassOwnPtr<FileWriterCallback> successCallback, PassOwnPtr<ErrorCallback> errorCallback)
+void DOMFileSystem::createWriter(const FileEntry* fileEntry, FileWriterCallback* successCallback, ErrorCallback* errorCallback)
 {
     ASSERT(fileEntry);
 
@@ -152,12 +157,12 @@ void DOMFileSystem::createWriter(const FileEntry* fileEntry, PassOwnPtr<FileWrit
     }
 
     FileWriter* fileWriter = FileWriter::create(executionContext());
-    OwnPtr<FileWriterBaseCallback> conversionCallback = ConvertToFileWriterCallback::create(successCallback);
-    OwnPtr<AsyncFileSystemCallbacks> callbacks = FileWriterBaseCallbacks::create(fileWriter, conversionCallback.release(), errorCallback, m_context);
+    FileWriterBaseCallback* conversionCallback = ConvertToFileWriterCallback::create(successCallback);
+    OwnPtr<AsyncFileSystemCallbacks> callbacks = FileWriterBaseCallbacks::create(fileWriter, conversionCallback, errorCallback, m_context);
     fileSystem()->createFileWriter(createFileSystemURL(fileEntry), fileWriter, callbacks.release());
 }
 
-void DOMFileSystem::createFile(const FileEntry* fileEntry, PassOwnPtr<FileCallback> successCallback, PassOwnPtr<ErrorCallback> errorCallback)
+void DOMFileSystem::createFile(const FileEntry* fileEntry, FileCallback* successCallback, ErrorCallback* errorCallback)
 {
     KURL fileSystemURL = createFileSystemURL(fileEntry);
     if (!fileSystem()) {