Changeset 66255 in webkit


Ignore:
Timestamp:
Aug 27, 2010 2:15:35 PM (14 years ago)
Author:
kinuko@chromium.org
Message:

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

Reviewed by Darin Fisher.

Add AsyncFileSystem interface for platform-dependent FileSystem API implementation
​https://bugs.webkit.org/show_bug.cgi?id=44433

No new tests; tests will be added later.

  • CMakeLists.txt:
  • WebCore.gypi:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • platform/AsyncFileSystem.cpp: Added.
  • platform/AsyncFileSystem.h: Added.
  • platform/AsyncFileSystemCallbacks.h: Added.
  • storage/DOMFileSystem.cpp: (WebCore::DOMFileSystem::DOMFileSystem): (WebCore::DOMFileSystem::~DOMFileSystem): (WebCore::DOMFileSystem::stop): (WebCore::DOMFileSystem::hasPendingActivity): (WebCore::DOMFileSystem::contextDestroyed):
  • storage/DOMFileSystem.h: (WebCore::DOMFileSystem::create):
  • storage/FileSystemCallbacks.cpp: (WebCore::FileSystemCallbacksBase::didFail): (WebCore::FileSystemCallbacks::FileSystemCallbacks): (WebCore::FileSystemCallbacks::didOpenFileSystem):
  • storage/FileSystemCallbacks.h:
  • storage/LocalFileSystem.cpp: Added.
  • storage/LocalFileSystem.h: Added.
  • storage/Flags.h: Nits fix.
Location:
trunk
Files:
5 added
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/CMakeLists.txt

    r66223 r66255  
    12121212
    12131213    platform/Arena.cpp
     1214    platform/AsyncFileSystem.cpp
    12141215    platform/BlobItem.cpp
    12151216    platform/ContentType.cpp
    … …  
    14841485    storage/IDBFactoryBackendInterface.cpp
    14851486    storage/IDBFactoryBackendImpl.cpp
     1487    storage/LocalFileSystem.cpp
    14861488    storage/LocalStorageTask.cpp
    14871489    storage/LocalStorageThread.cpp

  • trunk/WebCore/ChangeLog

    r66251 r66255  
     12010-08-27  Kinuko Yasuda  <kinuko@chromium.org>
     2
     3        Reviewed by Darin Fisher.
     4
     5        Add AsyncFileSystem interface for platform-dependent FileSystem API implementation
     6        https://bugs.webkit.org/show_bug.cgi?id=44433
     7
     8        No new tests; tests will be added later.
     9
     10        * CMakeLists.txt:
     11        * WebCore.gypi:
     12        * WebCore.pro:
     13        * WebCore.vcproj/WebCore.vcproj:
     14        * WebCore.xcodeproj/project.pbxproj:
     15        * platform/AsyncFileSystem.cpp: Added.
     16        * platform/AsyncFileSystem.h: Added.
     17        * platform/AsyncFileSystemCallbacks.h: Added.
     18        * storage/DOMFileSystem.cpp:
     19        (WebCore::DOMFileSystem::DOMFileSystem):
     20        (WebCore::DOMFileSystem::~DOMFileSystem):
     21        (WebCore::DOMFileSystem::stop):
     22        (WebCore::DOMFileSystem::hasPendingActivity):
     23        (WebCore::DOMFileSystem::contextDestroyed):
     24        * storage/DOMFileSystem.h:
     25        (WebCore::DOMFileSystem::create):
     26        * storage/FileSystemCallbacks.cpp:
     27        (WebCore::FileSystemCallbacksBase::didFail):
     28        (WebCore::FileSystemCallbacks::FileSystemCallbacks):
     29        (WebCore::FileSystemCallbacks::didOpenFileSystem):
     30        * storage/FileSystemCallbacks.h:
     31        * storage/LocalFileSystem.cpp: Added.
     32        * storage/LocalFileSystem.h: Added.
     33
     34        * storage/Flags.h: Nits fix.
     35
    1362010-07-27  Jer Noble  <jer.noble@apple.com>
    237

  • trunk/WebCore/WebCore.gypi

    r66248 r66255  
    30433043            'platform/Arena.h',
    30443044            'platform/AsyncFileStream.h',
     3045            'platform/AsyncFileSystem.cpp',
     3046            'platform/AsyncFileSystem.h',
     3047            'platform/AsyncFileSystemCallbacks.h',
    30453048            'platform/AutodrainedPool.h',
    30463049            'platform/BlobItem.cpp',
    … …  
    36393642            'storage/IDBTransactionCoordinator.cpp',
    36403643            'storage/IDBTransactionCoordinator.h',
     3644            'storage/LocalFileSystem.h',
    36413645            'storage/LocalStorageTask.cpp',
    36423646            'storage/LocalStorageTask.h',

  • trunk/WebCore/WebCore.pro

    r66223 r66255  
    875875    platform/animation/AnimationList.cpp \
    876876    platform/Arena.cpp \
     877    platform/AsyncFileSystem.cpp \
    877878    platform/BlobItem.cpp \
    878879    platform/text/Base64.cpp \
    … …  
    16611662    platform/Arena.h \
    16621663    platform/AsyncFileStream.h \
     1664    platform/AsyncFileSystem.h \
     1665    platform/AsyncFileSystemCallbacks.h \
    16631666    platform/BlobItem.h \
    16641667    platform/ContentType.h \
    … …  
    25982601        storage/FileSystemCallbacks.h \
    25992602        storage/Flags.h \
     2603        storage/LocalFileSystem.h \
    26002604        storage/Metadata.h \
    26012605        storage/MetadataCallback.h
    … …  
    26092613        storage/EntryArray.cpp \
    26102614        storage/FileEntry.cpp \
    2611         storage/FileSystemCallbacks.cpp
     2615        storage/FileSystemCallbacks.cpp \
     2616        storage/LocalFileSystem.cpp
    26122617}
    26132618

  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r66239 r66255  
    2398223982                        </File>
    2398323983                        <File
     23984                                RelativePath="..\platform\AsyncFileSystem.cpp"
     23985                                >
     23986                        </File>
     23987                        <File
     23988                                RelativePath="..\platform\AsyncFileSystem.h"
     23989                                >
     23990                        </File>
     23991                        <File
     23992                                RelativePath="..\platform\AsyncFileSystemCallbacks.h"
     23993                                >
     23994                        </File>
     23995                        <File
    2398423996                                RelativePath="..\platform\AutodrainedPool.h"
    2398523997                                >
    … …  
    5145051462                        </File>
    5145151463                        <File
     51464                                RelativePath="..\storage\LocalFileSystem.cpp"
     51465                                >
     51466                        </File>
     51467                        <File
     51468                                RelativePath="..\storage\LocalFileSystem.h"
     51469                                >
     51470                        </File>
     51471                        <File
    5145251472                                RelativePath="..\storage\LocalStorageTask.cpp"
    5145351473                                >

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r66251 r66255  
    24002400                89686C9F122244A00076EAA4 /* DOMFilePath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89686C9D122244A00076EAA4 /* DOMFilePath.cpp */; };
    24012401                89686CA0122244A00076EAA4 /* DOMFilePath.h in Headers */ = {isa = PBXBuildFile; fileRef = 89686C9E122244A00076EAA4 /* DOMFilePath.h */; };
     2402                898783D312232A13003AABDA /* LocalFileSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 898783D112232A13003AABDA /* LocalFileSystem.cpp */; };
     2403                898783D412232A13003AABDA /* LocalFileSystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 898783D212232A13003AABDA /* LocalFileSystem.h */; };
    24022404                8988E10E11A3508B00DB732E /* BlobItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8988E10C11A3508B00DB732E /* BlobItem.cpp */; };
    24032405                8988E10F11A3508B00DB732E /* BlobItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 8988E10D11A3508B00DB732E /* BlobItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    24492451                89CD029311C85B870070B791 /* JSBlobBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89CD029111C85B870070B791 /* JSBlobBuilder.cpp */; };
    24502452                89CD029411C85B870070B791 /* JSBlobBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 89CD029211C85B870070B791 /* JSBlobBuilder.h */; };
     2453                89D08D9F12228451001241DF /* AsyncFileSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89D08D9C12228451001241DF /* AsyncFileSystem.cpp */; };
     2454                89D08DA012228451001241DF /* AsyncFileSystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 89D08D9D12228451001241DF /* AsyncFileSystem.h */; };
     2455                89D08DA112228451001241DF /* AsyncFileSystemCallbacks.h in Headers */ = {isa = PBXBuildFile; fileRef = 89D08D9E12228451001241DF /* AsyncFileSystemCallbacks.h */; };
    24512456                8A12E35D11FA33280025836A /* DocumentLoadTiming.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A12E35C11FA33280025836A /* DocumentLoadTiming.h */; settings = {ATTRIBUTES = (Private, ); }; };
    24522457                8A413AE01207BBA50082016E /* AsyncScriptRunner.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A413ADE1207BBA50082016E /* AsyncScriptRunner.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    82958300                897A2D91120003760082740C /* JSFlags.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFlags.cpp; sourceTree = "<group>"; };
    82968301                897A2D92120003760082740C /* JSFlags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFlags.h; sourceTree = "<group>"; };
     8302                898783D112232A13003AABDA /* LocalFileSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalFileSystem.cpp; sourceTree = "<group>"; };
     8303                898783D212232A13003AABDA /* LocalFileSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalFileSystem.h; sourceTree = "<group>"; };
    82978304                8988E10C11A3508B00DB732E /* BlobItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BlobItem.cpp; sourceTree = "<group>"; };
    82988305                8988E10D11A3508B00DB732E /* BlobItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlobItem.h; sourceTree = "<group>"; };
    … …  
    83308337                89CD029111C85B870070B791 /* JSBlobBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBlobBuilder.cpp; sourceTree = "<group>"; };
    83318338                89CD029211C85B870070B791 /* JSBlobBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBlobBuilder.h; sourceTree = "<group>"; };
     8339                89D08D9C12228451001241DF /* AsyncFileSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AsyncFileSystem.cpp; sourceTree = "<group>"; };
     8340                89D08D9D12228451001241DF /* AsyncFileSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncFileSystem.h; sourceTree = "<group>"; };
     8341                89D08D9E12228451001241DF /* AsyncFileSystemCallbacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncFileSystemCallbacks.h; sourceTree = "<group>"; };
    83328342                8A12E35C11FA33280025836A /* DocumentLoadTiming.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentLoadTiming.h; sourceTree = "<group>"; };
    83338343                8A413ADE1207BBA50082016E /* AsyncScriptRunner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncScriptRunner.h; sourceTree = "<group>"; };
    … …  
    1169411704                                B6566269120B115A006EA85C /* IDBTransaction.idl */,
    1169511705                                B656626D120B116B006EA85C /* IDBTransactionBackendInterface.h */,
     11706                                898783D112232A13003AABDA /* LocalFileSystem.cpp */,
     11707                                898783D212232A13003AABDA /* LocalFileSystem.h */,
    1169611708                                511F23130DC160DA004F0032 /* LocalStorageTask.cpp */,
    1169711709                                511F23140DC160DA004F0032 /* LocalStorageTask.h */,
    … …  
    1661616628                                BCFB2F75097A2E1A00BA703D /* Arena.h */,
    1661716629                                2EF1BFF6121CB0BD00C27627 /* AsyncFileStream.h */,
     16630                                89D08D9C12228451001241DF /* AsyncFileSystem.cpp */,
     16631                                89D08D9D12228451001241DF /* AsyncFileSystem.h */,
     16632                                89D08D9E12228451001241DF /* AsyncFileSystemCallbacks.h */,
    1661816633                                51E1ECB10C91C55600DC255B /* AutodrainedPool.h */,
    1661916634                                8988E10C11A3508B00DB732E /* BlobItem.cpp */,
    … …  
    2038620401                                8947A83D122234F900D95F2D /* MetadataCallback.h in Headers */,
    2038720402                                9F3B947E12241758005304E7 /* ScriptHeapSnapshot.h in Headers */,
     20403                                89D08DA012228451001241DF /* AsyncFileSystem.h in Headers */,
     20404                                89D08DA112228451001241DF /* AsyncFileSystemCallbacks.h in Headers */,
     20405                                898783D412232A13003AABDA /* LocalFileSystem.h in Headers */,
    2038820406                        );
    2038920407                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    2284422862                                8947A82912222C4700D95F2D /* JSMetadata.cpp in Sources */,
    2284522863                                8947A82B12222C4700D95F2D /* JSMetadataCallback.cpp in Sources */,
     22864                                89D08D9F12228451001241DF /* AsyncFileSystem.cpp in Sources */,
     22865                                898783D312232A13003AABDA /* LocalFileSystem.cpp in Sources */,
    2284622866                        );
    2284722867                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/WebCore/platform/FileSystem.h

    r65509 r66255  
    139139};
    140140
     141#if OS(WINDOWS)
     142static const char PlatformFilePathSeparator = '\\';
     143#else
     144static const char PlatformFilePathSeparator = '/';
     145#endif
     146
    141147bool fileExists(const String&);
    142148bool deleteFile(const String&);

  • trunk/WebCore/storage/DOMFileSystem.cpp

    r65474 r66255  
    3434#if ENABLE(FILE_SYSTEM)
    3535
     36#include "AsyncFileSystem.h"
    3637#include "DirectoryEntry.h"
     38#include "ScriptExecutionContext.h"
    3739
    3840namespace WebCore {
    3941
    40 DOMFileSystem::DOMFileSystem(const String& name, const String& rootPath)
    41     : m_rootPath(rootPath)
     42DOMFileSystem::DOMFileSystem(ScriptExecutionContext* context, const String& name, PassOwnPtr<AsyncFileSystem> asyncFileSystem)
     43    : ActiveDOMObject(context, this)
    4244    , m_name(name)
     45    , m_asyncFileSystem(asyncFileSystem)
     46{
     47}
     48
     49DOMFileSystem::~DOMFileSystem()
    4350{
    4451}
    … …  
    4956}
    5057
     58void DOMFileSystem::stop()
     59{
     60    m_asyncFileSystem->stop();
     61}
     62
     63bool DOMFileSystem::hasPendingActivity() const
     64{
     65    return m_asyncFileSystem->hasPendingActivity();
     66}
     67
     68void DOMFileSystem::contextDestroyed()
     69{
     70    m_asyncFileSystem->stop();
     71}
     72
    5173} // namespace
    5274

  • trunk/WebCore/storage/DOMFileSystem.h

    r65474 r66255  
    3434#if ENABLE(FILE_SYSTEM)
    3535
     36#include "ActiveDOMObject.h"
     37#include "AsyncFileSystem.h"
     38#include "Flags.h"
    3639#include "PlatformString.h"
    3740#include <wtf/PassRefPtr.h>
    … …  
    4144
    4245class DirectoryEntry;
     46class ScriptExecutionContext;
    4347
    44 class DOMFileSystem : public RefCounted<DOMFileSystem> {
     48class DOMFileSystem : public RefCounted<DOMFileSystem>, public ActiveDOMObject {
    4549public:
    46     static PassRefPtr<DOMFileSystem> create(const String& name, const String& rootPath)
     50    static PassRefPtr<DOMFileSystem> create(ScriptExecutionContext* context, const String& name, PassOwnPtr<AsyncFileSystem> asyncFileSystem)
    4751    {
    48         return adoptRef(new DOMFileSystem(name, rootPath));
     52        return adoptRef(new DOMFileSystem(context, name, asyncFileSystem));
    4953    }
     54
     55    virtual ~DOMFileSystem();
    5056
    5157    const String& name() const { return m_name; }
    5258    PassRefPtr<DirectoryEntry> root();
    5359
     60    // ActiveDOMObject methods.
     61    virtual void stop();
     62    virtual bool hasPendingActivity() const;
     63    virtual void contextDestroyed();
     64
    5465private:
    55     DOMFileSystem(const String& name, const String& rootPath);
     66    DOMFileSystem(ScriptExecutionContext*, const String& name, PassOwnPtr<AsyncFileSystem>);
    5667
    57     String m_rootPath;
    5868    String m_name;
     69    mutable OwnPtr<AsyncFileSystem> m_asyncFileSystem;
    5970};
    6071

  • trunk/WebCore/storage/FileSystemCallbacks.cpp

    r65763 r66255  
    3434#if ENABLE(FILE_SYSTEM)
    3535
     36#include "AsyncFileSystem.h"
    3637#include "DOMFileSystem.h"
    3738#include "DirectoryEntry.h"
    … …  
    6667}
    6768
    68 void FileSystemCallbacksBase::didOpenFileSystem(const String&, const String&)
     69void FileSystemCallbacksBase::didOpenFileSystem(const String&, PassOwnPtr<AsyncFileSystem>)
    6970{
    7071    // Each subclass must implement an appropriate one.
    … …  
    7879}
    7980
    80 void FileSystemCallbacksBase::didReadDirectoryChunkDone(bool)
     81void FileSystemCallbacksBase::didReadDirectoryEntries(bool)
    8182{
    8283    // Each subclass must implement an appropriate one.
    … …  
    9091}
    9192
    92 void FileSystemCallbacksBase::didFail(ExceptionCode code)
     93void FileSystemCallbacksBase::didFail(int code)
    9394{
    9495    if (m_errorCallback) {
    … …  
    138139}
    139140
    140 void EntriesCallbacks::didReadDirectoryChunkDone(bool hasMore)
     141void EntriesCallbacks::didReadDirectoryEntries(bool hasMore)
    141142{
    142143    if (m_successCallback) {
    … …  
    153154// FileSystemCallbacks --------------------------------------------------------
    154155
    155 FileSystemCallbacks::FileSystemCallbacks(PassRefPtr<FileSystemCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
    156     : FileSystemCallbacksBase(errorCallback)
    157     , m_successCallback(successCallback)
    158 {
    159 }
    160 
    161 void FileSystemCallbacks::didOpenFileSystem(const String& name, const String& rootPath)
    162 {
    163     if (m_successCallback)
    164         m_successCallback->handleEvent(DOMFileSystem::create(name, rootPath).get());
     156FileSystemCallbacks::FileSystemCallbacks(PassRefPtr<FileSystemCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback, ScriptExecutionContext* context)
     157    : FileSystemCallbacksBase(errorCallback)
     158    , m_successCallback(successCallback)
     159    , m_scriptExecutionContext(context)
     160{
     161}
     162
     163void FileSystemCallbacks::didOpenFileSystem(const String& name, PassOwnPtr<AsyncFileSystem> asyncFileSystem)
     164{
     165    if (m_successCallback) {
     166        ASSERT(asyncFileSystem);
     167        m_successCallback->handleEvent(DOMFileSystem::create(m_scriptExecutionContext.get(), name, asyncFileSystem.leakPtr()).get());
     168        m_scriptExecutionContext.clear();
     169    }
    165170    m_successCallback.clear();
    166171}

  • trunk/WebCore/storage/FileSystemCallbacks.h

    r65763 r66255  
    3434#if ENABLE(FILE_SYSTEM)
    3535
     36#include "AsyncFileSystemCallbacks.h"
    3637#include "PlatformString.h"
    3738#include <wtf/PassRefPtr.h>
    … …  
    5051class VoidCallback;
    5152
    52 typedef int ExceptionCode;
    53 
    54 // A base class for FileSystem callbacks that bundles successCallback, errorCallback and some closure data for the callbacks.
    55 class FileSystemCallbacksBase : public Noncopyable {
     53class FileSystemCallbacksBase : public AsyncFileSystemCallbacks {
    5654public:
    5755    virtual ~FileSystemCallbacksBase();
    … …  
    6159
    6260    // For FileSystemCallbacks.
    63     virtual void didOpenFileSystem(const String& name, const String& rootPath);
     61    virtual void didOpenFileSystem(const String& name, PassOwnPtr<AsyncFileSystem>);
    6462
    6563    // For MetadataCallbacks.
    … …  
    6866    // For EntriesCallbacks. didReadDirectoryEntry is called each time the API reads an entry, and didReadDirectoryDone is called when a chunk of entries have been read (i.e. good time to call back to the application).  If hasMore is true there can be more chunks.
    6967    virtual void didReadDirectoryEntry(const String& name, bool isDirectory);
    70     virtual void didReadDirectoryChunkDone(bool hasMore);
     68    virtual void didReadDirectoryEntries(bool hasMore);
    7169
    7270    // For ErrorCallback.
    73     virtual void didFail(ExceptionCode code);
     71    virtual void didFail(int code);
    7472
    7573protected:
    … …  
    9694    EntriesCallbacks(PassRefPtr<EntriesCallback>, PassRefPtr<ErrorCallback>, DOMFileSystem*, const String& basePath);
    9795    virtual void didReadDirectoryEntry(const String& name, bool isDirectory);
    98     virtual void didReadDirectoryChunkDone(bool hasMore);
     96    virtual void didReadDirectoryEntries(bool hasMore);
    9997
    10098private:
    … …  
    107105class FileSystemCallbacks : public FileSystemCallbacksBase {
    108106public:
    109     FileSystemCallbacks(PassRefPtr<FileSystemCallback>, PassRefPtr<ErrorCallback>);
    110     virtual void didOpenFileSystem(const String& name, const String& rootPath);
     107    FileSystemCallbacks(PassRefPtr<FileSystemCallback>, PassRefPtr<ErrorCallback>, ScriptExecutionContext*);
     108    virtual void didOpenFileSystem(const String& name, PassOwnPtr<AsyncFileSystem>);
    111109
    112110private:
    113111    RefPtr<FileSystemCallback> m_successCallback;
     112    RefPtr<ScriptExecutionContext> m_scriptExecutionContext;
    114113};
    115114

  • trunk/WebCore/storage/Flags.h

    r64414 r66255  
    3434#if ENABLE(FILE_SYSTEM)
    3535
     36#include <wtf/PassRefPtr.h>
    3637#include <wtf/RefCounted.h>
    3738

  • trunk/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp

    r65770 r66255  
    7272    for (size_t i = 0; i < entries.size(); ++i)
    7373        m_callbacks->didReadDirectoryEntry(entries[i].name, entries[i].isDirectory);
    74     m_callbacks->didReadDirectoryChunkDone(hasMore);
     74    m_callbacks->didReadDirectoryEntries(hasMore);
    7575    if (!hasMore)
    7676        delete this;
Note: See TracChangeset for help on using the changeset viewer.