Move DirectoryReader::ReadEntries to FileRef::ReadDirectoryEntries

webkit/plugins/ppapi/file_callbacks.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_FILE_CALLBACKS_H_
 #define WEBKIT_PLUGINS_PPAPI_FILE_CALLBACKS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/platform_file.h"
 #include "googleurl/src/gurl.h"
+#include "ppapi/c/pp_array_output.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_file_info.h"
 #include "ppapi/c/pp_resource.h"
 #include "webkit/fileapi/file_system_callback_dispatcher.h"
 
 struct PP_FileInfo;
 
 namespace base {
 class FilePath;
 }
 
 namespace ppapi {
 class Resource;
 class TrackedCallback;
+struct PPB_FileRef_CreateInfo;
 }
 
 namespace webkit {
 namespace ppapi {
 
+class PPB_FileRef_Impl;
+
 // Instances of this class are deleted by FileSystemDispatcher.
 class FileCallbacks : public fileapi::FileSystemCallbackDispatcher {
  public:
+  // Doesn't take the ownership of members.
+  struct ReadEntriesParams {
+    PPB_FileRef_Impl* dir_ref;
+    std::vector< ::ppapi::PPB_FileRef_CreateInfo>* files;

[palmer, 2013/05/03 00:07:24]

extra space

[hamaji, 2013/05/03 01:10:34]

I think we don't use <:: because it's a trigraph :(

+    std::vector<PP_FileType>* file_types;
+  };
+
   FileCallbacks(::ppapi::Resource* resource,
                 scoped_refptr< ::ppapi::TrackedCallback> callback,
                 PP_FileInfo* info);
   FileCallbacks(::ppapi::Resource* resource,
                 scoped_refptr< ::ppapi::TrackedCallback> callback,
                 PP_FileInfo* info,
                 PP_FileSystemType file_system_type);
+  FileCallbacks(::ppapi::Resource* resource,
+                scoped_refptr< ::ppapi::TrackedCallback> callback,

[palmer, 2013/05/03 00:07:24]

space

[hamaji, 2013/05/03 01:10:34]

ditto

+                const ReadEntriesParams& params);
   virtual ~FileCallbacks();
 
   // FileSystemCallbackDispatcher implementation.
   virtual void DidSucceed();
   virtual void DidReadMetadata(
       const base::PlatformFileInfo& file_info,
       const base::FilePath& unused);
   virtual void DidCreateSnapshotFile(
       const base::PlatformFileInfo& file_info,
       const base::FilePath& path);
   virtual void DidReadDirectory(
       const std::vector<base::FileUtilProxy::Entry>& entries, bool has_more);
   virtual void DidOpenFileSystem(const std::string&,
                                  const GURL& root_url);
   virtual void DidFail(base::PlatformFileError error_code);
   virtual void DidWrite(int64 bytes, bool complete);
 
   scoped_refptr< ::ppapi::TrackedCallback> GetTrackedCallback() const;
 
  private:
   void RunCallback(base::PlatformFileError error_code);
 
   scoped_refptr< ::ppapi::TrackedCallback> callback_;
   PP_FileInfo* info_;
   PP_FileSystemType file_system_type_;
+  PPB_FileRef_Impl* read_entries_dir_ref_;
+  std::vector< ::ppapi::PPB_FileRef_CreateInfo>* read_entries_files_;

[palmer, 2013/05/03 00:07:24]

space

[hamaji, 2013/05/03 01:10:34]

ditto

+  std::vector<PP_FileType>* read_entries_file_types_;

[dmichael (off chromium), 2013/05/02 20:39:13]

As I noted elsewhere, I think these may need to be linked_ptr to avoid
use-after-free.

(This is kind of ugly, but probably good enough for the interim time before
FileRef is refactored)

[hamaji, 2013/05/02 22:45:14]

Done. As we've chatted, I also modified Query as well. Query was actually more
tricky than ReadEntries because it also supports in-process mode as well. I
think I managed to solve the problem by introducing a hack called
maybe_linked_ptr. Please let me know if there is a better solution for this.

[dmichael (off chromium), 2013/05/02 23:20:43]

Nobody actually uses FileRef::Query in-process; we should just kill it off now
and not add maybe_linked_ptr.

[hamaji, 2013/05/02 23:36:33]

A good news! Done

 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_FILE_CALLBACKS_H_