2010-09-16 Eric Uhrhane <ericu@chromium.org>
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Sep 2010 13:45:02 +0000 (13:45 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Sep 2010 13:45:02 +0000 (13:45 +0000)
        Reviewed by Jian Li.

        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
        https://bugs.webkit.org/show_bug.cgi?id=45798

        * configure.ac:
2010-09-16  Eric Uhrhane  <ericu@chromium.org>

        Reviewed by Jian Li.

        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
        https://bugs.webkit.org/show_bug.cgi?id=45798

        * Configurations/FeatureDefines.xcconfig:
2010-09-16  Eric Uhrhane  <ericu@chromium.org>

        Reviewed by Jian Li.

        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
        https://bugs.webkit.org/show_bug.cgi?id=45798

        * CMakeLists.txt:
        * Configurations/FeatureDefines.xcconfig:
        * GNUmakefile.am:
        * WebCore.pro:
        * dom/EventTarget.cpp:
        * dom/EventTarget.h:
        * dom/ExceptionCode.h:
        * dom/ScriptExecutionContext.cpp:
        (WebCore::ScriptExecutionContext::~ScriptExecutionContext):
        * dom/ScriptExecutionContext.h:
        * fileapi/AsyncFileWriter.h:
        * fileapi/FileEntry.cpp:
        * fileapi/FileEntry.h:
        * fileapi/FileEntry.idl:
        * fileapi/FileError.h:
        * fileapi/FileError.idl:
        * fileapi/FileException.h:
        * fileapi/FileException.idl:
        * fileapi/FileStreamProxy.cpp:
        * fileapi/FileStreamProxy.h:
        * fileapi/FileThread.cpp:
        * fileapi/FileThread.h:
        * fileapi/FileWriter.cpp:
        * fileapi/FileWriter.h:
        * fileapi/FileWriter.idl:
        * fileapi/FileWriterCallback.h:
        * fileapi/FileWriterCallback.idl:
        * fileapi/FileWriterClient.h:
        * page/DOMWindow.idl:
        * platform/AsyncFileStream.h:
        * platform/FileStream.cpp:
        * platform/FileStream.h:
        * platform/FileStreamClient.h:
2010-09-16  Eric Uhrhane  <ericu@chromium.org>

        Reviewed by Jian Li.

        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
        https://bugs.webkit.org/show_bug.cgi?id=45798

        * src/AsyncFileWriterChromium.h:
        * src/AsyncFileWriterChromium.cpp:
2010-09-16  Eric Uhrhane  <ericu@chromium.org>

        Reviewed by Jian Li.

        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
        https://bugs.webkit.org/show_bug.cgi?id=45798

        * Configurations/FeatureDefines.xcconfig:
2010-09-16  Eric Uhrhane  <ericu@chromium.org>

        Reviewed by Jian Li.

        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
        https://bugs.webkit.org/show_bug.cgi?id=45798

        * Configurations/FeatureDefines.xcconfig:
2010-09-16  Eric Uhrhane  <ericu@chromium.org>

        Reviewed by Jian Li.

        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
        https://bugs.webkit.org/show_bug.cgi?id=45798

        * win/tools/vsprops/FeatureDefines.vsprops:
        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
2010-09-16  Eric Uhrhane  <ericu@chromium.org>

        Reviewed by Jian Li.

        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
        https://bugs.webkit.org/show_bug.cgi?id=45798

        * Scripts/build-webkit:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@67614 268f45cc-cd09-0410-ab3c-d52691b4dbfc

49 files changed:
ChangeLog
JavaScriptCore/ChangeLog
JavaScriptCore/Configurations/FeatureDefines.xcconfig
WebCore/CMakeLists.txt
WebCore/ChangeLog
WebCore/Configurations/FeatureDefines.xcconfig
WebCore/GNUmakefile.am
WebCore/WebCore.pro
WebCore/dom/EventTarget.cpp
WebCore/dom/EventTarget.h
WebCore/dom/ExceptionCode.h
WebCore/dom/ScriptExecutionContext.cpp
WebCore/dom/ScriptExecutionContext.h
WebCore/fileapi/AsyncFileWriter.h
WebCore/fileapi/FileEntry.cpp
WebCore/fileapi/FileEntry.h
WebCore/fileapi/FileEntry.idl
WebCore/fileapi/FileError.h
WebCore/fileapi/FileError.idl
WebCore/fileapi/FileException.h
WebCore/fileapi/FileException.idl
WebCore/fileapi/FileStreamProxy.cpp
WebCore/fileapi/FileStreamProxy.h
WebCore/fileapi/FileThread.cpp
WebCore/fileapi/FileThread.h
WebCore/fileapi/FileWriter.cpp
WebCore/fileapi/FileWriter.h
WebCore/fileapi/FileWriter.idl
WebCore/fileapi/FileWriterCallback.h
WebCore/fileapi/FileWriterCallback.idl
WebCore/fileapi/FileWriterClient.h
WebCore/page/DOMWindow.idl
WebCore/platform/AsyncFileStream.h
WebCore/platform/FileStream.cpp
WebCore/platform/FileStream.h
WebCore/platform/FileStreamClient.h
WebKit/chromium/ChangeLog
WebKit/chromium/src/AsyncFileWriterChromium.cpp
WebKit/chromium/src/AsyncFileWriterChromium.h
WebKit/mac/ChangeLog
WebKit/mac/Configurations/FeatureDefines.xcconfig
WebKit2/ChangeLog
WebKit2/Configurations/FeatureDefines.xcconfig
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
WebKitTools/ChangeLog
WebKitTools/Scripts/build-webkit
configure.ac

index 39593ea..78fa09d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-16  Eric Uhrhane  <ericu@chromium.org>
+
+        Reviewed by Jian Li.
+
+        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
+        https://bugs.webkit.org/show_bug.cgi?id=45798
+
+        * configure.ac:
+
 2010-09-15  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed.  Test commit for commit-queue@webkit.org.
index cabc758..2ccdc96 100644 (file)
@@ -1,3 +1,12 @@
+2010-09-16  Eric Uhrhane  <ericu@chromium.org>
+
+        Reviewed by Jian Li.
+
+        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
+        https://bugs.webkit.org/show_bug.cgi?id=45798
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2010-09-15  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Geoffrey Garen.
index f2b4c09..2ed3a8e 100644 (file)
@@ -69,7 +69,6 @@ ENABLE_EVENTSOURCE = ENABLE_EVENTSOURCE;
 ENABLE_FILTERS = $(ENABLE_FILTERS_$(REAL_PLATFORM_NAME));
 ENABLE_FILTERS_macosx = ENABLE_FILTERS;
 
-ENABLE_FILE_WRITER = ;
 ENABLE_FILE_SYSTEM = ;
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 
@@ -120,4 +119,4 @@ ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_WRITER) $(ENABLE_FILE_SYSTEM) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PROGRESS_TAG) $(ENABLE_RUBY) $(ENABLE_SANDBOX) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PROGRESS_TAG) $(ENABLE_RUBY) $(ENABLE_SANDBOX) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
index 0de8e37..bc93bad 100644 (file)
@@ -1579,6 +1579,7 @@ if (ENABLE_FILE_SYSTEM)
         fileapi/EntryArray.cpp
         fileapi/FileEntry.cpp
         fileapi/FileSystemCallbacks.cpp
+        fileapi/FileWriter.cpp
         fileapi/LocalFileSystem.cpp
         platform/AsyncFileSystem.cpp
     )
@@ -1594,22 +1595,14 @@ if (ENABLE_FILE_SYSTEM)
         fileapi/FileCallback.idl
         fileapi/FileEntry.idl
         fileapi/FileSystemCallback.idl
+        fileapi/FileWriterCallback.idl
+        fileapi/FileWriter.idl
         fileapi/Flags.idl
         fileapi/Metadata.idl
         fileapi/MetadataCallback.idl
     )
 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
index b033ba2..d34cbac 100644 (file)
@@ -1,3 +1,44 @@
+2010-09-16  Eric Uhrhane  <ericu@chromium.org>
+
+        Reviewed by Jian Li.
+
+        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
+        https://bugs.webkit.org/show_bug.cgi?id=45798
+
+        * CMakeLists.txt:
+        * Configurations/FeatureDefines.xcconfig:
+        * GNUmakefile.am:
+        * WebCore.pro:
+        * dom/EventTarget.cpp:
+        * dom/EventTarget.h:
+        * dom/ExceptionCode.h:
+        * dom/ScriptExecutionContext.cpp:
+        (WebCore::ScriptExecutionContext::~ScriptExecutionContext):
+        * dom/ScriptExecutionContext.h:
+        * fileapi/AsyncFileWriter.h:
+        * fileapi/FileEntry.cpp:
+        * fileapi/FileEntry.h:
+        * fileapi/FileEntry.idl:
+        * fileapi/FileError.h:
+        * fileapi/FileError.idl:
+        * fileapi/FileException.h:
+        * fileapi/FileException.idl:
+        * fileapi/FileStreamProxy.cpp:
+        * fileapi/FileStreamProxy.h:
+        * fileapi/FileThread.cpp:
+        * fileapi/FileThread.h:
+        * fileapi/FileWriter.cpp:
+        * fileapi/FileWriter.h:
+        * fileapi/FileWriter.idl:
+        * fileapi/FileWriterCallback.h:
+        * fileapi/FileWriterCallback.idl:
+        * fileapi/FileWriterClient.h:
+        * page/DOMWindow.idl:
+        * platform/AsyncFileStream.h:
+        * platform/FileStream.cpp:
+        * platform/FileStream.h:
+        * platform/FileStreamClient.h:
+
 2010-09-16  Marc-Antoine Ruel  <maruel@chromium.org>
 
         Reviewed by Dimitri Glazkov.
index 8f8c213..81d912f 100644 (file)
@@ -69,7 +69,6 @@ ENABLE_EVENTSOURCE = ENABLE_EVENTSOURCE;
 ENABLE_FILTERS = $(ENABLE_FILTERS_$(REAL_PLATFORM_NAME));
 ENABLE_FILTERS_macosx = ENABLE_FILTERS;
 
-ENABLE_FILE_WRITER = ;
 ENABLE_FILE_SYSTEM = ;
 ENABLE_FULLSCREEN_API = ENABLE_FULLSCREEN_API;
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
@@ -121,4 +120,4 @@ ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_WRITER) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PROGRESS_TAG) $(ENABLE_RUBY) $(ENABLE_SANDBOX) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PROGRESS_TAG) $(ENABLE_RUBY) $(ENABLE_SANDBOX) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
index 6230126..9b78e29 100644 (file)
@@ -3740,6 +3740,10 @@ webcore_built_sources += \
        DerivedSources/WebCore/JSFileEntry.h \
        DerivedSources/WebCore/JSFileSystemCallback.cpp \
        DerivedSources/WebCore/JSFileSystemCallback.h \
+       DerivedSources/WebCore/JSFileWriter.cpp \
+       DerivedSources/WebCore/JSFileWriter.h \
+       DerivedSources/WebCore/JSFileWriterCallback.cpp \
+       DerivedSources/WebCore/JSFileWriterCallback.h \
        DerivedSources/WebCore/JSFlags.cpp \
        DerivedSources/WebCore/JSFlags.h \
        DerivedSources/WebCore/JSMetadata.cpp \
@@ -4312,19 +4316,6 @@ FEATURE_DEFINES += ENABLE_BLOB=1
 webcore_cppflags += -DENABLE_BLOB=1
 endif  # END ENABLE_BLOB
 
-# ---
-# FileWriter support
-# ---
-if ENABLE_FILE_WRITER
-FEATURE_DEFINES += ENABLE_FILE_WRITER=1
-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
-endif  # END ENABLE_FILE_WRITER
-
 DerivedSources/WebCore/CSSPropertyNames.h: $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/makeprop.pl
        if sort $(WEBCORE_CSS_PROPERTY_NAMES) | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
        cat $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in
index c384f33..54ee536 100644 (file)
@@ -2918,6 +2918,7 @@ contains(DEFINES, ENABLE_DOM_STORAGE=1) {
 
 contains(DEFINES, ENABLE_FILE_SYSTEM=1) {
     HEADERS += \
+        fileapi/AsyncFileWriter.h \
         fileapi/DirectoryEntry.h \
         fileapi/DirectoryReader.h \
         fileapi/DOMFilePath.h \
@@ -2931,6 +2932,9 @@ contains(DEFINES, ENABLE_FILE_SYSTEM=1) {
         fileapi/FileEntry.h \
         fileapi/FileSystemCallback.h \
         fileapi/FileSystemCallbacks.h \
+        fileapi/FileWriter.h \
+        fileapi/FileWriterCallback.h \
+        fileapi/FileWriterClient.h \
         fileapi/Flags.h \
         fileapi/LocalFileSystem.h \
         fileapi/Metadata.h \
@@ -2949,21 +2953,11 @@ contains(DEFINES, ENABLE_FILE_SYSTEM=1) {
         fileapi/EntryArray.cpp \
         fileapi/FileEntry.cpp \
         fileapi/FileSystemCallbacks.cpp \
+        fileapi/FileWriter.cpp \
         fileapi/LocalFileSystem.cpp \
         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 \
index effd2a2..d2b6f49 100644 (file)
@@ -162,7 +162,7 @@ FileReader* EventTarget::toFileReader()
     return 0;
 }
 #endif
-#if ENABLE(FILE_WRITER)
+#if ENABLE(FILE_SYSTEM)
 FileWriter* EventTarget::toFileWriter()
 {
     return 0;
index b2985f7..de7c2e0 100644 (file)
@@ -124,7 +124,7 @@ namespace WebCore {
 #if ENABLE(BLOB)
         virtual FileReader* toFileReader();
 #endif
-#if ENABLE(FILE_WRITER)
+#if ENABLE(FILE_SYSTEM)
         virtual FileWriter* toFileWriter();
 #endif
 
index ed15a2e..cbbf650 100644 (file)
@@ -61,7 +61,7 @@ namespace WebCore {
 
         // Introduced in File API:
         // http://www.w3.org/TR/file-upload/#dfn-fileerror
-#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
         NOT_READABLE_ERR = 24,
         ENCODING_ERR = 26,
 #endif
index f7b4420..672a1f5 100644 (file)
@@ -87,7 +87,7 @@ ScriptExecutionContext::~ScriptExecutionContext()
         m_databaseThread = 0;
     }
 #endif
-#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
     if (m_fileThread) {
         m_fileThread->stop();
         m_fileThread = 0;
@@ -277,7 +277,7 @@ void ScriptExecutionContext::revokePublicBlobURL(const KURL& url)
 }
 #endif
 
-#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
 FileThread* ScriptExecutionContext::fileThread()
 {
     if (!m_fileThread) {
index 5f6f029..d39cb64 100644 (file)
@@ -52,7 +52,7 @@ namespace WebCore {
     class DatabaseThread;
 #endif
     class DOMTimer;
-#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
     class FileThread;
 #endif
     class MessagePort;
@@ -140,7 +140,7 @@ namespace WebCore {
         JSC::JSGlobalData* globalData();
 #endif
 
-#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
         FileThread* fileThread();
         void stopFileThread();
 #endif
@@ -177,7 +177,7 @@ namespace WebCore {
         bool m_hasOpenDatabases; // This never changes back to false, even after the database thread is closed.
 #endif
 
-#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
         RefPtr<FileThread> m_fileThread;
 #endif
     };
index cdb815c..ff6c1fa 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef AsyncFileWriter_h
 #define AsyncFileWriter_h
 
-#if ENABLE(FILE_WRITER)
+#if ENABLE(FILE_SYSTEM)
 
 #include "PlatformString.h"
 #include <wtf/RefCounted.h>
@@ -54,7 +54,7 @@ public:
 
 } // namespace
 
-#endif // ENABLE(FILE_WRITER)
+#endif // ENABLE(FILE_SYSTEM)
 
 #endif // AsyncFileWriter_h
 
index e7d342e..2d1e623 100644 (file)
@@ -44,12 +44,10 @@ FileEntry::FileEntry(DOMFileSystem* fileSystem, const String& fullPath)
 {
 }
 
-#if ENABLE(FILE_WRITER)
 void FileEntry::createWriter(PassRefPtr<FileWriterCallback>, PassRefPtr<ErrorCallback>)
 {
     // FIXME: to be implemented.
 }
-#endif
 
 void FileEntry::file(PassRefPtr<FileCallback>, PassRefPtr<ErrorCallback>)
 {
index 65011bb..2c85d73 100644 (file)
@@ -48,9 +48,7 @@ public:
         return adoptRef(new FileEntry(fileSystem, fullPath));
     }
 
-#if ENABLE(FILE_WRITER)
     void createWriter(PassRefPtr<FileWriterCallback>, PassRefPtr<ErrorCallback> = 0);
-#endif
     void file(PassRefPtr<FileCallback>, PassRefPtr<ErrorCallback> = 0);
 
     virtual bool isFile() const { return true; }
index 41b9a91..eb913b8 100644 (file)
@@ -34,9 +34,7 @@ module storage {
         GenerateNativeConverter,
         GenerateToJS
     ] FileEntry : Entry {
-#if defined(ENABLE_FILE_WRITER) && ENABLE_FILE_WRITER
         void createWriter(in [Callback] FileWriterCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-#endif
         void file(in [Callback] FileCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
     };
 }
index 1c74c07..3528109 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef FileError_h
 #define FileError_h
 
-#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
 
 #include "ExceptionCode.h"
 #include <wtf/PassRefPtr.h>
@@ -55,6 +55,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
 
 #endif // FileError_h
index a5e2bac..c5dedbe 100644 (file)
@@ -30,7 +30,7 @@
 
 module html {
     interface [
-        Conditional=BLOB|FILE_WRITER,
+        Conditional=BLOB|FILE_SYSTEM,
         DontCheckEnums,
         NoStaticTables
     ] FileError {
index 4419eb7..e90ab90 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef FileException_h
 #define FileException_h
 
-#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
 
 #include "ExceptionBase.h"
 
@@ -60,7 +60,7 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
 
 #endif // FileException_h
 
index cd53a7e..0b2ab9c 100644 (file)
@@ -30,7 +30,7 @@
 
 module html {
     interface [
-        Conditional=BLOB|FILE_WRITER,
+        Conditional=BLOB|FILE_SYSTEM,
         DontCheckEnums,
         NoStaticTables
     ] FileException {
index 30813d3..5daf983 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
 
 #include "FileStreamProxy.h"
 
@@ -216,4 +216,4 @@ void FileStreamProxy::truncateOnFileThread(long long position)
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
index 35a3af8..ce9a105 100644 (file)
@@ -32,7 +32,7 @@
 #ifndef FileStreamProxy_h
 #define FileStreamProxy_h
 
-#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
 
 #include "AsyncFileStream.h"
 #include <wtf/Forward.h>
@@ -87,6 +87,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
 
 #endif // FileStreamProxy_h
index 4e48cfb..4d55630 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
 
 #include "FileThread.h"
 
@@ -116,4 +116,4 @@ void* FileThread::runLoop()
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
index 16acacc..d7aabf7 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef FileThread_h
 #define FileThread_h
 
-#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
 
 #include <wtf/MessageQueue.h>
 #include <wtf/PassOwnPtr.h>
@@ -83,6 +83,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
 
 #endif // FileThread_h
index 7ead354..a9f9afd 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(FILE_WRITER)
+#if ENABLE(FILE_SYSTEM)
 
 #include "FileWriter.h"
 
@@ -196,4 +196,4 @@ void FileWriter::fireEvent(const AtomicString& type)
 
 } // namespace WebCore
  
-#endif // ENABLE(FILE_WRITER)
+#endif // ENABLE(FILE_SYSTEM)
index b0af7ea..d9ac7e6 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef FileWriter_h
 #define FileWriter_h
 
-#if ENABLE(FILE_WRITER)
+#if ENABLE(FILE_SYSTEM)
 
 #include "ActiveDOMObject.h"
 #include "EventTarget.h"
@@ -125,6 +125,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(FILE_WRITER)
+#endif // ENABLE(FILE_SYSTEM)
 
 #endif // FileWriter_h
index bb95ee1..4d46e9e 100644 (file)
@@ -30,7 +30,7 @@
 
 module html {
     interface [
-        Conditional=FILE_WRITER,
+        Conditional=FILE_SYSTEM,
         CallWith=ScriptExecutionContext,
         EventTarget,
         NoStaticTables
index f5f4d37..3f9e746 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef FileWriterCallback_h
 #define FileWriterCallback_h
 
-#if ENABLE(FILE_SYSTEM) && ENABLE(FILE_WRITER)
+#if ENABLE(FILE_SYSTEM)
 
 #include <wtf/RefCounted.h>
 
@@ -47,6 +47,6 @@ public:
 
 } // namespace
 
-#endif // ENABLE(FILE_SYSTEM) && ENABLE(FILE_WRITER)
+#endif // ENABLE(FILE_SYSTEM)
 
 #endif // FileWriterCallback_h
index ba77891..df82fed 100644 (file)
@@ -30,7 +30,7 @@
 
 module fileapi {
     interface [
-        Conditional=FILE_SYSTEM&FILE_WRITER,
+        Conditional=FILE_SYSTEM,
         Callback
     ] FileWriterCallback {
         boolean handleEvent(in FileWriter fileWriter);
index 091b1c1..1bebbd6 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef FileWriterClient_h
 #define FileWriterClient_h
 
-#if ENABLE(FILE_WRITER)
+#if ENABLE(FILE_SYSTEM)
 
 #include "ExceptionCode.h"
 
@@ -48,6 +48,6 @@ public:
 
 } // namespace
 
-#endif // ENABLE(FILE_WRITER)
+#endif // ENABLE(FILE_SYSTEM)
 
 #endif // FileWriterClient_h
index 7e48f8c..b4c6589 100644 (file)
@@ -756,7 +756,7 @@ module window {
 
         attribute DOMFormDataConstructor FormData;
 
-        attribute [Conditional=BLOB|FILE_WRITER] FileErrorConstructor FileError;
+        attribute [Conditional=BLOB|FILE_SYSTEM] FileErrorConstructor FileError;
         attribute [Conditional=BLOB] FileReaderConstructor FileReader;
 
         attribute [Conditional=BLOB] BlobBuilderConstructor BlobBuilder;
index 3abda01..a555a24 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef AsyncFileStream_h
 #define AsyncFileStream_h
 
-#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
 
 #include "FileStreamClient.h"
 #include <wtf/Forward.h>
@@ -69,6 +69,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
 
 #endif // AsyncFileStream_h
index 45f435e..5c77e08 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
 
 #include "FileStream.h"
 
@@ -147,4 +147,4 @@ bool FileStream::truncate(long long)
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
index 6c3a221..c369eb0 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef FileStream_h
 #define FileStream_h
 
-#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
 
 #include "FileSystem.h"
 #include <wtf/Forward.h>
@@ -95,6 +95,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
 
 #endif // FileStream_h
index b3d1fff..4066d9f 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef FileStreamClient_h
 #define FileStreamClient_h
 
-#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
 
 namespace WebCore {
 
@@ -58,6 +58,6 @@ protected:
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
+#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
 
 #endif // FileStreamClient_h
index 9a5de90..aa137ea 100644 (file)
@@ -1,3 +1,13 @@
+2010-09-16  Eric Uhrhane  <ericu@chromium.org>
+
+        Reviewed by Jian Li.
+
+        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
+        https://bugs.webkit.org/show_bug.cgi?id=45798
+
+        * src/AsyncFileWriterChromium.h:
+        * src/AsyncFileWriterChromium.cpp:
+
 2010-09-16  Nat Duca  <nduca@chromium.org>
 
         Reviewed by Darin Fisher.
index 157f63c..4bfc988 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "AsyncFileWriterChromium.h"
 
-#if ENABLE(FILE_WRITER)
+#if ENABLE(FILE_SYSTEM)
 
 #include "Blob.h"
 #include "FileWriterClient.h"
@@ -89,4 +89,4 @@ void AsyncFileWriterChromium::didFail(WebFileError error)
 
 } // namespace
 
-#endif // ENABLE(FILE_WRITER)
+#endif // ENABLE(FILE_SYSTEM)
index d1d5c7d..fb78f28 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef AsyncFileWriterChromium_h
 #define AsyncFileWriterChromium_h
 
-#if ENABLE(FILE_WRITER)
+#if ENABLE(FILE_SYSTEM)
 
 #include "AsyncFileWriter.h"
 #include "WebFileError.h"
@@ -70,6 +70,6 @@ private:
 
 } // namespace
 
-#endif // ENABLE(FILE_WRITER)
+#endif // ENABLE(FILE_SYSTEM)
 
 #endif // AsyncFileWriterChromium_h
index 5403f24..3cf4991 100644 (file)
@@ -1,3 +1,12 @@
+2010-09-16  Eric Uhrhane  <ericu@chromium.org>
+
+        Reviewed by Jian Li.
+
+        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
+        https://bugs.webkit.org/show_bug.cgi?id=45798
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2010-09-15  Simon Fraser  <simon.fraser@apple.com>
 
         Reviewed by Adam Roben.
index 8f8c213..81d912f 100644 (file)
@@ -69,7 +69,6 @@ ENABLE_EVENTSOURCE = ENABLE_EVENTSOURCE;
 ENABLE_FILTERS = $(ENABLE_FILTERS_$(REAL_PLATFORM_NAME));
 ENABLE_FILTERS_macosx = ENABLE_FILTERS;
 
-ENABLE_FILE_WRITER = ;
 ENABLE_FILE_SYSTEM = ;
 ENABLE_FULLSCREEN_API = ENABLE_FULLSCREEN_API;
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
@@ -121,4 +120,4 @@ ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_WRITER) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PROGRESS_TAG) $(ENABLE_RUBY) $(ENABLE_SANDBOX) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PROGRESS_TAG) $(ENABLE_RUBY) $(ENABLE_SANDBOX) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
index 6525ac8..aef4143 100644 (file)
@@ -1,3 +1,12 @@
+2010-09-16  Eric Uhrhane  <ericu@chromium.org>
+
+        Reviewed by Jian Li.
+
+        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
+        https://bugs.webkit.org/show_bug.cgi?id=45798
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2010-09-15  Jessie Berlin  <jberlin@apple.com>
 
         Reviewed by Sam Weinig.
index 3017ce5..2ed3a8e 100644 (file)
@@ -69,7 +69,7 @@ ENABLE_EVENTSOURCE = ENABLE_EVENTSOURCE;
 ENABLE_FILTERS = $(ENABLE_FILTERS_$(REAL_PLATFORM_NAME));
 ENABLE_FILTERS_macosx = ENABLE_FILTERS;
 
-ENABLE_FILE_WRITER = ;
+ENABLE_FILE_SYSTEM = ;
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 
 ENABLE_ICONDATABASE = $(ENABLE_ICONDATABASE_$(REAL_PLATFORM_NAME));
@@ -119,4 +119,4 @@ ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_WRITER) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PROGRESS_TAG) $(ENABLE_RUBY) $(ENABLE_SANDBOX) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_LINK_PREFETCH) $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_SYSTEM) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_IMAGE_RESIZER) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_MATHML) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PROGRESS_TAG) $(ENABLE_RUBY) $(ENABLE_SANDBOX) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_VIDEO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
index 5a0cf49..c81dd69 100644 (file)
@@ -1,3 +1,13 @@
+2010-09-16  Eric Uhrhane  <ericu@chromium.org>
+
+        Reviewed by Jian Li.
+
+        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
+        https://bugs.webkit.org/show_bug.cgi?id=45798
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
 2010-09-09  Jer Noble  <jer.noble@apple.com>
 
         Reviewed by Eric Carlson.
index 73622e1..17b5da4 100644 (file)
@@ -9,7 +9,7 @@
        >
   <Tool
                Name="VCCLCompilerTool"
-               PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_WRITER);$(ENABLE_FILE_SYSTEM);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_IMAGE_RESIZER);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_MATHML);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_RUBY);$(ENABLE_SANDBOX);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
+               PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_IMAGE_RESIZER);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_MATHML);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_RUBY);$(ENABLE_SANDBOX);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
        />
   <UserMacro
                Name="ENABLE_3D_CANVAS"
                PerformEnvironmentSet="true"
        />
   <UserMacro
-               Name="ENABLE_FILE_WRITER"
-               Value=""
-               PerformEnvironmentSet="true"
-       />
-  <UserMacro
                Name="ENABLE_FILE_SYSTEM"
                Value=""
                PerformEnvironmentSet="true"
index f3c5b94..1aa406a 100644 (file)
@@ -9,7 +9,7 @@
        >
   <Tool
                Name="VCCLCompilerTool"
-               PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_WRITER);$(ENABLE_FILE_SYSTEM);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_IMAGE_RESIZER);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_MATHML);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
+               PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_IMAGE_RESIZER);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_MATHML);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
        />
   <UserMacro
                Name="ENABLE_3D_CANVAS"
                PerformEnvironmentSet="true"
        />
   <UserMacro
-               Name="ENABLE_FILE_WRITER"
-               Value=""
-               PerformEnvironmentSet="true"
-       />
-  <UserMacro
                Name="ENABLE_FILE_SYSTEM"
                Value=""
                PerformEnvironmentSet="true"
index 8c13923..39d916d 100644 (file)
@@ -1,3 +1,12 @@
+2010-09-16  Eric Uhrhane  <ericu@chromium.org>
+
+        Reviewed by Jian Li.
+
+        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
+        https://bugs.webkit.org/show_bug.cgi?id=45798
+
+        * Scripts/build-webkit:
+
 2010-09-16  Robert Hogan  <robert@webkit.org>
 
         Reviewed by Antonio Gomes.
index c783203..cd43499 100755 (executable)
@@ -198,9 +198,6 @@ my @features = (
     { option => "xslt", desc => "Toggle XSLT support",
       define => "ENABLE_XSLT", default => 1, value => \$xsltSupport },
 
-    { option => "file-writer", desc => "Toggle FileWriter support",
-      define => "ENABLE_FILE_WRITER", default => 0, value => \$fileWriterSupport },
-
     { option => "file-system", desc => "Toggle FileSystem support",
       define => "ENABLE_FILE_SYSTEM", default => 0, value => \$fileSystemSupport },
 
index 1b30cea..d418f71 100644 (file)
@@ -656,14 +656,6 @@ AC_ARG_ENABLE(fast_mobile_scrolling,
               [],[enable_fast_mobile_scrolling="no"])
 AC_MSG_RESULT([$enable_fast_mobile_scrolling])
 
-# check whether to enable FileWriter support
-AC_MSG_CHECKING([whether to enable FileWriter support])
-AC_ARG_ENABLE(file_writer,
-              AC_HELP_STRING([--enable-file-writer],
-                             [enable support for FileWriter [default=no]]),
-              [],[enable_file_writer="no"])
-AC_MSG_RESULT([$enable_file_writer])
-
 # check whether to enable code coverage
 AC_MSG_CHECKING([whether to enable code coverage support])
 AC_ARG_ENABLE(coverage,
@@ -910,7 +902,6 @@ AM_CONDITIONAL([ENABLE_XHTMLMP],[test "$enable_xhtmlmp" = "yes"])
 AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"])
 AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"])
 AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"])
-AM_CONDITIONAL([ENABLE_FILE_WRITER],[test "$enable_file_writer" = "yes"])
 AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"])
 AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"])
 AM_CONDITIONAL([ENABLE_RUBY],[test "$enable_ruby" = "yes"])
@@ -973,7 +964,6 @@ Features:
  Fast Mobile Scrolling                                    : $enable_fast_mobile_scrolling
  JIT compilation                                          : $enable_jit
  Filters support                                          : $enable_filters
- FileWriter support                                       : $enable_file_writer
  Geolocation support                                      : $enable_geolocation
  JavaScript debugger/profiler support                     : $enable_javascript_debugger
  MathML support                                           : $enable_mathml