Changeset 57749 in webkit


Ignore:
Timestamp:
Apr 16, 2010 2:55:19 PM (14 years ago)
Author:
kinuko@chromium.org
Message:

2010-04-16 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by Jian Li.

Implement FileStreamProxy that calls FileStream methods on FileThread for FileAPI
​https://bugs.webkit.org/show_bug.cgi?id=37218

No new tests; tests will be added when we add upper layer implementations.

  • GNUmakefile.am:
  • WebCore.gypi:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • html/FileStream.cpp: (WebCore::FileStream::stop):
  • html/FileStream.h:
  • html/FileStreamClient.h: (WebCore::FileStreamClient::didStop):
  • html/FileStreamProxy.cpp: Added
  • html/FileStreamProxy.h: Added
  • html/FileThreadTask.h: Added
Location:
trunk/WebCore
Files:
3 added
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r57748 r57749  
     12010-04-16  Kinuko Yasuda  <kinuko@chromium.org>
     2
     3        Reviewed by Jian Li.
     4
     5        Implement FileStreamProxy that calls FileStream methods on FileThread for FileAPI
     6        https://bugs.webkit.org/show_bug.cgi?id=37218
     7
     8        No new tests; tests will be added when we add upper layer implementations.
     9
     10        * GNUmakefile.am:
     11        * WebCore.gypi:
     12        * WebCore.pro:
     13        * WebCore.vcproj/WebCore.vcproj:
     14        * WebCore.xcodeproj/project.pbxproj:
     15        * html/FileStream.cpp:
     16        (WebCore::FileStream::stop):
     17        * html/FileStream.h:
     18        * html/FileStreamClient.h:
     19        (WebCore::FileStreamClient::didStop):
     20        * html/FileStreamProxy.cpp: Added
     21        * html/FileStreamProxy.h: Added
     22        * html/FileThreadTask.h: Added
     23
    1242010-04-16  Gavin Barraclough  <barraclough@apple.com>
    225

  • trunk/WebCore/GNUmakefile.am

    r57505 r57749  
    10351035        WebCore/html/FileStream.h \
    10361036        WebCore/html/FileStreamClient.h \
     1037        WebCore/html/FileStreamProxy.cpp \
     1038        WebCore/html/FileStreamProxy.h \
    10371039        WebCore/html/FileThread.cpp \
    10381040        WebCore/html/FileThread.h \
     1041        WebCore/html/FileThreadTask.h \
    10391042        WebCore/html/FormDataList.cpp \
    10401043        WebCore/html/FormDataList.h \

  • trunk/WebCore/WebCore.gypi

    r57505 r57749  
    14411441            'html/FileStream.h',
    14421442            'html/FileStreamClient.h',
     1443            'html/FileStreamProxy.cpp',
     1444            'html/FileStreamProxy.h',
    14431445            'html/FileThread.cpp',
    14441446            'html/FileThread.h',
     1447            'html/FileThreadTask.h',
    14451448            'html/FormDataList.cpp',
    14461449            'html/FormDataList.h',

  • trunk/WebCore/WebCore.pro

    r57505 r57749  
    613613    html/FileList.cpp \
    614614    html/FileStream.cpp \
     615    html/FileStreamProxy.cpp \
    615616    html/FileThread.cpp \
    616617    html/FormDataList.cpp \
    … …  
    13301331    html/FileStream.h \
    13311332    html/FileStreamClient.h \
     1333    html/FileStreamProxy.h \
    13321334    html/FileThread.h \
     1335    html/FileThreadTask.h \
    13331336    html/FormDataList.h \
    13341337    html/HTMLAllCollection.h \

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

    r57505 r57749  
    3030630306                        </File>
    3030730307                        <File
     30308                                RelativePath="..\html\FileStreamProxy.cpp"
     30309                                >
     30310                        </File>
     30311                        <File
     30312                                RelativePath="..\html\FileStreamProxy.h"
     30313                                >
     30314                        </File>
     30315                        <File
    3030830316                                RelativePath="..\html\FileThread.cpp"
    3030930317                                >
    … …  
    3031130319                        <File
    3031230320                                RelativePath="..\html\FileThread.h"
     30321                                >
     30322                        </File>
     30323                        <File
     30324                                RelativePath="..\html\FileThreadTask.h"
    3031330325                                >
    3031430326                        </File>

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

    r57680 r57749  
    22152215                895253D8116C4C6800CABF00 /* FileStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 895253D5116C4C6800CABF00 /* FileStream.h */; };
    22162216                895253D9116C4C6800CABF00 /* FileStreamClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 895253D6116C4C6800CABF00 /* FileStreamClient.h */; };
     2217                895253DC116C4EF500CABF00 /* FileStreamProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 895253DA116C4EF500CABF00 /* FileStreamProxy.cpp */; };
     2218                895253DD116C4EF500CABF00 /* FileStreamProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 895253DB116C4EF500CABF00 /* FileStreamProxy.h */; };
     2219                895253DF116C4F0600CABF00 /* FileThreadTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 895253DE116C4F0600CABF00 /* FileThreadTask.h */; };
    22172220                9302B0BD0D79F82900C7EE83 /* PageGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9302B0BC0D79F82900C7EE83 /* PageGroup.cpp */; };
    22182221                9302B0BF0D79F82C00C7EE83 /* PageGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 9302B0BE0D79F82C00C7EE83 /* PageGroup.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    76747677                895253D5116C4C6800CABF00 /* FileStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileStream.h; sourceTree = "<group>"; };
    76757678                895253D6116C4C6800CABF00 /* FileStreamClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileStreamClient.h; sourceTree = "<group>"; };
     7679                895253DA116C4EF500CABF00 /* FileStreamProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileStreamProxy.cpp; sourceTree = "<group>"; };
     7680                895253DB116C4EF500CABF00 /* FileStreamProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileStreamProxy.h; sourceTree = "<group>"; };
     7681                895253DE116C4F0600CABF00 /* FileThreadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileThreadTask.h; sourceTree = "<group>"; };
    76767682                9302B0BC0D79F82900C7EE83 /* PageGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageGroup.cpp; sourceTree = "<group>"; };
    76777683                9302B0BE0D79F82C00C7EE83 /* PageGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageGroup.h; sourceTree = "<group>"; };
    … …  
    1297912985                        isa = PBXGroup;
    1298012986                        children = (
     12987                                895253DE116C4F0600CABF00 /* FileThreadTask.h */,
     12988                                895253DA116C4EF500CABF00 /* FileStreamProxy.cpp */,
     12989                                895253DB116C4EF500CABF00 /* FileStreamProxy.h */,
    1298112990                                895253D4116C4C6800CABF00 /* FileStream.cpp */,
    1298212991                                895253D5116C4C6800CABF00 /* FileStream.h */,
    … …  
    1884818857                                9FA37EFB1172FDA600C4CD55 /* JSScriptProfile.h in Headers */,
    1884918858                                9FA37EFD1172FDA600C4CD55 /* JSScriptProfileNode.h in Headers */,
     18859                                895253DD116C4EF500CABF00 /* FileStreamProxy.h in Headers */,
     18860                                895253DF116C4F0600CABF00 /* FileThreadTask.h in Headers */,
    1885018861                        );
    1885118862                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    2108221093                                9FA37EFA1172FDA600C4CD55 /* JSScriptProfile.cpp in Sources */,
    2108321094                                9FA37EFC1172FDA600C4CD55 /* JSScriptProfileNode.cpp in Sources */,
     21095                                895253DC116C4EF500CABF00 /* FileStreamProxy.cpp in Sources */,
    2108421096                        );
    2108521097                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/WebCore/html/FileStream.cpp

    r57229 r57749  
    5757}
    5858
     59void FileStream::stop()
     60{
     61    ASSERT(!isMainThread());
     62    close();
     63    m_client->didStop();
     64}
     65
    5966void FileStream::openForRead(Blob*)
    6067{

  • trunk/WebCore/html/FileStream.h

    r57229 r57749  
    5454
    5555    void start();
     56    void stop();
    5657
    5758    void openForRead(Blob*);

  • trunk/WebCore/html/FileStreamClient.h

    r57229 r57749  
    4949    // For both reading and writing.
    5050    virtual void didStart() { }
     51    virtual void didStop() { }
    5152    virtual void didFinish() { }
    5253    virtual void didFail(ExceptionCode) { }
Note: See TracChangeset for help on using the changeset viewer.