Changeset 68180 in webkit
- Timestamp:
- Sep 23, 2010 12:33:39 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 13 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r68177 r68180 1 2010-09-23 Eric Uhrhane <ericu@chromium.org> 2 3 Reviewed by David Levin. 4 5 Rename FileWriterClient to AsyncFileWriterClient. 6 https://bugs.webkit.org/show_bug.cgi?id=46325 7 8 * GNUmakefile.am: 9 * WebCore.gypi: 10 * WebCore.vcproj/WebCore.vcproj: 11 * WebCore.xcodeproj/project.pbxproj: 12 * fileapi/AsyncFileWriter.h: 13 * fileapi/AsyncFileWriterClient.h: Copied from WebCore/fileapi/FileWriterClient.h. 14 * fileapi/FileWriter.h: 15 * fileapi/FileWriterClient.h: Removed. 16 * platform/AsyncFileSystem.h: 17 1 18 2010-09-23 David Hyatt <hyatt@apple.com> 2 19 -
trunk/WebCore/GNUmakefile.am
r68145 r68180 1351 1351 WebCore/editing/WrapContentsInDummySpanCommand.h \ 1352 1352 WebCore/fileapi/AsyncFileWriter.h \ 1353 WebCore/fileapi/AsyncFileWriterClient.h \ 1353 1354 WebCore/fileapi/BlobBuilder.cpp \ 1354 1355 WebCore/fileapi/BlobBuilder.h \ … … 1394 1395 WebCore/fileapi/FileThreadTask.h \ 1395 1396 WebCore/fileapi/FileWriterCallback.h \ 1396 WebCore/fileapi/FileWriterClient.h \1397 1397 WebCore/fileapi/FileWriter.cpp \ 1398 1398 WebCore/fileapi/FileWriter.h \ -
trunk/WebCore/WebCore.gypi
r68022 r68180 1439 1439 'editing/visible_units.h', 1440 1440 'fileapi/AsyncFileWriter.h', 1441 'fileapi/AsyncFileWriterClient.h', 1441 1442 'fileapi/Blob.cpp', 1442 1443 'fileapi/Blob.h', … … 1484 1485 'fileapi/FileWriter.h', 1485 1486 'fileapi/FileWriterCallback.h', 1486 'fileapi/FileWriterClient.h',1487 1487 'fileapi/Flags.h', 1488 1488 'fileapi/LocalFileSystem.h', -
trunk/WebCore/WebCore.vcproj/WebCore.vcproj
r68066 r68180 37522 37522 </File> 37523 37523 <File 37524 RelativePath="..\fileapi\AsyncFileWriterClient.h" 37525 > 37526 </File> 37527 <File 37524 37528 RelativePath="..\html\AsyncImageResizer.cpp" 37525 37529 > … … 37823 37827 <File 37824 37828 RelativePath="..\fileapi\FileWriterCallback.h" 37825 >37826 </File>37827 <File37828 RelativePath="..\fileapi\FileWriterClient.h"37829 37829 > 37830 37830 </File> -
trunk/WebCore/WebCore.xcodeproj/project.pbxproj
r68022 r68180 2778 2778 973E325710883B7C005BC493 /* ResourceLoadNotifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 973E325510883B7C005BC493 /* ResourceLoadNotifier.h */; settings = {ATTRIBUTES = (Private, ); }; }; 2779 2779 976D6C77122B8A3D001FD1F7 /* AsyncFileWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 976D6C58122B8A3D001FD1F7 /* AsyncFileWriter.h */; }; 2780 976D6C93122B8A3D001FD1F7 /* AsyncFileWriterClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 976D6C74122B8A3D001FD1F7 /* AsyncFileWriterClient.h */; }; 2780 2781 976D6C78122B8A3D001FD1F7 /* Blob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 976D6C59122B8A3D001FD1F7 /* Blob.cpp */; }; 2781 2782 976D6C79122B8A3D001FD1F7 /* Blob.h in Headers */ = {isa = PBXBuildFile; fileRef = 976D6C5A122B8A3D001FD1F7 /* Blob.h */; }; … … 2798 2799 976D6C90122B8A3D001FD1F7 /* FileWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 976D6C71122B8A3D001FD1F7 /* FileWriter.cpp */; }; 2799 2800 976D6C91122B8A3D001FD1F7 /* FileWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 976D6C72122B8A3D001FD1F7 /* FileWriter.h */; }; 2800 976D6C93122B8A3D001FD1F7 /* FileWriterClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 976D6C74122B8A3D001FD1F7 /* FileWriterClient.h */; };2801 2801 976D6C94122B8A3D001FD1F7 /* ThreadableBlobRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 976D6C75122B8A3D001FD1F7 /* ThreadableBlobRegistry.cpp */; }; 2802 2802 976D6C95122B8A3D001FD1F7 /* ThreadableBlobRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 976D6C76122B8A3D001FD1F7 /* ThreadableBlobRegistry.h */; }; … … 8678 8678 973E325510883B7C005BC493 /* ResourceLoadNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoadNotifier.h; sourceTree = "<group>"; }; 8679 8679 976D6C58122B8A3D001FD1F7 /* AsyncFileWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AsyncFileWriter.h; path = fileapi/AsyncFileWriter.h; sourceTree = "<group>"; }; 8680 976D6C74122B8A3D001FD1F7 /* AsyncFileWriterClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AsyncFileWriterClient.h; path = fileapi/AsyncFileWriterClient.h; sourceTree = "<group>"; }; 8680 8681 976D6C59122B8A3D001FD1F7 /* Blob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Blob.cpp; path = fileapi/Blob.cpp; sourceTree = "<group>"; }; 8681 8682 976D6C5A122B8A3D001FD1F7 /* Blob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Blob.h; path = fileapi/Blob.h; sourceTree = "<group>"; }; … … 8698 8699 976D6C71122B8A3D001FD1F7 /* FileWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileWriter.cpp; path = fileapi/FileWriter.cpp; sourceTree = "<group>"; }; 8699 8700 976D6C72122B8A3D001FD1F7 /* FileWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileWriter.h; path = fileapi/FileWriter.h; sourceTree = "<group>"; }; 8700 976D6C74122B8A3D001FD1F7 /* FileWriterClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileWriterClient.h; path = fileapi/FileWriterClient.h; sourceTree = "<group>"; };8701 8701 976D6C75122B8A3D001FD1F7 /* ThreadableBlobRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadableBlobRegistry.cpp; path = fileapi/ThreadableBlobRegistry.cpp; sourceTree = "<group>"; }; 8702 8702 976D6C76122B8A3D001FD1F7 /* ThreadableBlobRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadableBlobRegistry.h; path = fileapi/ThreadableBlobRegistry.h; sourceTree = "<group>"; }; … … 14434 14434 children = ( 14435 14435 976D6C58122B8A3D001FD1F7 /* AsyncFileWriter.h */, 14436 976D6C74122B8A3D001FD1F7 /* AsyncFileWriterClient.h */, 14436 14437 976D6C59122B8A3D001FD1F7 /* Blob.cpp */, 14437 14438 976D6C5A122B8A3D001FD1F7 /* Blob.h */, … … 14479 14480 976D6C72122B8A3D001FD1F7 /* FileWriter.h */, 14480 14481 893C47A61238908B002B3D86 /* FileWriterCallback.h */, 14481 976D6C74122B8A3D001FD1F7 /* FileWriterClient.h */,14482 14482 8987854D122CA064003AABDA /* Flags.h */, 14483 14483 8987854E122CA064003AABDA /* LocalFileSystem.cpp */, … … 17877 17877 89D08DA112228451001241DF /* AsyncFileSystemCallbacks.h in Headers */, 17878 17878 976D6C77122B8A3D001FD1F7 /* AsyncFileWriter.h in Headers */, 17879 976D6C93122B8A3D001FD1F7 /* AsyncFileWriterClient.h in Headers */, 17879 17880 B0149E7E11A4B21500196A7B /* AsyncImageResizer.h in Headers */, 17880 17881 8A413AE01207BBA50082016E /* AsyncScriptRunner.h in Headers */, … … 18932 18933 976D6C91122B8A3D001FD1F7 /* FileWriter.h in Headers */, 18933 18934 893C47A81238908B002B3D86 /* FileWriterCallback.h in Headers */, 18934 976D6C93122B8A3D001FD1F7 /* FileWriterClient.h in Headers */,18935 18935 BC5EB69F0E81DAEB00B25965 /* FillLayer.h in Headers */, 18936 18936 845E72F80FD261EE00A87D79 /* Filter.h in Headers */, -
trunk/WebCore/fileapi/AsyncFileWriter.h
r68101 r68180 40 40 41 41 class Blob; 42 class FileWriterClient;43 42 44 43 class AsyncFileWriter { -
trunk/WebCore/fileapi/AsyncFileWriterClient.h
r68179 r68180 29 29 */ 30 30 31 #ifndef FileWriterClient_h32 #define FileWriterClient_h31 #ifndef AsyncFileWriterClient_h 32 #define AsyncFileWriterClient_h 33 33 34 34 #if ENABLE(FILE_SYSTEM) … … 38 38 namespace WebCore { 39 39 40 class FileWriterClient {40 class AsyncFileWriterClient { 41 41 public: 42 virtual ~ FileWriterClient() {}42 virtual ~AsyncFileWriterClient() {} 43 43 44 44 virtual void didWrite(long long bytes, bool complete) = 0; … … 51 51 #endif // ENABLE(FILE_SYSTEM) 52 52 53 #endif // FileWriterClient_h53 #endif // AsyncFileWriterClient_h -
trunk/WebCore/fileapi/FileWriter.h
r67622 r68180 35 35 36 36 #include "ActiveDOMObject.h" 37 #include "AsyncFileWriterClient.h" 37 38 #include "EventTarget.h" 38 #include "FileWriterClient.h"39 39 #include <wtf/OwnPtr.h> 40 40 #include <wtf/PassOwnPtr.h> … … 50 50 class ScriptExecutionContext; 51 51 52 class FileWriter : public RefCounted<FileWriter>, public ActiveDOMObject, public EventTarget, public FileWriterClient {52 class FileWriter : public RefCounted<FileWriter>, public ActiveDOMObject, public EventTarget, public AsyncFileWriterClient { 53 53 public: 54 54 static PassRefPtr<FileWriter> create(ScriptExecutionContext* context) … … 75 75 long long length() const { return m_length; } 76 76 77 // FileWriterClient77 // AsyncFileWriterClient 78 78 void didWrite(long long bytes, bool complete); 79 79 void didTruncate(long long length); -
trunk/WebCore/platform/AsyncFileSystem.h
r68101 r68180 42 42 class AsyncFileSystem; 43 43 class AsyncFileSystemCallbacks; 44 class FileWriterClient;44 class AsyncFileWriterClient; 45 45 46 46 // This class provides async interface for platform-specific file system implementation. Note that all the methods take platform paths. … … 112 112 // AsyncFileSystemCallbacks::didCreateFileWriter() is called when an AsyncFileWriter is created successfully. 113 113 // AsyncFileSystemCallbacks::didFail() is called otherwise. 114 virtual void createWriter( FileWriterClient* client, const String& path, PassOwnPtr<AsyncFileSystemCallbacks>) = 0;114 virtual void createWriter(AsyncFileWriterClient* client, const String& path, PassOwnPtr<AsyncFileSystemCallbacks>) = 0; 115 115 116 116 // Converts a given absolute virtual path to a platform path that starts with the platform root path of this file system. -
trunk/WebKit/chromium/ChangeLog
r68166 r68180 1 2010-09-23 Eric Uhrhane <ericu@chromium.org> 2 3 Reviewed by David Levin. 4 5 Rename FileWriterClient to AsyncFileWriterClient. 6 https://bugs.webkit.org/show_bug.cgi?id=46325 7 8 * src/AsyncFileSystemChromium.cpp: 9 * src/AsyncFileSystemChromium.h: 10 * src/AsyncFileWriterChromium.cpp: 11 * src/AsyncFileWriterChromium.h: 12 1 13 2010-09-23 Nate Chapin <japhet@chromium.org> 2 14 -
trunk/WebKit/chromium/src/AsyncFileSystemChromium.cpp
r68101 r68180 104 104 class FileWriterHelperCallbacks : public WebKit::WebFileSystemCallbacks { 105 105 public: 106 FileWriterHelperCallbacks( FileWriterClient* client, const String& path, WebKit::WebFileSystem* webFileSystem, PassOwnPtr<WebCore::AsyncFileSystemCallbacks> callbacks)106 FileWriterHelperCallbacks(AsyncFileWriterClient* client, const String& path, WebKit::WebFileSystem* webFileSystem, PassOwnPtr<WebCore::AsyncFileSystemCallbacks> callbacks) 107 107 : m_client(client) 108 108 , m_path(path) … … 150 150 151 151 private: 152 FileWriterClient* m_client;152 AsyncFileWriterClient* m_client; 153 153 String m_path; 154 154 WebKit::WebFileSystem* m_webFileSystem; … … 156 156 }; 157 157 158 void AsyncFileSystemChromium::createWriter( FileWriterClient* client, const String& path, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)158 void AsyncFileSystemChromium::createWriter(AsyncFileWriterClient* client, const String& path, PassOwnPtr<AsyncFileSystemCallbacks> callbacks) 159 159 { 160 160 m_webFileSystem->readMetadata(path, new FileWriterHelperCallbacks(client, path, m_webFileSystem, callbacks)); -
trunk/WebKit/chromium/src/AsyncFileSystemChromium.h
r68101 r68180 59 59 virtual void directoryExists(const String& path, PassOwnPtr<AsyncFileSystemCallbacks>); 60 60 virtual void readDirectory(const String& path, PassOwnPtr<AsyncFileSystemCallbacks>); 61 virtual void createWriter( FileWriterClient* client, const String& path, PassOwnPtr<AsyncFileSystemCallbacks>);61 virtual void createWriter(AsyncFileWriterClient* client, const String& path, PassOwnPtr<AsyncFileSystemCallbacks>); 62 62 63 63 private: -
trunk/WebKit/chromium/src/AsyncFileWriterChromium.cpp
r68101 r68180 34 34 #if ENABLE(FILE_SYSTEM) 35 35 36 #include "AsyncFileWriterClient.h" 36 37 #include "Blob.h" 37 #include "FileWriterClient.h"38 38 #include "WebFileWriter.h" 39 39 #include "WebURL.h" … … 41 41 namespace WebCore { 42 42 43 AsyncFileWriterChromium::AsyncFileWriterChromium( FileWriterClient* client)43 AsyncFileWriterChromium::AsyncFileWriterChromium(AsyncFileWriterClient* client) 44 44 : m_client(client) 45 45 { -
trunk/WebKit/chromium/src/AsyncFileWriterChromium.h
r68152 r68180 46 46 47 47 class Blob; 48 class FileWriterClient;48 class AsyncFileWriterClient; 49 49 50 50 class AsyncFileWriterChromium : public AsyncFileWriter, public WebKit::WebFileWriterClient { 51 51 public: 52 AsyncFileWriterChromium( FileWriterClient* client);52 AsyncFileWriterChromium(AsyncFileWriterClient* client); 53 53 ~AsyncFileWriterChromium(); 54 54 … … 67 67 private: 68 68 OwnPtr<WebKit::WebFileWriter> m_writer; 69 FileWriterClient* m_client;69 AsyncFileWriterClient* m_client; 70 70 }; 71 71
Note: See TracChangeset
for help on using the changeset viewer.