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-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: http://svn.webkit.org/repository/webkit/trunk@67614 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 39593ea9168fc5450dfb045e24879b0375884faa..78fa09db75f142d960391c94ac7a06734305561e 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.

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index cabc758f2f1a014b394edc7813722a62aec4f187..2ccdc96fc494f63966fd609ef9a217356076e4fb 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/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
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2010-09-15  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Geoffrey Garen.

diff --git a/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/JavaScriptCore/Configurations/FeatureDefines.xcconfig
index f2b4c09e4da1ea177a84858cd5d701f6072b7ce7..2ed3a8e7d0a3ce0d490720f428b5ba32603cb830 100644 (file)
--- a/JavaScriptCore/Configurations/FeatureDefines.xcconfig
+++ b/JavaScriptCore/Configurations/FeatureDefines.xcconfig
@@ -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);

diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 0de8e375bee46a35aa51cdff96e1036ef91d5f16..bc93badc3d1431d4f55332a83f6d45331e098956 100644 (file)
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b033ba2dcfff5af82b4e06e5be2249a559a0055b..d34cbac1c93e6ee8111eebb8fd7ef80043dd21c4 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -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.

diff --git a/WebCore/Configurations/FeatureDefines.xcconfig b/WebCore/Configurations/FeatureDefines.xcconfig
index 8f8c21394b35671504df8350601c7e4d93cba36d..81d912f80c958bfada2de753afa5b151d51afcb8 100644 (file)
--- a/WebCore/Configurations/FeatureDefines.xcconfig
+++ b/WebCore/Configurations/FeatureDefines.xcconfig
@@ -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);

diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 6230126015427df68c3f5fa24d4f76ae806447bb..9b78e296c7901eb353c2186ac0bf0474b08bbc0f 100644 (file)
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -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

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index c384f33802df6b023c5c42ab0e8c32e4ba224875..54ee5361a13306e3b36181b228774a19d6fc666f 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -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 \

diff --git a/WebCore/dom/EventTarget.cpp b/WebCore/dom/EventTarget.cpp
index effd2a21ac27b9d0b51d16e34e924c6d088c4fb3..d2b6f497177d619864c59581fdd04b1c47d7dc8a 100644 (file)
--- a/WebCore/dom/EventTarget.cpp
+++ b/WebCore/dom/EventTarget.cpp
@@ -162,7 +162,7 @@ FileReader* EventTarget::toFileReader()
     return 0;
 }
 #endif
-#if ENABLE(FILE_WRITER)
+#if ENABLE(FILE_SYSTEM)
 FileWriter* EventTarget::toFileWriter()
 {
     return 0;

diff --git a/WebCore/dom/EventTarget.h b/WebCore/dom/EventTarget.h
index b2985f7a099e0837e4cf5623fee9bf83a665b986..de7c2e0a25a380dc589b56c4b66fd0d0af48539b 100644 (file)
--- a/WebCore/dom/EventTarget.h
+++ b/WebCore/dom/EventTarget.h
@@ -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
 

diff --git a/WebCore/dom/ExceptionCode.h b/WebCore/dom/ExceptionCode.h
index ed15a2efd6e430daa05517d59a2c5d33acf04810..cbbf650fe2197fc23fa4feca08259e02e859a2e2 100644 (file)
--- a/WebCore/dom/ExceptionCode.h
+++ b/WebCore/dom/ExceptionCode.h
@@ -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

diff --git a/WebCore/dom/ScriptExecutionContext.cpp b/WebCore/dom/ScriptExecutionContext.cpp
index f7b44208e537f703ff291bd29f376e8a8383012e..672a1f574fae4a42830e0149dfa45078aa9ea35d 100644 (file)
--- a/WebCore/dom/ScriptExecutionContext.cpp
+++ b/WebCore/dom/ScriptExecutionContext.cpp
@@ -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) {

diff --git a/WebCore/dom/ScriptExecutionContext.h b/WebCore/dom/ScriptExecutionContext.h
index 5f6f029541f939e6dbd995319000c434dcda3807..d39cb64b973e92552ab3067373043219fc2ce4c9 100644 (file)
--- a/WebCore/dom/ScriptExecutionContext.h
+++ b/WebCore/dom/ScriptExecutionContext.h
@@ -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
     };

diff --git a/WebCore/fileapi/AsyncFileWriter.h b/WebCore/fileapi/AsyncFileWriter.h
index cdb815c64aa1876b9bdc445c1b1e2f07c74801a4..ff6c1fad2a5c969389645b057fa9341d54d1884b 100644 (file)
--- a/WebCore/fileapi/AsyncFileWriter.h
+++ b/WebCore/fileapi/AsyncFileWriter.h
@@ -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
 

diff --git a/WebCore/fileapi/FileEntry.cpp b/WebCore/fileapi/FileEntry.cpp
index e7d342eddfa886e5b028987eb2f1a71215db1735..2d1e623d3ede90ff87e80e06b19d1222cf8f8ca1 100644 (file)
--- a/WebCore/fileapi/FileEntry.cpp
+++ b/WebCore/fileapi/FileEntry.cpp
@@ -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>)
 {

diff --git a/WebCore/fileapi/FileEntry.h b/WebCore/fileapi/FileEntry.h
index 65011bb412af939a1e7fdb3f8e4eb74fd92f12e6..2c85d739b7cd5198c89df0f4e427fe5d25c53aaa 100644 (file)
--- a/WebCore/fileapi/FileEntry.h
+++ b/WebCore/fileapi/FileEntry.h
@@ -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; }

diff --git a/WebCore/fileapi/FileEntry.idl b/WebCore/fileapi/FileEntry.idl
index 41b9a918afdefb1dc1953c93ccc17e970348c304..eb913b8db1f8ad26fed80c421b54f1ca649e2e9a 100644 (file)
--- a/WebCore/fileapi/FileEntry.idl
+++ b/WebCore/fileapi/FileEntry.idl
@@ -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);
     };
 }

diff --git a/WebCore/fileapi/FileError.h b/WebCore/fileapi/FileError.h
index 1c74c07726784650939a3104c35cc04330b16151..352810918e505b79fe9166f1243f6d1bd02fcdf4 100644 (file)
--- a/WebCore/fileapi/FileError.h
+++ b/WebCore/fileapi/FileError.h
@@ -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

diff --git a/WebCore/fileapi/FileError.idl b/WebCore/fileapi/FileError.idl
index a5e2bac8972cbd0aa363d5ecc5174ea8d31cbc8f..c5dedbed61f1553686213a301ea5d907c272c87e 100644 (file)
--- a/WebCore/fileapi/FileError.idl
+++ b/WebCore/fileapi/FileError.idl
@@ -30,7 +30,7 @@
 
 module html {
     interface [
-        Conditional=BLOB|FILE_WRITER,
+        Conditional=BLOB|FILE_SYSTEM,
         DontCheckEnums,
         NoStaticTables
     ] FileError {

diff --git a/WebCore/fileapi/FileException.h b/WebCore/fileapi/FileException.h
index 4419eb7fa232dcc909a7e588ced22d86aca512c0..e90ab902286ed06d45595fbeac3ea60c4e858fad 100644 (file)
--- a/WebCore/fileapi/FileException.h
+++ b/WebCore/fileapi/FileException.h
@@ -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
 

diff --git a/WebCore/fileapi/FileException.idl b/WebCore/fileapi/FileException.idl
index cd53a7e21641ab6bbe958bf8a7de33ebe704ef4e..0b2ab9cc37fea86956b532bf093239ef9100ca40 100644 (file)
--- a/WebCore/fileapi/FileException.idl
+++ b/WebCore/fileapi/FileException.idl
@@ -30,7 +30,7 @@
 
 module html {
     interface [
-        Conditional=BLOB|FILE_WRITER,
+        Conditional=BLOB|FILE_SYSTEM,
         DontCheckEnums,
         NoStaticTables
     ] FileException {

diff --git a/WebCore/fileapi/FileStreamProxy.cpp b/WebCore/fileapi/FileStreamProxy.cpp
index 30813d3581571959811655da7453ee36b2f1f229..5daf9834bb235042ea6edd51eebc816c84032c1e 100644 (file)
--- a/WebCore/fileapi/FileStreamProxy.cpp
+++ b/WebCore/fileapi/FileStreamProxy.cpp
@@ -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)

diff --git a/WebCore/fileapi/FileStreamProxy.h b/WebCore/fileapi/FileStreamProxy.h
index 35a3af8edafafe988c171f6e1ce01ac0fd7f5f62..ce9a1054c8386b5488c36ff3fabdf4ff5058697c 100644 (file)
--- a/WebCore/fileapi/FileStreamProxy.h
+++ b/WebCore/fileapi/FileStreamProxy.h
@@ -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

diff --git a/WebCore/fileapi/FileThread.cpp b/WebCore/fileapi/FileThread.cpp
index 4e48cfb282db5188f9ef40db4968404a99a68578..4d55630e4c786e41fa8d1503d28d05e8692cabbc 100644 (file)
--- a/WebCore/fileapi/FileThread.cpp
+++ b/WebCore/fileapi/FileThread.cpp
@@ -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)

diff --git a/WebCore/fileapi/FileThread.h b/WebCore/fileapi/FileThread.h
index 16acacc4f2d518a277297971f0a2eeaa45b9c3d8..d7aabf7eb9222e96bd6c4742a4861b8941747b91 100644 (file)
--- a/WebCore/fileapi/FileThread.h
+++ b/WebCore/fileapi/FileThread.h
@@ -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

diff --git a/WebCore/fileapi/FileWriter.cpp b/WebCore/fileapi/FileWriter.cpp
index 7ead354823e95075b374fe2f3b40388fe060e8b0..a9f9afdf83bd319f0f1f0935cb9f203cacf1afea 100644 (file)
--- a/WebCore/fileapi/FileWriter.cpp
+++ b/WebCore/fileapi/FileWriter.cpp
@@ -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)

diff --git a/WebCore/fileapi/FileWriter.h b/WebCore/fileapi/FileWriter.h
index b0af7ea75fd2501bf8b2c3bfd5e00b15509fcbe0..d9ac7e6f2a85c5fb93beeabaf025458242cf7a3c 100644 (file)
--- a/WebCore/fileapi/FileWriter.h
+++ b/WebCore/fileapi/FileWriter.h
@@ -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

diff --git a/WebCore/fileapi/FileWriter.idl b/WebCore/fileapi/FileWriter.idl
index bb95ee1541ddcd5da460328688c8b2064a834b2f..4d46e9e111086902bf20a4d4ac2a0ae83f3bdc26 100644 (file)
--- a/WebCore/fileapi/FileWriter.idl
+++ b/WebCore/fileapi/FileWriter.idl
@@ -30,7 +30,7 @@
 
 module html {
     interface [
-        Conditional=FILE_WRITER,
+        Conditional=FILE_SYSTEM,
         CallWith=ScriptExecutionContext,
         EventTarget,
         NoStaticTables

diff --git a/WebCore/fileapi/FileWriterCallback.h b/WebCore/fileapi/FileWriterCallback.h
index f5f4d37d9880cac4d72bb69cd601dc6e1f71a206..3f9e746fa6e0098b5f8bfb16f4da0d7071e7f3f7 100644 (file)
--- a/WebCore/fileapi/FileWriterCallback.h
+++ b/WebCore/fileapi/FileWriterCallback.h
@@ -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

diff --git a/WebCore/fileapi/FileWriterCallback.idl b/WebCore/fileapi/FileWriterCallback.idl
index ba77891fde3b778b2412cc1f26e5117e655cbac8..df82fed8d84bec1542fa77f6180cd1b48d9d861d 100644 (file)
--- a/WebCore/fileapi/FileWriterCallback.idl
+++ b/WebCore/fileapi/FileWriterCallback.idl
@@ -30,7 +30,7 @@
 
 module fileapi {
     interface [
-        Conditional=FILE_SYSTEM&FILE_WRITER,
+        Conditional=FILE_SYSTEM,
         Callback
     ] FileWriterCallback {
         boolean handleEvent(in FileWriter fileWriter);

diff --git a/WebCore/fileapi/FileWriterClient.h b/WebCore/fileapi/FileWriterClient.h
index 091b1c133a76a7d793fc57f3451c512049220e4d..1bebbd68d3f0aed3988a473559b0054f71616f50 100644 (file)
--- a/WebCore/fileapi/FileWriterClient.h
+++ b/WebCore/fileapi/FileWriterClient.h
@@ -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

diff --git a/WebCore/page/DOMWindow.idl b/WebCore/page/DOMWindow.idl
index 7e48f8c53112b6e0317e1125af51b0f935334f13..b4c6589f6546e6ee166801a2b97199262da7c5ea 100644 (file)
--- a/WebCore/page/DOMWindow.idl
+++ b/WebCore/page/DOMWindow.idl
@@ -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;

diff --git a/WebCore/platform/AsyncFileStream.h b/WebCore/platform/AsyncFileStream.h
index 3abda018df7f9f94188ca8faa79c7e5f4dc732bd..a555a24674925d95511176032a21517cf119dfc4 100644 (file)
--- a/WebCore/platform/AsyncFileStream.h
+++ b/WebCore/platform/AsyncFileStream.h
@@ -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

diff --git a/WebCore/platform/FileStream.cpp b/WebCore/platform/FileStream.cpp
index 45f435ec227b0218e7fa8843a3ed0968c4e3e89b..5c77e082b33a488182e321baf3e4b16c2f807a26 100644 (file)
--- a/WebCore/platform/FileStream.cpp
+++ b/WebCore/platform/FileStream.cpp
@@ -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)

diff --git a/WebCore/platform/FileStream.h b/WebCore/platform/FileStream.h
index 6c3a221e35b1e796299b50de3de5d8eb7d9438e7..c369eb094015acda18b0dec161edf4bbee6d3465 100644 (file)
--- a/WebCore/platform/FileStream.h
+++ b/WebCore/platform/FileStream.h
@@ -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

diff --git a/WebCore/platform/FileStreamClient.h b/WebCore/platform/FileStreamClient.h
index b3d1fff586c43bd1667f7282aede2f476534cfb2..4066d9f650bf3eb0d390b648c98c48885dac7dcf 100644 (file)
--- a/WebCore/platform/FileStreamClient.h
+++ b/WebCore/platform/FileStreamClient.h
@@ -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

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 9a5de902500c6e079155b28a70a911aaf2b541ef..aa137eaba7207a815c6a5d30529b3dd11060a61c 100644 (file)
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -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.

diff --git a/WebKit/chromium/src/AsyncFileWriterChromium.cpp b/WebKit/chromium/src/AsyncFileWriterChromium.cpp
index 157f63cd51d14e4ca3fdab530fc98bb78f579a46..4bfc9885ecc9352f16c010e75a999e4d218129ef 100644 (file)
--- a/WebKit/chromium/src/AsyncFileWriterChromium.cpp
+++ b/WebKit/chromium/src/AsyncFileWriterChromium.cpp
@@ -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)

diff --git a/WebKit/chromium/src/AsyncFileWriterChromium.h b/WebKit/chromium/src/AsyncFileWriterChromium.h
index d1d5c7d982bc6f9b6ea3d16a3458ca6cc2b65e32..fb78f28a62a8b8a705377a1988602f75de09aab2 100644 (file)
--- a/WebKit/chromium/src/AsyncFileWriterChromium.h
+++ b/WebKit/chromium/src/AsyncFileWriterChromium.h
@@ -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

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 5403f24a2d9ed42e8dbb48a839bc923dbe71ea89..3cf4991b5f209dbec7a16edc1af66dee20dbb298 100644 (file)
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/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
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2010-09-15  Simon Fraser  <simon.fraser@apple.com>
 
         Reviewed by Adam Roben.

diff --git a/WebKit/mac/Configurations/FeatureDefines.xcconfig b/WebKit/mac/Configurations/FeatureDefines.xcconfig
index 8f8c21394b35671504df8350601c7e4d93cba36d..81d912f80c958bfada2de753afa5b151d51afcb8 100644 (file)
--- a/WebKit/mac/Configurations/FeatureDefines.xcconfig
+++ b/WebKit/mac/Configurations/FeatureDefines.xcconfig
@@ -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);

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 6525ac8e9965302f7535fef71b4179ffc9e328fe..aef41435669e055ac87e96b284d152a853e9c7d4 100644 (file)
--- a/WebKit2/ChangeLog
+++ b/WebKit2/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
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2010-09-15  Jessie Berlin  <jberlin@apple.com>
 
         Reviewed by Sam Weinig.

diff --git a/WebKit2/Configurations/FeatureDefines.xcconfig b/WebKit2/Configurations/FeatureDefines.xcconfig
index 3017ce5c4d31d242f05ad0e269d3dea434fc43b5..2ed3a8e7d0a3ce0d490720f428b5ba32603cb830 100644 (file)
--- a/WebKit2/Configurations/FeatureDefines.xcconfig
+++ b/WebKit2/Configurations/FeatureDefines.xcconfig
@@ -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);

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 5a0cf49861e0e6acbaaff2ec103a277d10df8912..c81dd69cd0e4d85b9b33e64551f6f9271e391b8c 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -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.

diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
index 73622e154d152ba518d706d192119905fa6a7af8..17b5da404c887fbe7047751c059b523f195f525e 100644 (file)
--- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
@@ -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"
@@ -76,11 +76,6 @@
                Value="ENABLE_FILTERS"
                PerformEnvironmentSet="true"
        />
-  <UserMacro
-               Name="ENABLE_FILE_WRITER"
-               Value=""
-               PerformEnvironmentSet="true"
-       />
   <UserMacro
                Name="ENABLE_FILE_SYSTEM"
                Value=""

diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
index f3c5b94c7809bdaff744ac1567f4425f2503ffff..1aa406aade4a43f29e550a3d67a3f4893b914810 100644 (file)
--- a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
@@ -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"
@@ -76,11 +76,6 @@
                Value="ENABLE_FILTERS"
                PerformEnvironmentSet="true"
        />
-  <UserMacro
-               Name="ENABLE_FILE_WRITER"
-               Value=""
-               PerformEnvironmentSet="true"
-       />
   <UserMacro
                Name="ENABLE_FILE_SYSTEM"
                Value=""

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 8c13923ee260d9c4af56da27761db6ad94e33c99..39d916d66ac95c2a767674af49d749657cac2aac 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/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
+
+        * Scripts/build-webkit:
+
 2010-09-16  Robert Hogan  <robert@webkit.org>
 
         Reviewed by Antonio Gomes.

diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index c7832034e8d8b130dffaf340ed7da1154be8643c..cd43499d52778de15928b3a36a6061120f4164c7 100755 (executable)
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -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 },
 

diff --git a/configure.ac b/configure.ac
index 1b30cea2560dba5b757974c6f309c36ed0a0b7b9..d418f71895a36c7817d7498b286e99ec4b2fed3d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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