Oilpan: add transition types to FileSystem APIs.

Source/modules/filesystem/DOMFileSystemSync.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 32 matching lines @@
 #include "modules/filesystem/FileWriterBaseCallback.h"
 #include "modules/filesystem/FileWriterSync.h"
 #include "platform/FileMetadata.h"
 #include "public/platform/WebFileSystem.h"
 #include "public/platform/WebFileSystemCallbacks.h"
 
 namespace WebCore {
 
 class FileWriterBase;
 
-PassRefPtr<DOMFileSystemSync> DOMFileSystemSync::create(DOMFileSystemBase* fileSystem)
+PassRefPtrWillBeRawPtr<DOMFileSystemSync> DOMFileSystemSync::create(DOMFileSystemBase* fileSystem)
 {
-    return adoptRef(new DOMFileSystemSync(fileSystem->m_context, fileSystem->name(), fileSystem->type(), fileSystem->rootURL()));
+    return adoptRefWillBeRefCountedGarbageCollected(new DOMFileSystemSync(fileSystem->m_context, fileSystem->name(), fileSystem->type(), fileSystem->rootURL()));
 }
 
 DOMFileSystemSync::DOMFileSystemSync(ExecutionContext* context, const String& name, FileSystemType type, const KURL& rootURL)
     : DOMFileSystemBase(context, name, type, rootURL)
 {
     ScriptWrappable::init(this);
 }
 
 DOMFileSystemSync::~DOMFileSystemSync()
 {
 }
 
 void DOMFileSystemSync::reportError(PassOwnPtr<ErrorCallback> errorCallback, PassRefPtrWillBeRawPtr<FileError> fileError)
 {
     errorCallback->handleEvent(fileError.get());
 }
 
-PassRefPtr<DirectoryEntrySync> DOMFileSystemSync::root()
+PassRefPtrWillBeRawPtr<DirectoryEntrySync> DOMFileSystemSync::root()
 {
     return DirectoryEntrySync::create(this, DOMFilePath::root);
 }
 
+
 namespace {
 
 class CreateFileHelper FINAL : public AsyncFileSystemCallbacks {
 public:
-    class CreateFileResult : public RefCounted<CreateFileResult> {
+    class CreateFileResult : public RefCountedWillBeGarbageCollected<CreateFileResult> {
       public:
-        static PassRefPtr<CreateFileResult> create()
+        static PassRefPtrWillBeRawPtr<CreateFileResult> create()
         {
-            return adoptRef(new CreateFileResult());
+            return adoptRefWillBeNoop(new CreateFileResult());
         }
 
         bool m_failed;
         int m_code;
-        RefPtrWillBePersistent<File> m_file;
+        RefPtrWillBeMember<File> m_file;
+
+        void trace(Visitor* visitor)
+        {
+            visitor->trace(m_file);
+        }
 
       private:
         CreateFileResult()
             : m_failed(false)
             , m_code(0)
         {
         }
 
         ~CreateFileResult()
         {
         }
-        friend class WTF::RefCounted<CreateFileResult>;
+        friend class RefCountedWillBeGarbageCollected<CreateFileResult>;

[haraken, 2014/03/07 08:24:35]

Not related to this CL, this class is mis-designed. This class has not only
public members but also a friend class..

     };
 
-    static PassOwnPtr<AsyncFileSystemCallbacks> create(PassRefPtr<CreateFileResult> result, const String& name, const KURL& url, FileSystemType type)
+    static PassOwnPtr<AsyncFileSystemCallbacks> create(PassRefPtrWillBeRawPtr<CreateFileResult> result, const String& name, const KURL& url, FileSystemType type)
     {
         return adoptPtr(static_cast<AsyncFileSystemCallbacks*>(new CreateFileHelper(result, name, url, type)));
     }
 
     virtual void didFail(int code) OVERRIDE
     {
         m_result->m_failed = true;
         m_result->m_code = code;
     }
 
@@ skipping 23 matching lines @@
             m_result->m_file = File::createForFileSystemFile(m_url, metadata).get();
         }
     }
 
     virtual bool shouldBlockUntilCompletion() const OVERRIDE
     {
         return true;
     }
 
 private:
-    CreateFileHelper(PassRefPtr<CreateFileResult> result, const String& name, const KURL& url, FileSystemType type)
+    CreateFileHelper(PassRefPtrWillBeRawPtr<CreateFileResult> result, const String& name, const KURL& url, FileSystemType type)
         : m_result(result)
         , m_name(name)
         , m_url(url)
         , m_type(type)
     {
     }
 
-    RefPtr<CreateFileResult> m_result;
+    RefPtrWillBePersistent<CreateFileResult> m_result;
     String m_name;
     KURL m_url;
     FileSystemType m_type;
 };
 
 } // namespace
 
 PassRefPtrWillBeRawPtr<File> DOMFileSystemSync::createFile(const FileEntrySync* fileEntry, ExceptionState& exceptionState)
 {
     KURL fileSystemURL = createFileSystemURL(fileEntry);
-    RefPtr<CreateFileHelper::CreateFileResult> result(CreateFileHelper::CreateFileResult::create());
+    RefPtrWillBeRawPtr<CreateFileHelper::CreateFileResult> result(CreateFileHelper::CreateFileResult::create());
     fileSystem()->createSnapshotFileAndReadMetadata(fileSystemURL, CreateFileHelper::create(result, fileEntry->name(), fileSystemURL, type()));
     if (result->m_failed) {
         exceptionState.throwDOMException(result->m_code, "Could not create '" + fileEntry->name() + "'.");
         return nullptr;
     }
     return result->m_file.get();
 }
 
 namespace {
 
@@ skipping 31 matching lines @@
     explicit LocalErrorCallback(FileError::ErrorCode& errorCode)
         : m_errorCode(errorCode)
     {
     }
 
     FileError::ErrorCode& m_errorCode;
 };
 
 }
 
-PassRefPtr<FileWriterSync> DOMFileSystemSync::createWriter(const FileEntrySync* fileEntry, ExceptionState& exceptionState)
+PassRefPtrWillBeRawPtr<FileWriterSync> DOMFileSystemSync::createWriter(const FileEntrySync* fileEntry, ExceptionState& exceptionState)
 {
     ASSERT(fileEntry);
 
-    RefPtr<FileWriterSync> fileWriter = FileWriterSync::create();
+    RefPtrWillBeRawPtr<FileWriterSync> fileWriter = FileWriterSync::create();
     OwnPtr<ReceiveFileWriterCallback> successCallback = ReceiveFileWriterCallback::create();
     FileError::ErrorCode errorCode = FileError::OK;
     OwnPtr<LocalErrorCallback> errorCallback = LocalErrorCallback::create(errorCode);
 
     OwnPtr<AsyncFileSystemCallbacks> callbacks = FileWriterBaseCallbacks::create(fileWriter, successCallback.release(), errorCallback.release());
     callbacks->setShouldBlockUntilCompletion(true);
 
     fileSystem()->createFileWriter(createFileSystemURL(fileEntry), fileWriter.get(), callbacks.release());
     if (errorCode != FileError::OK) {
         FileError::throwDOMException(exceptionState, errorCode);
         return nullptr;
     }
     return fileWriter.release();
 }
 
 }