[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
kinuko at chromium.org
kinuko at chromium.org
Wed Dec 22 13:16:25 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 8920f34785a686059fdc8bbf777c5f248bd1d5e8
Author: kinuko at chromium.org <kinuko at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 10 03:46:21 2010 +0000
2010-09-09 Kinuko Yasuda <kinuko at chromium.org>
Reviewed by Jian Li.
[FileSystem] Add File and FileWriter accessor methods in FileEntry
https://bugs.webkit.org/show_bug.cgi?id=45440
Adding file() and createWrite() methods in FileEntry.
http://dev.w3.org/2009/dap/file-system/file-dir-sys.html#the-fileentry-interface
No new tests; this patch doesn't have implementation yet.
* CMakeLists.txt:
* DerivedSources.cpp:
* DerivedSources.make:
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.pri:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* fileapi/FileEntry.cpp:
(WebCore::FileEntry::createWriter): Added.
(WebCore::FileEntry::file): Added.
* fileapi/FileEntry.h:
* fileapi/FileEntry.idl:
* fileapi/FileCallback.h: Added.
* fileapi/FileCallback.idl: Added.
* fileapi/FileWriterCallback.h: Added.
* fileapi/FileWriterCallback.idl: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67159 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index b510c4f..4fb3c0a 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -198,7 +198,6 @@ SET(WebCore_IDL_FILES
fileapi/File.idl
fileapi/FileList.idl
fileapi/FileReader.idl
- fileapi/FileWriter.idl
html/DataGridColumn.idl
html/DataGridColumnList.idl
@@ -1586,6 +1585,7 @@ if (ENABLE_FILE_SYSTEM)
fileapi/EntryArray.idl
fileapi/EntryCallback.idl
fileapi/ErrorCallback.idl
+ fileapi/FileCallback.idl
fileapi/FileEntry.idl
fileapi/FileSystemCallback.idl
fileapi/Flags.idl
@@ -1594,6 +1594,16 @@ if (ENABLE_FILE_SYSTEM)
)
ENDIF ()
+if (ENABLE_FILE_WRITER)
+ LIST(APPEND WebCore_SOURCES
+ fileapi/FileWriter.cpp
+ )
+ LIST(APPEND WebCore_IDL_FILES
+ fileapi/FileWriterCallback.idl
+ fileapi/FileWriter.idl
+ )
+ENDIF ()
+
IF (ENABLE_SVG)
LIST(APPEND WebCore_SOURCES
bindings/js/JSSVGElementInstanceCustom.cpp
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 63dec74..6ed40bf 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,34 @@
+2010-09-09 Kinuko Yasuda <kinuko at chromium.org>
+
+ Reviewed by Jian Li.
+
+ [FileSystem] Add File and FileWriter accessor methods in FileEntry
+ https://bugs.webkit.org/show_bug.cgi?id=45440
+
+ Adding file() and createWrite() methods in FileEntry.
+ http://dev.w3.org/2009/dap/file-system/file-dir-sys.html#the-fileentry-interface
+
+ No new tests; this patch doesn't have implementation yet.
+
+ * CMakeLists.txt:
+ * DerivedSources.cpp:
+ * DerivedSources.make:
+ * GNUmakefile.am:
+ * WebCore.gypi:
+ * WebCore.pri:
+ * WebCore.pro:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * fileapi/FileEntry.cpp:
+ (WebCore::FileEntry::createWriter): Added.
+ (WebCore::FileEntry::file): Added.
+ * fileapi/FileEntry.h:
+ * fileapi/FileEntry.idl:
+ * fileapi/FileCallback.h: Added.
+ * fileapi/FileCallback.idl: Added.
+ * fileapi/FileWriterCallback.h: Added.
+ * fileapi/FileWriterCallback.idl: Added.
+
2010-09-09 Yuzo Fujishima <yuzo at google.com>
Reviewed by Darin Adler.
diff --git a/WebCore/DerivedSources.cpp b/WebCore/DerivedSources.cpp
index 81f4070..7a0c2fd 100644
--- a/WebCore/DerivedSources.cpp
+++ b/WebCore/DerivedSources.cpp
@@ -105,6 +105,7 @@
#include "JSEventException.cpp"
#include "JSEventSource.cpp"
#include "JSFile.cpp"
+#include "JSFileCallback.cpp"
#include "JSFileEntry.cpp"
#include "JSFileError.cpp"
#include "JSFileException.cpp"
@@ -113,6 +114,7 @@
#include "JSFileReaderSync.cpp"
#include "JSFileSystemCallback.cpp"
#include "JSFileWriter.cpp"
+#include "JSFileWriterCallback.cpp"
#include "JSFlags.cpp"
#include "JSGeolocation.cpp"
#include "JSGeoposition.cpp"
diff --git a/WebCore/DerivedSources.make b/WebCore/DerivedSources.make
index 6fd1cde..c37efb3 100644
--- a/WebCore/DerivedSources.make
+++ b/WebCore/DerivedSources.make
@@ -151,6 +151,7 @@ DOM_CLASSES = \
EventSource \
EventTarget \
File \
+ FileCallback \
FileEntry \
FileException \
FileError \
@@ -158,6 +159,7 @@ DOM_CLASSES = \
FileReader \
FileReaderSync \
FileWriter \
+ FileWriterCallback \
FileSystemCallback \
Flags \
Geolocation \
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 573b7db..33dad10 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -3026,6 +3026,8 @@ webcore_built_sources += \
DerivedSources/WebCore/JSEntryCallback.h \
DerivedSources/WebCore/JSErrorCallback.cpp \
DerivedSources/WebCore/JSErrorCallback.h \
+ DerivedSources/WebCore/JSFileCallback.cpp \
+ DerivedSources/WebCore/JSFileCallback.h \
DerivedSources/WebCore/JSFileEntry.cpp \
DerivedSources/WebCore/JSFileEntry.h \
DerivedSources/WebCore/JSFileSystemCallback.cpp \
@@ -3053,6 +3055,7 @@ webcore_sources += \
WebCore/fileapi/EntryArray.h \
WebCore/fileapi/EntryCallback.h \
WebCore/fileapi/ErrorCallback.h \
+ WebCore/fileapi/FileCallback.h \
WebCore/fileapi/FileEntry.cpp \
WebCore/fileapi/FileEntry.h \
WebCore/fileapi/FileSystemCallback.h \
@@ -4457,12 +4460,15 @@ webcore_cppflags += -DENABLE_FILE_WRITER=1
webcore_built_sources += \
DerivedSources/WebCore/JSFileWriter.cpp \
DerivedSources/WebCore/JSFileWriter.h
+ DerivedSources/WebCore/JSFileWriterCallback.cpp \
+ DerivedSources/WebCore/JSFileWriterCallback.h
webcore_sources += \
WebCore/fileapi/AsyncFileWriter.h \
WebCore/fileapi/FileWriterClient.h \
WebCore/fileapi/FileWriter.cpp \
- WebCore/fileapi/FileWriter.h
+ WebCore/fileapi/FileWriter.h \
+ WebCore/fileapi/FileWriterCallback.h
endif # END ENABLE_FILE_WRITER
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 83890b6..6287760 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -96,6 +96,7 @@
'fileapi/EntryCallback.idl',
'fileapi/ErrorCallback.idl',
'fileapi/File.idl',
+ 'fileapi/FileCallback.idl',
'fileapi/FileEntry.idl',
'fileapi/FileError.idl',
'fileapi/FileException.idl',
@@ -104,6 +105,7 @@
'fileapi/FileReaderSync.idl',
'fileapi/FileSystemCallback.idl',
'fileapi/FileWriter.idl',
+ 'fileapi/FileWriterCallback.idl',
'fileapi/Flags.idl',
'fileapi/Metadata.idl',
'fileapi/MetadataCallback.idl',
@@ -1446,6 +1448,7 @@
'fileapi/ErrorCallback.h',
'fileapi/File.cpp',
'fileapi/File.h',
+ 'fileapi/FileCallback.h',
'fileapi/FileEntry.cpp',
'fileapi/FileEntry.h',
'fileapi/FileError.h',
@@ -1466,6 +1469,7 @@
'fileapi/FileThreadTask.h',
'fileapi/FileWriter.cpp',
'fileapi/FileWriter.h',
+ 'fileapi/FileWriterCallback.h',
'fileapi/FileWriterClient.h',
'fileapi/Flags.h',
'fileapi/LocalFileSystem.h',
diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri
index a4c69b1..48bd9ee 100644
--- a/WebCore/WebCore.pri
+++ b/WebCore/WebCore.pri
@@ -158,12 +158,14 @@ IDL_BINDINGS += \
fileapi/EntryCallback.idl \
fileapi/ErrorCallback.idl \
fileapi/File.idl \
- fileapi/FileList.idl \
- fileapi/FileReader.idl \
- fileapi/FileWriter.idl \
+ fileapi/FileCallback.idl \
fileapi/FileEntry.idl \
fileapi/FileError.idl \
+ fileapi/FileList.idl \
+ fileapi/FileReader.idl \
fileapi/FileSystemCallback.idl \
+ fileapi/FileWriter.idl \
+ fileapi/FileWriterCallback.idl \
fileapi/Flags.idl \
fileapi/Metadata.idl \
fileapi/MetadataCallback.idl \
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 4f1072a..57cf531 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -629,7 +629,6 @@ SOURCES += \
fileapi/FileReaderSync.cpp \
fileapi/FileStreamProxy.cpp \
fileapi/FileThread.cpp \
- fileapi/FileWriter.cpp \
fileapi/ThreadableBlobRegistry.cpp \
history/BackForwardController.cpp \
history/BackForwardListImpl.cpp \
@@ -1403,7 +1402,6 @@ HEADERS += \
editing/VisibleSelection.h \
editing/visible_units.h \
editing/WrapContentsInDummySpanCommand.h \
- fileapi/AsyncFileWriter.h \
fileapi/Blob.h \
fileapi/BlobBuilder.h \
fileapi/BlobURL.h \
@@ -1416,8 +1414,6 @@ HEADERS += \
fileapi/FileStreamProxy.h \
fileapi/FileThread.h \
fileapi/FileThreadTask.h \
- fileapi/FileWriter.h \
- fileapi/FileWriterClient.h \
history/BackForwardController.h \
history/BackForwardControllerClient.h \
history/BackForwardListImpl.h \
@@ -2630,10 +2626,10 @@ contains(DEFINES, ENABLE_FILE_SYSTEM=1) {
fileapi/EntryArray.h \
fileapi/EntryCallback.h \
fileapi/ErrorCallback.h \
+ fileapi/FileCallback.h \
fileapi/FileEntry.h \
fileapi/FileSystemCallback.h \
fileapi/FileSystemCallbacks.h \
- fileapi/FileWriterCallback.h \
fileapi/Flags.h \
fileapi/LocalFileSystem.h \
fileapi/Metadata.h \
@@ -2654,6 +2650,17 @@ contains(DEFINES, ENABLE_FILE_SYSTEM=1) {
platform/AsyncFileSystem.cpp
}
+contains(DEFINES, ENABLE_FILE_WRITER=1) {
+ HEADERS += \
+ fileapi/AsyncFileWriter.h \
+ fileapi/FileWriter.h \
+ fileapi/FileWriterCallback.h \
+ fileapi/FileWriterClient.h
+
+ SOURCES += \
+ fileapi/FileWriter.cpp
+}
+
contains(DEFINES, ENABLE_ICONDATABASE=1) {
SOURCES += \
loader/icon/IconDatabase.cpp \
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index b6cd2c5..2162eb8 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -4821,6 +4821,14 @@
>
</File>
<File
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSFileCallback.cpp"
+ >
+ </File>
+ <File
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSFileCallback.h"
+ >
+ </File>
+ <File
RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSFileError.cpp"
>
<FileConfiguration
@@ -5117,6 +5125,14 @@
>
</File>
<File
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSFileWriterCallback.cpp"
+ >
+ </File>
+ <File
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSFileWriterCallback.h"
+ >
+ </File>
+ <File
RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSFlags.cpp"
>
<FileConfiguration
@@ -37345,6 +37361,14 @@
>
</File>
<File
+ RelativePath="..\fileapi\FileCallback.h"
+ >
+ </File>
+ <File
+ RelativePath="..\fileapi\FileEntry.cpp"
+ >
+ </File>
+ <File
RelativePath="..\fileapi\FileEntry.cpp"
>
</File>
@@ -37425,6 +37449,14 @@
>
</File>
<File
+ RelativePath="..\fileapi\FileWriterCallback.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\fileapi\FileWriterCallback.h"
+ >
+ </File>
+ <File
RelativePath="..\fileapi\FileWriterClient.h"
>
</File>
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 1027fec..faab89f 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -2375,6 +2375,12 @@
85FF315A0AAFBFCB00374F38 /* DOMKeyboardEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 85FF31580AAFBFCB00374F38 /* DOMKeyboardEvent.h */; };
85FF315B0AAFBFCB00374F38 /* DOMKeyboardEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 85FF31590AAFBFCB00374F38 /* DOMKeyboardEvent.mm */; };
86243D0111BC31F700CC006A /* JSArrayBufferViewHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 86243D0011BC31F700CC006A /* JSArrayBufferViewHelper.h */; };
+ 893C47A71238908B002B3D86 /* FileCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 893C47A51238908B002B3D86 /* FileCallback.h */; };
+ 893C47A81238908B002B3D86 /* FileWriterCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 893C47A61238908B002B3D86 /* FileWriterCallback.h */; };
+ 893C47B71238A099002B3D86 /* JSFileCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 893C47B51238A099002B3D86 /* JSFileCallback.cpp */; };
+ 893C47B81238A099002B3D86 /* JSFileCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 893C47B61238A099002B3D86 /* JSFileCallback.h */; };
+ 893C47BB1238A0A9002B3D86 /* JSFileWriterCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 893C47B91238A0A9002B3D86 /* JSFileWriterCallback.cpp */; };
+ 893C47BC1238A0A9002B3D86 /* JSFileWriterCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 893C47BA1238A0A9002B3D86 /* JSFileWriterCallback.h */; };
89878552122CA064003AABDA /* DirectoryEntry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89878539122CA064003AABDA /* DirectoryEntry.cpp */; };
89878553122CA064003AABDA /* DirectoryEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = 8987853A122CA064003AABDA /* DirectoryEntry.h */; };
89878554122CA064003AABDA /* DirectoryReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8987853B122CA064003AABDA /* DirectoryReader.cpp */; };
@@ -8263,6 +8269,12 @@
85FF31580AAFBFCB00374F38 /* DOMKeyboardEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMKeyboardEvent.h; sourceTree = "<group>"; };
85FF31590AAFBFCB00374F38 /* DOMKeyboardEvent.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMKeyboardEvent.mm; sourceTree = "<group>"; };
86243D0011BC31F700CC006A /* JSArrayBufferViewHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSArrayBufferViewHelper.h; sourceTree = "<group>"; };
+ 893C47A51238908B002B3D86 /* FileCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileCallback.h; path = fileapi/FileCallback.h; sourceTree = "<group>"; };
+ 893C47A61238908B002B3D86 /* FileWriterCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileWriterCallback.h; path = fileapi/FileWriterCallback.h; sourceTree = "<group>"; };
+ 893C47B51238A099002B3D86 /* JSFileCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFileCallback.cpp; sourceTree = "<group>"; };
+ 893C47B61238A099002B3D86 /* JSFileCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFileCallback.h; sourceTree = "<group>"; };
+ 893C47B91238A0A9002B3D86 /* JSFileWriterCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFileWriterCallback.cpp; sourceTree = "<group>"; };
+ 893C47BA1238A0A9002B3D86 /* JSFileWriterCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFileWriterCallback.h; sourceTree = "<group>"; };
89878539122CA064003AABDA /* DirectoryEntry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DirectoryEntry.cpp; path = fileapi/DirectoryEntry.cpp; sourceTree = "<group>"; };
8987853A122CA064003AABDA /* DirectoryEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryEntry.h; path = fileapi/DirectoryEntry.h; sourceTree = "<group>"; };
8987853B122CA064003AABDA /* DirectoryReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DirectoryReader.cpp; path = fileapi/DirectoryReader.cpp; sourceTree = "<group>"; };
@@ -13884,6 +13896,8 @@
89878599122CA2A7003AABDA /* JSErrorCallback.h */,
BC00F0100E0A189500FD04E3 /* JSFile.cpp */,
BC00F0110E0A189500FD04E3 /* JSFile.h */,
+ 893C47B51238A099002B3D86 /* JSFileCallback.cpp */,
+ 893C47B61238A099002B3D86 /* JSFileCallback.h */,
8987859A122CA2A7003AABDA /* JSFileEntry.cpp */,
8987859B122CA2A7003AABDA /* JSFileEntry.h */,
2E3BC0C8117D3E0800B9409A /* JSFileError.cpp */,
@@ -13900,6 +13914,8 @@
8987859D122CA2A7003AABDA /* JSFileSystemCallback.h */,
46DA844B1224A0710060D006 /* JSFileWriter.cpp */,
46DA844C1224A0710060D006 /* JSFileWriter.h */,
+ 893C47B91238A0A9002B3D86 /* JSFileWriterCallback.cpp */,
+ 893C47BA1238A0A9002B3D86 /* JSFileWriterCallback.h */,
8987859E122CA2A7003AABDA /* JSFlags.cpp */,
8987859F122CA2A7003AABDA /* JSFlags.h */,
898785A0122CA2A7003AABDA /* JSMetadata.cpp */,
@@ -14394,6 +14410,7 @@
89878547122CA064003AABDA /* ErrorCallback.h */,
976D6C61122B8A3D001FD1F7 /* File.cpp */,
976D6C62122B8A3D001FD1F7 /* File.h */,
+ 893C47A51238908B002B3D86 /* FileCallback.h */,
89878548122CA064003AABDA /* FileEntry.cpp */,
89878549122CA064003AABDA /* FileEntry.h */,
976D6C64122B8A3D001FD1F7 /* FileError.h */,
@@ -14414,6 +14431,7 @@
976D6C70122B8A3D001FD1F7 /* FileThreadTask.h */,
976D6C71122B8A3D001FD1F7 /* FileWriter.cpp */,
976D6C72122B8A3D001FD1F7 /* FileWriter.h */,
+ 893C47A61238908B002B3D86 /* FileWriterCallback.h */,
976D6C74122B8A3D001FD1F7 /* FileWriterClient.h */,
8987854D122CA064003AABDA /* Flags.h */,
8987854E122CA064003AABDA /* LocalFileSystem.cpp */,
@@ -20467,6 +20485,10 @@
97205AB61239291000B17380 /* ImageDocument.h in Headers */,
97205AB81239291000B17380 /* MediaDocument.h in Headers */,
97205ABC1239292700B17380 /* PluginDocument.h in Headers */,
+ 893C47A71238908B002B3D86 /* FileCallback.h in Headers */,
+ 893C47A81238908B002B3D86 /* FileWriterCallback.h in Headers */,
+ 893C47B81238A099002B3D86 /* JSFileCallback.h in Headers */,
+ 893C47BC1238A0A9002B3D86 /* JSFileWriterCallback.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -22935,6 +22957,8 @@
97205AB51239291000B17380 /* ImageDocument.cpp in Sources */,
97205AB71239291000B17380 /* MediaDocument.cpp in Sources */,
97205ABB1239292700B17380 /* PluginDocument.cpp in Sources */,
+ 893C47B71238A099002B3D86 /* JSFileCallback.cpp in Sources */,
+ 893C47BB1238A0A9002B3D86 /* JSFileWriterCallback.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebCore/fileapi/FileCallback.h b/WebCore/fileapi/FileCallback.h
new file mode 100644
index 0000000..6f5ca3d
--- /dev/null
+++ b/WebCore/fileapi/FileCallback.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef FileCallback_h
+#define FileCallback_h
+
+#if ENABLE(FILE_SYSTEM)
+
+#include "File.h"
+#include <wtf/RefCounted.h>
+
+namespace WebCore {
+
+class FileCallback : public RefCounted<FileCallback> {
+public:
+ virtual ~FileCallback() { }
+ virtual bool handleEvent(File*) = 0;
+};
+
+} // namespace
+
+#endif // ENABLE(FILE_SYSTEM)
+
+#endif // FileCallback_h
diff --git a/WebCore/fileapi/FileCallback.idl b/WebCore/fileapi/FileCallback.idl
new file mode 100644
index 0000000..0ab814f
--- /dev/null
+++ b/WebCore/fileapi/FileCallback.idl
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+module fileapi {
+ interface [
+ Conditional=FILE_SYSTEM,
+ Callback
+ ] FileCallback {
+ boolean handleEvent(in File file);
+ };
+}
diff --git a/WebCore/fileapi/FileWriterCallback.h b/WebCore/fileapi/FileWriterCallback.h
new file mode 100644
index 0000000..f5f4d37
--- /dev/null
+++ b/WebCore/fileapi/FileWriterCallback.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef FileWriterCallback_h
+#define FileWriterCallback_h
+
+#if ENABLE(FILE_SYSTEM) && ENABLE(FILE_WRITER)
+
+#include <wtf/RefCounted.h>
+
+namespace WebCore {
+
+class FileWriter;
+
+class FileWriterCallback : public RefCounted<FileWriterCallback> {
+public:
+ virtual ~FileWriterCallback() { }
+ virtual bool handleEvent(FileWriter*) = 0;
+};
+
+} // namespace
+
+#endif // ENABLE(FILE_SYSTEM) && ENABLE(FILE_WRITER)
+
+#endif // FileWriterCallback_h
diff --git a/WebCore/fileapi/FileWriterCallback.idl b/WebCore/fileapi/FileWriterCallback.idl
new file mode 100644
index 0000000..ba77891
--- /dev/null
+++ b/WebCore/fileapi/FileWriterCallback.idl
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+module fileapi {
+ interface [
+ Conditional=FILE_SYSTEM&FILE_WRITER,
+ Callback
+ ] FileWriterCallback {
+ boolean handleEvent(in FileWriter fileWriter);
+ };
+}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list