Changeset 70741 in webkit


Ignore:
Timestamp:
Oct 27, 2010 8:18:10 PM (13 years ago)
Author:
kinuko@chromium.org
Message:

2010-10-27 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by Dumitru Daniliuc.

DOMFileSystem's reference should be kept while there're any active Entries/callbacks
​https://bugs.webkit.org/show_bug.cgi?id=47535

Changed to keep DOMFileSystem's reference in each EntryBase, DirectoryReaderBase, EntryCallbacks and EntriesCallbacks.

Test: fast/filesystem/filesystem-reference.html

  • fileapi/DOMFileSystemBase.cpp: (WebCore::DOMFileSystemBase::readDirectory): Changed to pass/take PassRefPtr but not a raw pointer.
  • fileapi/DOMFileSystemBase.h:
  • fileapi/DirectoryEntry.cpp: (WebCore::DirectoryEntry::DirectoryEntry): Ditto. (WebCore::DirectoryEntry::createReader):
  • fileapi/DirectoryEntry.h: (WebCore::DirectoryEntry::create): Ditto.
  • fileapi/DirectoryEntrySync.cpp: (WebCore::DirectoryEntrySync::DirectoryEntrySync): Ditto.
  • fileapi/DirectoryEntrySync.h: (WebCore::DirectoryEntrySync::create): Ditto.
  • fileapi/DirectoryReader.h: (WebCore::DirectoryReader::filesystem):
  • fileapi/DirectoryReaderBase.h: (WebCore::DirectoryReaderBase::filesystem):
  • fileapi/Entry.cpp: (WebCore::Entry::Entry): Ditto.
  • fileapi/Entry.h: (WebCore::Entry::filesystem):
  • fileapi/EntryBase.h: (WebCore::EntryBase::filesystem): (WebCore::EntryBase::EntryBase): Ditto.
  • fileapi/EntrySync.cpp: (WebCore::EntrySync::create): Ditto. (WebCore::EntrySync::getParent): (WebCore::EntrySync::EntrySync): Ditto.
  • fileapi/EntrySync.h: (WebCore::EntrySync::filesystem):
  • fileapi/FileEntry.cpp: (WebCore::FileEntry::FileEntry): Ditto.
  • fileapi/FileEntry.h: (WebCore::FileEntry::create): Ditto.
  • fileapi/FileEntrySync.cpp: (WebCore::FileEntrySync::FileEntrySync): Ditto.
  • fileapi/FileEntrySync.h: (WebCore::FileEntrySync::create): Ditto.
  • fileapi/FileSystemCallbacks.cpp: (WebCore::EntriesCallbacks::create): Ditto. (WebCore::EntriesCallbacks::EntriesCallbacks): Ditto.
  • fileapi/FileSystemCallbacks.h:

2010-10-27 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by Dumitru Daniliuc.

DOMFileSystem's reference should be kept while there're any active Entries/callbacks
​https://bugs.webkit.org/show_bug.cgi?id=47535

  • fast/filesystem/filesystem-reference-expected.txt: Added.
  • fast/filesystem/filesystem-reference.html: Added.
  • fast/filesystem/script-tests/filesystem-reference.js: Added.
Location:
trunk
Files:
3 added
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r70740 r70741  
     12010-10-27  Kinuko Yasuda  <kinuko@chromium.org>
     2
     3        Reviewed by Dumitru Daniliuc.
     4
     5        DOMFileSystem's reference should be kept while there're any active Entries/callbacks
     6        https://bugs.webkit.org/show_bug.cgi?id=47535
     7
     8        * fast/filesystem/filesystem-reference-expected.txt: Added.
     9        * fast/filesystem/filesystem-reference.html: Added.
     10        * fast/filesystem/script-tests/filesystem-reference.js: Added.
     11
    1122010-10-27  Yuzo Fujishima  <yuzo@google.com>
    213

  • trunk/WebCore/ChangeLog

    r70740 r70741  
     12010-10-27  Kinuko Yasuda  <kinuko@chromium.org>
     2
     3        Reviewed by Dumitru Daniliuc.
     4
     5        DOMFileSystem's reference should be kept while there're any active Entries/callbacks
     6        https://bugs.webkit.org/show_bug.cgi?id=47535
     7
     8        Changed to keep DOMFileSystem's reference in each EntryBase, DirectoryReaderBase, EntryCallbacks and EntriesCallbacks.
     9
     10        Test: fast/filesystem/filesystem-reference.html
     11
     12        * fileapi/DOMFileSystemBase.cpp:
     13        (WebCore::DOMFileSystemBase::readDirectory): Changed to pass/take
     14        PassRefPtr but not a raw pointer.
     15        * fileapi/DOMFileSystemBase.h:
     16        * fileapi/DirectoryEntry.cpp:
     17        (WebCore::DirectoryEntry::DirectoryEntry): Ditto.
     18        (WebCore::DirectoryEntry::createReader):
     19        * fileapi/DirectoryEntry.h:
     20        (WebCore::DirectoryEntry::create): Ditto.
     21        * fileapi/DirectoryEntrySync.cpp:
     22        (WebCore::DirectoryEntrySync::DirectoryEntrySync): Ditto.
     23        * fileapi/DirectoryEntrySync.h:
     24        (WebCore::DirectoryEntrySync::create): Ditto.
     25        * fileapi/DirectoryReader.h:
     26        (WebCore::DirectoryReader::filesystem):
     27        * fileapi/DirectoryReaderBase.h:
     28        (WebCore::DirectoryReaderBase::filesystem):
     29        * fileapi/Entry.cpp:
     30        (WebCore::Entry::Entry): Ditto.
     31        * fileapi/Entry.h:
     32        (WebCore::Entry::filesystem):
     33        * fileapi/EntryBase.h:
     34        (WebCore::EntryBase::filesystem):
     35        (WebCore::EntryBase::EntryBase): Ditto.
     36        * fileapi/EntrySync.cpp:
     37        (WebCore::EntrySync::create): Ditto.
     38        (WebCore::EntrySync::getParent):
     39        (WebCore::EntrySync::EntrySync): Ditto.
     40        * fileapi/EntrySync.h:
     41        (WebCore::EntrySync::filesystem):
     42        * fileapi/FileEntry.cpp:
     43        (WebCore::FileEntry::FileEntry): Ditto.
     44        * fileapi/FileEntry.h:
     45        (WebCore::FileEntry::create): Ditto.
     46        * fileapi/FileEntrySync.cpp:
     47        (WebCore::FileEntrySync::FileEntrySync): Ditto.
     48        * fileapi/FileEntrySync.h:
     49        (WebCore::FileEntrySync::create): Ditto.
     50        * fileapi/FileSystemCallbacks.cpp:
     51        (WebCore::EntriesCallbacks::create): Ditto.
     52        (WebCore::EntriesCallbacks::EntriesCallbacks): Ditto.
     53        * fileapi/FileSystemCallbacks.h:
     54
    1552010-10-27  Yuzo Fujishima  <yuzo@google.com>
    256

  • trunk/WebCore/fileapi/DOMFileSystemBase.cpp

    r69485 r70741  
    3636#include "DOMFilePath.h"
    3737#include "DirectoryEntry.h"
     38#include "DirectoryReaderBase.h"
    3839#include "EntriesCallback.h"
    3940#include "EntryArray.h"
    … …  
    191192}
    192193
    193 bool DOMFileSystemBase::readDirectory(DirectoryReaderBase* reader, const String& path, PassRefPtr<EntriesCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
     194bool DOMFileSystemBase::readDirectory(PassRefPtr<DirectoryReaderBase> reader, const String& path, PassRefPtr<EntriesCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
    194195{
    195196    ASSERT(DOMFilePath::isAbsolute(path));

  • trunk/WebCore/fileapi/DOMFileSystemBase.h

    r69485 r70741  
    7373    bool getFile(const EntryBase*, const String& path, PassRefPtr<Flags>, PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>);
    7474    bool getDirectory(const EntryBase*, const String& path, PassRefPtr<Flags>, PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>);
    75     bool readDirectory(DirectoryReaderBase*, const String& path, PassRefPtr<EntriesCallback>, PassRefPtr<ErrorCallback>);
     75    bool readDirectory(PassRefPtr<DirectoryReaderBase>, const String& path, PassRefPtr<EntriesCallback>, PassRefPtr<ErrorCallback>);
    7676
    7777protected:

  • trunk/WebCore/fileapi/DirectoryEntry.cpp

    r70438 r70741  
    4242namespace WebCore {
    4343
    44 DirectoryEntry::DirectoryEntry(DOMFileSystemBase* fileSystem, const String& fullPath)
     44DirectoryEntry::DirectoryEntry(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath)
    4545    : Entry(fileSystem, fullPath)
    4646{

  • trunk/WebCore/fileapi/DirectoryEntry.h

    r69485 r70741  
    5050class DirectoryEntry : public Entry {
    5151public:
    52     static PassRefPtr<DirectoryEntry> create(DOMFileSystemBase* fileSystem, const String& fullPath)
     52    static PassRefPtr<DirectoryEntry> create(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath)
    5353    {
    5454        return adoptRef(new DirectoryEntry(fileSystem, fullPath));
    … …  
    6262
    6363private:
    64     DirectoryEntry(DOMFileSystemBase*, const String& fullPath);
     64    DirectoryEntry(PassRefPtr<DOMFileSystemBase>, const String& fullPath);
    6565};
    6666

  • trunk/WebCore/fileapi/DirectoryEntrySync.cpp

    r70438 r70741  
    4242namespace WebCore {
    4343
    44 DirectoryEntrySync::DirectoryEntrySync(DOMFileSystemBase* fileSystem, const String& fullPath)
     44DirectoryEntrySync::DirectoryEntrySync(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath)
    4545    : EntrySync(fileSystem, fullPath)
    4646{

  • trunk/WebCore/fileapi/DirectoryEntrySync.h

    r69485 r70741  
    4747class DirectoryEntrySync : public EntrySync {
    4848public:
    49     static PassRefPtr<DirectoryEntrySync> create(DOMFileSystemBase* fileSystem, const String& fullPath)
     49    static PassRefPtr<DirectoryEntrySync> create(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath)
    5050    {
    5151        return adoptRef(new DirectoryEntrySync(fileSystem, fullPath));
    … …  
    6060private:
    6161    friend class EntrySync;
    62     DirectoryEntrySync(DOMFileSystemBase*, const String& fullPath);
     62    DirectoryEntrySync(PassRefPtr<DOMFileSystemBase>, const String& fullPath);
    6363};
    6464

  • trunk/WebCore/fileapi/DirectoryReader.cpp

    r69178 r70741  
    4141namespace WebCore {
    4242
    43 DirectoryReader::DirectoryReader(DOMFileSystemBase* fileSystem, const String& fullPath)
     43DirectoryReader::DirectoryReader(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath)
    4444    : DirectoryReaderBase(fileSystem, fullPath)
    4545{

  • trunk/WebCore/fileapi/DirectoryReader.h

    r69178 r70741  
    4848class DirectoryReader : public DirectoryReaderBase {
    4949public:
    50     static PassRefPtr<DirectoryReader> create(DOMFileSystemBase* fileSystem, const String& fullPath)
     50    static PassRefPtr<DirectoryReader> create(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath)
    5151    {
    5252        return adoptRef(new DirectoryReader(fileSystem, fullPath));
    … …  
    5555    void readEntries(PassRefPtr<EntriesCallback>, PassRefPtr<ErrorCallback> = 0);
    5656
    57     DOMFileSystem* filesystem() const { return static_cast<DOMFileSystem*>(m_fileSystem); }
     57    DOMFileSystem* filesystem() const { return static_cast<DOMFileSystem*>(m_fileSystem.get()); }
    5858
    5959private:
    60     DirectoryReader(DOMFileSystemBase*, const String& fullPath);
     60    DirectoryReader(PassRefPtr<DOMFileSystemBase>, const String& fullPath);
    6161};
    6262

  • trunk/WebCore/fileapi/DirectoryReaderBase.h

    r69907 r70741  
    4343class DirectoryReaderBase : public RefCounted<DirectoryReaderBase> {
    4444public:
    45     DOMFileSystemBase* filesystem() const { return m_fileSystem; }
     45    DOMFileSystemBase* filesystem() const { return m_fileSystem.get(); }
    4646    void setHasMoreEntries(bool hasMoreEntries) { m_hasMoreEntries = hasMoreEntries; }
    4747
    4848protected:
    49     DirectoryReaderBase(DOMFileSystemBase* fileSystem, const String& fullPath)
     49    DirectoryReaderBase(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath)
    5050        : m_fileSystem(fileSystem)
    5151        , m_fullPath(fullPath)
    … …  
    5454    }
    5555
    56     DOMFileSystemBase* m_fileSystem;
     56    RefPtr<DOMFileSystemBase> m_fileSystem;
    5757
    5858    // This is a virtual path.

  • trunk/WebCore/fileapi/DirectoryReaderSync.cpp

    r70438 r70741  
    4545namespace WebCore {
    4646
    47 DirectoryReaderSync::DirectoryReaderSync(DOMFileSystemBase* fileSystem, const String& fullPath)
     47DirectoryReaderSync::DirectoryReaderSync(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath)
    4848    : DirectoryReaderBase(fileSystem, fullPath)
    4949{

  • trunk/WebCore/fileapi/DirectoryReaderSync.h

    r69178 r70741  
    4444class DirectoryReaderSync : public DirectoryReaderBase {
    4545public:
    46     static PassRefPtr<DirectoryReaderSync> create(DOMFileSystemBase* fileSystem, const String& fullPath)
     46    static PassRefPtr<DirectoryReaderSync> create(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath)
    4747    {
    4848        return adoptRef(new DirectoryReaderSync(fileSystem, fullPath));
    … …  
    5252
    5353private:
    54     DirectoryReaderSync(DOMFileSystemBase*, const String& fullPath);
     54    DirectoryReaderSync(PassRefPtr<DOMFileSystemBase>, const String& fullPath);
    5555};
    5656

  • trunk/WebCore/fileapi/Entry.cpp

    r70438 r70741  
    4343namespace WebCore {
    4444
    45 Entry::Entry(DOMFileSystemBase* fileSystem, const String& fullPath)
     45Entry::Entry(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath)
    4646    : EntryBase(fileSystem, fullPath)
    4747{

  • trunk/WebCore/fileapi/Entry.h

    r69485 r70741  
    5050class Entry : public EntryBase {
    5151public:
    52     DOMFileSystem* filesystem() const { return static_cast<DOMFileSystem*>(m_fileSystem); }
     52    DOMFileSystem* filesystem() const { return static_cast<DOMFileSystem*>(m_fileSystem.get()); }
    5353
    5454    void getMetadata(PassRefPtr<MetadataCallback> successCallback = 0, PassRefPtr<ErrorCallback> errorCallback = 0);
    … …  
    6161
    6262protected:
    63     Entry(DOMFileSystemBase*, const String& fullPath);
     63    Entry(PassRefPtr<DOMFileSystemBase>, const String& fullPath);
    6464};
    6565

  • trunk/WebCore/fileapi/EntryBase.h

    r69907 r70741  
    4949    virtual ~EntryBase() { }
    5050
    51     DOMFileSystemBase* filesystem() const { return m_fileSystem; }
     51    DOMFileSystemBase* filesystem() const { return m_fileSystem.get(); }
    5252
    5353    virtual bool isFile() const { return false; }
    … …  
    5858
    5959protected:
    60     EntryBase(DOMFileSystemBase* fileSystem, const String& fullPath)
     60    EntryBase(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath)
    6161        : m_fileSystem(fileSystem)
    6262        , m_fullPath(fullPath)
    … …  
    6767    friend class EntrySync;
    6868
    69     DOMFileSystemBase* m_fileSystem;
     69    RefPtr<DOMFileSystemBase> m_fileSystem;
    7070
    7171    // This is a virtual path.

  • trunk/WebCore/fileapi/EntrySync.cpp

    r70438 r70741  
    103103}
    104104
    105 EntrySync::EntrySync(DOMFileSystemBase* fileSystem, const String& fullPath)
     105EntrySync::EntrySync(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath)
    106106    : EntryBase(fileSystem, fullPath)
    107107{

  • trunk/WebCore/fileapi/EntrySync.h

    r69485 r70741  
    5050    static PassRefPtr<EntrySync> create(EntryBase*);
    5151
    52     DOMFileSystemSync* filesystem() const { return static_cast<DOMFileSystemSync*>(m_fileSystem); }
     52    DOMFileSystemSync* filesystem() const { return static_cast<DOMFileSystemSync*>(m_fileSystem.get()); }
    5353
    5454    PassRefPtr<Metadata> getMetadata(ExceptionCode&);
    … …  
    5959
    6060protected:
    61     EntrySync(DOMFileSystemBase*, const String& fullPath);
     61    EntrySync(PassRefPtr<DOMFileSystemBase>, const String& fullPath);
    6262};
    6363

  • trunk/WebCore/fileapi/FileEntry.cpp

    r69907 r70741  
    4242namespace WebCore {
    4343
    44 FileEntry::FileEntry(DOMFileSystemBase* fileSystem, const String& fullPath)
     44FileEntry::FileEntry(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath)
    4545    : Entry(fileSystem, fullPath)
    4646{

  • trunk/WebCore/fileapi/FileEntry.h

    r69249 r70741  
    4444class FileEntry : public Entry {
    4545public:
    46     static PassRefPtr<FileEntry> create(DOMFileSystemBase* fileSystem, const String& fullPath)
     46    static PassRefPtr<FileEntry> create(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath)
    4747    {
    4848        return adoptRef(new FileEntry(fileSystem, fullPath));
    … …  
    5555
    5656private:
    57     FileEntry(DOMFileSystemBase* fileSystem, const String& fullPath);
     57    FileEntry(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath);
    5858};
    5959

  • trunk/WebCore/fileapi/FileEntrySync.cpp

    r69907 r70741  
    3838namespace WebCore {
    3939
    40 FileEntrySync::FileEntrySync(DOMFileSystemBase* fileSystem, const String& fullPath)
     40FileEntrySync::FileEntrySync(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath)
    4141    : EntrySync(fileSystem, fullPath)
    4242{

  • trunk/WebCore/fileapi/FileEntrySync.h

    r69907 r70741  
    4545class FileEntrySync : public EntrySync {
    4646public:
    47     static PassRefPtr<FileEntrySync> create(DOMFileSystemBase* fileSystem, const String& fullPath)
     47    static PassRefPtr<FileEntrySync> create(PassRefPtr<DOMFileSystemBase> fileSystem, const String& fullPath)
    4848    {
    4949        return adoptRef(new FileEntrySync(fileSystem, fullPath));
    … …  
    5656private:
    5757    friend class EntrySync;
    58     FileEntrySync(DOMFileSystemBase*, const String& fullPath);
     58    FileEntrySync(PassRefPtr<DOMFileSystemBase>, const String& fullPath);
    5959};
    6060

  • trunk/WebCore/fileapi/FileSystemCallbacks.cpp

    r70438 r70741  
    111111// EntryCallbacks -------------------------------------------------------------
    112112
    113 PassOwnPtr<EntryCallbacks> EntryCallbacks::create(PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback, DOMFileSystemBase* fileSystem, const String& expectedPath, bool isDirectory)
     113PassOwnPtr<EntryCallbacks> EntryCallbacks::create(PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback, PassRefPtr<DOMFileSystemBase> fileSystem, const String& expectedPath, bool isDirectory)
    114114{
    115115    return adoptPtr(new EntryCallbacks(successCallback, errorCallback, fileSystem, expectedPath, isDirectory));
    116116}
    117117
    118 EntryCallbacks::EntryCallbacks(PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback, DOMFileSystemBase* fileSystem, const String& expectedPath, bool isDirectory)
     118EntryCallbacks::EntryCallbacks(PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback, PassRefPtr<DOMFileSystemBase> fileSystem, const String& expectedPath, bool isDirectory)
    119119    : FileSystemCallbacksBase(errorCallback)
    120120    , m_successCallback(successCallback)
    … …  
    138138// EntriesCallbacks -----------------------------------------------------------
    139139
    140 PassOwnPtr<EntriesCallbacks> EntriesCallbacks::create(PassRefPtr<EntriesCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback, DirectoryReaderBase* directoryReader, const String& basePath)
     140PassOwnPtr<EntriesCallbacks> EntriesCallbacks::create(PassRefPtr<EntriesCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback, PassRefPtr<DirectoryReaderBase> directoryReader, const String& basePath)
    141141{
    142142    return adoptPtr(new EntriesCallbacks(successCallback, errorCallback, directoryReader, basePath));
    143143}
    144144
    145 EntriesCallbacks::EntriesCallbacks(PassRefPtr<EntriesCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback, DirectoryReaderBase* directoryReader, const String& basePath)
     145EntriesCallbacks::EntriesCallbacks(PassRefPtr<EntriesCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback, PassRefPtr<DirectoryReaderBase> directoryReader, const String& basePath)
    146146    : FileSystemCallbacksBase(errorCallback)
    147147    , m_successCallback(successCallback)

  • trunk/WebCore/fileapi/FileSystemCallbacks.h

    r69249 r70741  
    8787class EntryCallbacks : public FileSystemCallbacksBase {
    8888public:
    89     static PassOwnPtr<EntryCallbacks> create(PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>, DOMFileSystemBase*, const String& expectedPath, bool isDirectory);
     89    static PassOwnPtr<EntryCallbacks> create(PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>, PassRefPtr<DOMFileSystemBase>, const String& expectedPath, bool isDirectory);
    9090    virtual void didSucceed();
    9191
    9292private:
    93     EntryCallbacks(PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>, DOMFileSystemBase*, const String& expectedPath, bool isDirectory);
     93    EntryCallbacks(PassRefPtr<EntryCallback>, PassRefPtr<ErrorCallback>, PassRefPtr<DOMFileSystemBase>, const String& expectedPath, bool isDirectory);
    9494    RefPtr<EntryCallback> m_successCallback;
    95     DOMFileSystemBase* m_fileSystem;
     95    RefPtr<DOMFileSystemBase> m_fileSystem;
    9696    String m_expectedPath;
    9797    bool m_isDirectory;
    … …  
    100100class EntriesCallbacks : public FileSystemCallbacksBase {
    101101public:
    102     static PassOwnPtr<EntriesCallbacks> create(PassRefPtr<EntriesCallback>, PassRefPtr<ErrorCallback>, DirectoryReaderBase*, const String& basePath);
     102    static PassOwnPtr<EntriesCallbacks> create(PassRefPtr<EntriesCallback>, PassRefPtr<ErrorCallback>, PassRefPtr<DirectoryReaderBase>, const String& basePath);
    103103    virtual void didReadDirectoryEntry(const String& name, bool isDirectory);
    104104    virtual void didReadDirectoryEntries(bool hasMore);
    105105
    106106private:
    107     EntriesCallbacks(PassRefPtr<EntriesCallback>, PassRefPtr<ErrorCallback>, DirectoryReaderBase*, const String& basePath);
     107    EntriesCallbacks(PassRefPtr<EntriesCallback>, PassRefPtr<ErrorCallback>, PassRefPtr<DirectoryReaderBase>, const String& basePath);
    108108    RefPtr<EntriesCallback> m_successCallback;
    109     DirectoryReaderBase* m_directoryReader;
     109    RefPtr<DirectoryReaderBase> m_directoryReader;
    110110    String m_basePath;
    111111    RefPtr<EntryArray> m_entries;
Note: See TracChangeset for help on using the changeset viewer.