Changeset 67614 in webkit


Ignore:
Timestamp:
Sep 16, 2010 6:45:02 AM (14 years ago)
Author:
commit-queue@webkit.org
Message:

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:
Location:
trunk
Files:
49 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r67599 r67614  
     12010-09-16  Eric Uhrhane  <ericu@chromium.org>
     2
     3        Reviewed by Jian Li.
     4
     5        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
     6        https://bugs.webkit.org/show_bug.cgi?id=45798
     7
     8        * configure.ac:
     9
    1102010-09-15  Commit Queue  <commit-queue@webkit.org>
    211
  • trunk/JavaScriptCore/ChangeLog

    r67583 r67614  
     12010-09-16  Eric Uhrhane  <ericu@chromium.org>
     2
     3        Reviewed by Jian Li.
     4
     5        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
     6        https://bugs.webkit.org/show_bug.cgi?id=45798
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102010-09-15  Oliver Hunt  <oliver@apple.com>
    211
  • trunk/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r64763 r67614  
    7070ENABLE_FILTERS_macosx = ENABLE_FILTERS;
    7171
    72 ENABLE_FILE_WRITER = ;
    7372ENABLE_FILE_SYSTEM = ;
    7473ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
     
    121120ENABLE_XSLT = ENABLE_XSLT;
    122121
    123 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);
     122FEATURE_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);
  • trunk/WebCore/CMakeLists.txt

    r67538 r67614  
    15801580        fileapi/FileEntry.cpp
    15811581        fileapi/FileSystemCallbacks.cpp
     1582        fileapi/FileWriter.cpp
    15821583        fileapi/LocalFileSystem.cpp
    15831584        platform/AsyncFileSystem.cpp
     
    15951596        fileapi/FileEntry.idl
    15961597        fileapi/FileSystemCallback.idl
     1598        fileapi/FileWriterCallback.idl
     1599        fileapi/FileWriter.idl
    15971600        fileapi/Flags.idl
    15981601        fileapi/Metadata.idl
    15991602        fileapi/MetadataCallback.idl
    1600     )
    1601 ENDIF ()
    1602 
    1603 if (ENABLE_FILE_WRITER)
    1604     LIST(APPEND WebCore_SOURCES
    1605         fileapi/FileWriter.cpp
    1606     )
    1607     LIST(APPEND WebCore_IDL_FILES
    1608         fileapi/FileWriterCallback.idl
    1609         fileapi/FileWriter.idl
    16101603    )
    16111604ENDIF ()
  • trunk/WebCore/ChangeLog

    r67611 r67614  
     12010-09-16  Eric Uhrhane  <ericu@chromium.org>
     2
     3        Reviewed by Jian Li.
     4
     5        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
     6        https://bugs.webkit.org/show_bug.cgi?id=45798
     7
     8        * CMakeLists.txt:
     9        * Configurations/FeatureDefines.xcconfig:
     10        * GNUmakefile.am:
     11        * WebCore.pro:
     12        * dom/EventTarget.cpp:
     13        * dom/EventTarget.h:
     14        * dom/ExceptionCode.h:
     15        * dom/ScriptExecutionContext.cpp:
     16        (WebCore::ScriptExecutionContext::~ScriptExecutionContext):
     17        * dom/ScriptExecutionContext.h:
     18        * fileapi/AsyncFileWriter.h:
     19        * fileapi/FileEntry.cpp:
     20        * fileapi/FileEntry.h:
     21        * fileapi/FileEntry.idl:
     22        * fileapi/FileError.h:
     23        * fileapi/FileError.idl:
     24        * fileapi/FileException.h:
     25        * fileapi/FileException.idl:
     26        * fileapi/FileStreamProxy.cpp:
     27        * fileapi/FileStreamProxy.h:
     28        * fileapi/FileThread.cpp:
     29        * fileapi/FileThread.h:
     30        * fileapi/FileWriter.cpp:
     31        * fileapi/FileWriter.h:
     32        * fileapi/FileWriter.idl:
     33        * fileapi/FileWriterCallback.h:
     34        * fileapi/FileWriterCallback.idl:
     35        * fileapi/FileWriterClient.h:
     36        * page/DOMWindow.idl:
     37        * platform/AsyncFileStream.h:
     38        * platform/FileStream.cpp:
     39        * platform/FileStream.h:
     40        * platform/FileStreamClient.h:
     41
    1422010-09-16  Marc-Antoine Ruel  <maruel@chromium.org>
    243
  • trunk/WebCore/Configurations/FeatureDefines.xcconfig

    r66251 r67614  
    7070ENABLE_FILTERS_macosx = ENABLE_FILTERS;
    7171
    72 ENABLE_FILE_WRITER = ;
    7372ENABLE_FILE_SYSTEM = ;
    7473ENABLE_FULLSCREEN_API = ENABLE_FULLSCREEN_API;
     
    122121ENABLE_XSLT = ENABLE_XSLT;
    123122
    124 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);
     123FEATURE_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);
  • trunk/WebCore/GNUmakefile.am

    r67567 r67614  
    37413741        DerivedSources/WebCore/JSFileSystemCallback.cpp \
    37423742        DerivedSources/WebCore/JSFileSystemCallback.h \
     3743        DerivedSources/WebCore/JSFileWriter.cpp \
     3744        DerivedSources/WebCore/JSFileWriter.h \
     3745        DerivedSources/WebCore/JSFileWriterCallback.cpp \
     3746        DerivedSources/WebCore/JSFileWriterCallback.h \
    37433747        DerivedSources/WebCore/JSFlags.cpp \
    37443748        DerivedSources/WebCore/JSFlags.h \
     
    43134317endif  # END ENABLE_BLOB
    43144318
    4315 # ---
    4316 # FileWriter support
    4317 # ---
    4318 if ENABLE_FILE_WRITER
    4319 FEATURE_DEFINES += ENABLE_FILE_WRITER=1
    4320 webcore_cppflags += -DENABLE_FILE_WRITER=1
    4321 webcore_built_sources += \
    4322         DerivedSources/WebCore/JSFileWriter.cpp \
    4323         DerivedSources/WebCore/JSFileWriter.h
    4324         DerivedSources/WebCore/JSFileWriterCallback.cpp \
    4325         DerivedSources/WebCore/JSFileWriterCallback.h
    4326 endif  # END ENABLE_FILE_WRITER
    4327 
    43284319DerivedSources/WebCore/CSSPropertyNames.h: $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/makeprop.pl
    43294320        if sort $(WEBCORE_CSS_PROPERTY_NAMES) | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
  • trunk/WebCore/WebCore.pro

    r67538 r67614  
    29192919contains(DEFINES, ENABLE_FILE_SYSTEM=1) {
    29202920    HEADERS += \
     2921        fileapi/AsyncFileWriter.h \
    29212922        fileapi/DirectoryEntry.h \
    29222923        fileapi/DirectoryReader.h \
     
    29322933        fileapi/FileSystemCallback.h \
    29332934        fileapi/FileSystemCallbacks.h \
     2935        fileapi/FileWriter.h \
     2936        fileapi/FileWriterCallback.h \
     2937        fileapi/FileWriterClient.h \
    29342938        fileapi/Flags.h \
    29352939        fileapi/LocalFileSystem.h \
     
    29502954        fileapi/FileEntry.cpp \
    29512955        fileapi/FileSystemCallbacks.cpp \
     2956        fileapi/FileWriter.cpp \
    29522957        fileapi/LocalFileSystem.cpp \
    29532958        platform/AsyncFileSystem.cpp
    2954 }
    2955 
    2956 contains(DEFINES, ENABLE_FILE_WRITER=1) {
    2957     HEADERS += \
    2958         fileapi/AsyncFileWriter.h \
    2959         fileapi/FileWriter.h \
    2960         fileapi/FileWriterCallback.h \
    2961         fileapi/FileWriterClient.h
    2962 
    2963     SOURCES += \
    2964         fileapi/FileWriter.cpp
    29652959}
    29662960
  • trunk/WebCore/dom/EventTarget.cpp

    r65670 r67614  
    163163}
    164164#endif
    165 #if ENABLE(FILE_WRITER)
     165#if ENABLE(FILE_SYSTEM)
    166166FileWriter* EventTarget::toFileWriter()
    167167{
  • trunk/WebCore/dom/EventTarget.h

    r65670 r67614  
    125125        virtual FileReader* toFileReader();
    126126#endif
    127 #if ENABLE(FILE_WRITER)
     127#if ENABLE(FILE_SYSTEM)
    128128        virtual FileWriter* toFileWriter();
    129129#endif
  • trunk/WebCore/dom/ExceptionCode.h

    r64763 r67614  
    6262        // Introduced in File API:
    6363        // http://www.w3.org/TR/file-upload/#dfn-fileerror
    64 #if ENABLE(BLOB) || ENABLE(FILE_WRITER)
     64#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    6565        NOT_READABLE_ERR = 24,
    6666        ENCODING_ERR = 26,
  • trunk/WebCore/dom/ScriptExecutionContext.cpp

    r67432 r67614  
    8888    }
    8989#endif
    90 #if ENABLE(BLOB) || ENABLE(FILE_WRITER)
     90#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    9191    if (m_fileThread) {
    9292        m_fileThread->stop();
     
    278278#endif
    279279
    280 #if ENABLE(BLOB) || ENABLE(FILE_WRITER)
     280#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    281281FileThread* ScriptExecutionContext::fileThread()
    282282{
  • trunk/WebCore/dom/ScriptExecutionContext.h

    r67432 r67614  
    5353#endif
    5454    class DOMTimer;
    55 #if ENABLE(BLOB) || ENABLE(FILE_WRITER)
     55#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    5656    class FileThread;
    5757#endif
     
    141141#endif
    142142
    143 #if ENABLE(BLOB) || ENABLE(FILE_WRITER)
     143#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    144144        FileThread* fileThread();
    145145        void stopFileThread();
     
    178178#endif
    179179
    180 #if ENABLE(BLOB) || ENABLE(FILE_WRITER)
     180#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    181181        RefPtr<FileThread> m_fileThread;
    182182#endif
  • trunk/WebCore/fileapi/AsyncFileWriter.h

    r66365 r67614  
    3232#define AsyncFileWriter_h
    3333
    34 #if ENABLE(FILE_WRITER)
     34#if ENABLE(FILE_SYSTEM)
    3535
    3636#include "PlatformString.h"
     
    5555} // namespace
    5656
    57 #endif // ENABLE(FILE_WRITER)
     57#endif // ENABLE(FILE_SYSTEM)
    5858
    5959#endif // AsyncFileWriter_h
  • trunk/WebCore/fileapi/FileEntry.cpp

    r67455 r67614  
    4545}
    4646
    47 #if ENABLE(FILE_WRITER)
    4847void FileEntry::createWriter(PassRefPtr<FileWriterCallback>, PassRefPtr<ErrorCallback>)
    4948{
    5049    // FIXME: to be implemented.
    5150}
    52 #endif
    5351
    5452void FileEntry::file(PassRefPtr<FileCallback>, PassRefPtr<ErrorCallback>)
  • trunk/WebCore/fileapi/FileEntry.h

    r67443 r67614  
    4949    }
    5050
    51 #if ENABLE(FILE_WRITER)
    5251    void createWriter(PassRefPtr<FileWriterCallback>, PassRefPtr<ErrorCallback> = 0);
    53 #endif
    5452    void file(PassRefPtr<FileCallback>, PassRefPtr<ErrorCallback> = 0);
    5553
  • trunk/WebCore/fileapi/FileEntry.idl

    r67443 r67614  
    3535        GenerateToJS
    3636    ] FileEntry : Entry {
    37 #if defined(ENABLE_FILE_WRITER) && ENABLE_FILE_WRITER
    3837        void createWriter(in [Callback] FileWriterCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
    39 #endif
    4038        void file(in [Callback] FileCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
    4139    };
  • trunk/WebCore/fileapi/FileError.h

    r66365 r67614  
    3232#define FileError_h
    3333
    34 #if ENABLE(BLOB) || ENABLE(FILE_WRITER)
     34#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    3535
    3636#include "ExceptionCode.h"
     
    5656} // namespace WebCore
    5757
    58 #endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
     58#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    5959
    6060#endif // FileError_h
  • trunk/WebCore/fileapi/FileError.idl

    r66629 r67614  
    3131module html {
    3232    interface [
    33         Conditional=BLOB|FILE_WRITER,
     33        Conditional=BLOB|FILE_SYSTEM,
    3434        DontCheckEnums,
    3535        NoStaticTables
  • trunk/WebCore/fileapi/FileException.h

    r66461 r67614  
    3232#define FileException_h
    3333
    34 #if ENABLE(BLOB) || ENABLE(FILE_WRITER)
     34#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    3535
    3636#include "ExceptionBase.h"
     
    6161} // namespace WebCore
    6262
    63 #endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
     63#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    6464
    6565#endif // FileException_h
  • trunk/WebCore/fileapi/FileException.idl

    r66629 r67614  
    3131module html {
    3232    interface [
    33         Conditional=BLOB|FILE_WRITER,
     33        Conditional=BLOB|FILE_SYSTEM,
    3434        DontCheckEnums,
    3535        NoStaticTables
  • trunk/WebCore/fileapi/FileStreamProxy.cpp

    r66365 r67614  
    3131#include "config.h"
    3232
    33 #if ENABLE(BLOB) || ENABLE(FILE_WRITER)
     33#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    3434
    3535#include "FileStreamProxy.h"
     
    217217} // namespace WebCore
    218218
    219 #endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
     219#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
  • trunk/WebCore/fileapi/FileStreamProxy.h

    r66365 r67614  
    3333#define FileStreamProxy_h
    3434
    35 #if ENABLE(BLOB) || ENABLE(FILE_WRITER)
     35#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    3636
    3737#include "AsyncFileStream.h"
     
    8888} // namespace WebCore
    8989
    90 #endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
     90#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    9191
    9292#endif // FileStreamProxy_h
  • trunk/WebCore/fileapi/FileThread.cpp

    r66365 r67614  
    3131#include "config.h"
    3232
    33 #if ENABLE(BLOB) || ENABLE(FILE_WRITER)
     33#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    3434
    3535#include "FileThread.h"
     
    117117} // namespace WebCore
    118118
    119 #endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
     119#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
  • trunk/WebCore/fileapi/FileThread.h

    r66365 r67614  
    3232#define FileThread_h
    3333
    34 #if ENABLE(BLOB) || ENABLE(FILE_WRITER)
     34#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    3535
    3636#include <wtf/MessageQueue.h>
     
    8484} // namespace WebCore
    8585
    86 #endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
     86#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    8787
    8888#endif // FileThread_h
  • trunk/WebCore/fileapi/FileWriter.cpp

    r66365 r67614  
    3131#include "config.h"
    3232
    33 #if ENABLE(FILE_WRITER)
     33#if ENABLE(FILE_SYSTEM)
    3434
    3535#include "FileWriter.h"
     
    197197} // namespace WebCore
    198198 
    199 #endif // ENABLE(FILE_WRITER)
     199#endif // ENABLE(FILE_SYSTEM)
  • trunk/WebCore/fileapi/FileWriter.h

    r66365 r67614  
    3232#define FileWriter_h
    3333
    34 #if ENABLE(FILE_WRITER)
     34#if ENABLE(FILE_SYSTEM)
    3535
    3636#include "ActiveDOMObject.h"
     
    126126} // namespace WebCore
    127127
    128 #endif // ENABLE(FILE_WRITER)
     128#endif // ENABLE(FILE_SYSTEM)
    129129
    130130#endif // FileWriter_h
  • trunk/WebCore/fileapi/FileWriter.idl

    r66365 r67614  
    3131module html {
    3232    interface [
    33         Conditional=FILE_WRITER,
     33        Conditional=FILE_SYSTEM,
    3434        CallWith=ScriptExecutionContext,
    3535        EventTarget,
  • trunk/WebCore/fileapi/FileWriterCallback.h

    r67159 r67614  
    3232#define FileWriterCallback_h
    3333
    34 #if ENABLE(FILE_SYSTEM) && ENABLE(FILE_WRITER)
     34#if ENABLE(FILE_SYSTEM)
    3535
    3636#include <wtf/RefCounted.h>
     
    4848} // namespace
    4949
    50 #endif // ENABLE(FILE_SYSTEM) && ENABLE(FILE_WRITER)
     50#endif // ENABLE(FILE_SYSTEM)
    5151
    5252#endif // FileWriterCallback_h
  • trunk/WebCore/fileapi/FileWriterCallback.idl

    r67159 r67614  
    3131module fileapi {
    3232    interface [
    33         Conditional=FILE_SYSTEM&FILE_WRITER,
     33        Conditional=FILE_SYSTEM,
    3434        Callback
    3535    ] FileWriterCallback {
  • trunk/WebCore/fileapi/FileWriterClient.h

    r66365 r67614  
    3232#define FileWriterClient_h
    3333
    34 #if ENABLE(FILE_WRITER)
     34#if ENABLE(FILE_SYSTEM)
    3535
    3636#include "ExceptionCode.h"
     
    4949} // namespace
    5050
    51 #endif // ENABLE(FILE_WRITER)
     51#endif // ENABLE(FILE_SYSTEM)
    5252
    5353#endif // FileWriterClient_h
  • trunk/WebCore/page/DOMWindow.idl

    r67421 r67614  
    757757        attribute DOMFormDataConstructor FormData;
    758758
    759         attribute [Conditional=BLOB|FILE_WRITER] FileErrorConstructor FileError;
     759        attribute [Conditional=BLOB|FILE_SYSTEM] FileErrorConstructor FileError;
    760760        attribute [Conditional=BLOB] FileReaderConstructor FileReader;
    761761
  • trunk/WebCore/platform/AsyncFileStream.h

    r65745 r67614  
    3232#define AsyncFileStream_h
    3333
    34 #if ENABLE(BLOB) || ENABLE(FILE_WRITER)
     34#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    3535
    3636#include "FileStreamClient.h"
     
    7070} // namespace WebCore
    7171
    72 #endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
     72#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    7373
    7474#endif // AsyncFileStream_h
  • trunk/WebCore/platform/FileStream.cpp

    r65645 r67614  
    3131#include "config.h"
    3232
    33 #if ENABLE(BLOB) || ENABLE(FILE_WRITER)
     33#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    3434
    3535#include "FileStream.h"
     
    148148} // namespace WebCore
    149149
    150 #endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
     150#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
  • trunk/WebCore/platform/FileStream.h

    r65645 r67614  
    3232#define FileStream_h
    3333
    34 #if ENABLE(BLOB) || ENABLE(FILE_WRITER)
     34#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    3535
    3636#include "FileSystem.h"
     
    9696} // namespace WebCore
    9797
    98 #endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
     98#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    9999
    100100#endif // FileStream_h
  • trunk/WebCore/platform/FileStreamClient.h

    r65745 r67614  
    3232#define FileStreamClient_h
    3333
    34 #if ENABLE(BLOB) || ENABLE(FILE_WRITER)
     34#if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    3535
    3636namespace WebCore {
     
    5959} // namespace WebCore
    6060
    61 #endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
     61#endif // ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
    6262
    6363#endif // FileStreamClient_h
  • trunk/WebKit/chromium/ChangeLog

    r67610 r67614  
     12010-09-16  Eric Uhrhane  <ericu@chromium.org>
     2
     3        Reviewed by Jian Li.
     4
     5        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
     6        https://bugs.webkit.org/show_bug.cgi?id=45798
     7
     8        * src/AsyncFileWriterChromium.h:
     9        * src/AsyncFileWriterChromium.cpp:
     10
    1112010-09-16  Nat Duca  <nduca@chromium.org>
    212
  • trunk/WebKit/chromium/src/AsyncFileWriterChromium.cpp

    r67446 r67614  
    3232#include "AsyncFileWriterChromium.h"
    3333
    34 #if ENABLE(FILE_WRITER)
     34#if ENABLE(FILE_SYSTEM)
    3535
    3636#include "Blob.h"
     
    9090} // namespace
    9191
    92 #endif // ENABLE(FILE_WRITER)
     92#endif // ENABLE(FILE_SYSTEM)
  • trunk/WebKit/chromium/src/AsyncFileWriterChromium.h

    r67446 r67614  
    3232#define AsyncFileWriterChromium_h
    3333
    34 #if ENABLE(FILE_WRITER)
     34#if ENABLE(FILE_SYSTEM)
    3535
    3636#include "AsyncFileWriter.h"
     
    7171} // namespace
    7272
    73 #endif // ENABLE(FILE_WRITER)
     73#endif // ENABLE(FILE_SYSTEM)
    7474
    7575#endif // AsyncFileWriterChromium_h
  • trunk/WebKit/mac/ChangeLog

    r67576 r67614  
     12010-09-16  Eric Uhrhane  <ericu@chromium.org>
     2
     3        Reviewed by Jian Li.
     4
     5        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
     6        https://bugs.webkit.org/show_bug.cgi?id=45798
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102010-09-15  Simon Fraser  <simon.fraser@apple.com>
    211
  • trunk/WebKit/mac/Configurations/FeatureDefines.xcconfig

    r66251 r67614  
    7070ENABLE_FILTERS_macosx = ENABLE_FILTERS;
    7171
    72 ENABLE_FILE_WRITER = ;
    7372ENABLE_FILE_SYSTEM = ;
    7473ENABLE_FULLSCREEN_API = ENABLE_FULLSCREEN_API;
     
    122121ENABLE_XSLT = ENABLE_XSLT;
    123122
    124 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);
     123FEATURE_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);
  • trunk/WebKit2/ChangeLog

    r67597 r67614  
     12010-09-16  Eric Uhrhane  <ericu@chromium.org>
     2
     3        Reviewed by Jian Li.
     4
     5        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
     6        https://bugs.webkit.org/show_bug.cgi?id=45798
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102010-09-15  Jessie Berlin  <jberlin@apple.com>
    211
  • trunk/WebKit2/Configurations/FeatureDefines.xcconfig

    r64763 r67614  
    7070ENABLE_FILTERS_macosx = ENABLE_FILTERS;
    7171
    72 ENABLE_FILE_WRITER = ;
     72ENABLE_FILE_SYSTEM = ;
    7373ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
    7474
     
    120120ENABLE_XSLT = ENABLE_XSLT;
    121121
    122 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);
     122FEATURE_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);
  • trunk/WebKitLibraries/ChangeLog

    r67251 r67614  
     12010-09-16  Eric Uhrhane  <ericu@chromium.org>
     2
     3        Reviewed by Jian Li.
     4
     5        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
     6        https://bugs.webkit.org/show_bug.cgi?id=45798
     7
     8        * win/tools/vsprops/FeatureDefines.vsprops:
     9        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
     10
    1112010-09-09  Jer Noble  <jer.noble@apple.com>
    212
  • trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops

    r64763 r67614  
    1010  <Tool
    1111                Name="VCCLCompilerTool"
    12                 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)"
     12                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)"
    1313        />
    1414  <UserMacro
     
    7878        />
    7979  <UserMacro
    80                 Name="ENABLE_FILE_WRITER"
    81                 Value=""
    82                 PerformEnvironmentSet="true"
    83         />
    84   <UserMacro
    8580                Name="ENABLE_FILE_SYSTEM"
    8681                Value=""
  • trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops

    r64763 r67614  
    1010  <Tool
    1111                Name="VCCLCompilerTool"
    12                 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)"
     12                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)"
    1313        />
    1414  <UserMacro
     
    7878        />
    7979  <UserMacro
    80                 Name="ENABLE_FILE_WRITER"
    81                 Value=""
    82                 PerformEnvironmentSet="true"
    83         />
    84   <UserMacro
    8580                Name="ENABLE_FILE_SYSTEM"
    8681                Value=""
  • trunk/WebKitTools/ChangeLog

    r67612 r67614  
     12010-09-16  Eric Uhrhane  <ericu@chromium.org>
     2
     3        Reviewed by Jian Li.
     4
     5        Unify FILE_SYSTEM and FILE_WRITER enables under the name FILE_SYSTEM.
     6        https://bugs.webkit.org/show_bug.cgi?id=45798
     7
     8        * Scripts/build-webkit:
     9
    1102010-09-16  Robert Hogan  <robert@webkit.org>
    211
  • trunk/WebKitTools/Scripts/build-webkit

    r67456 r67614  
    199199      define => "ENABLE_XSLT", default => 1, value => \$xsltSupport },
    200200
    201     { option => "file-writer", desc => "Toggle FileWriter support",
    202       define => "ENABLE_FILE_WRITER", default => 0, value => \$fileWriterSupport },
    203 
    204201    { option => "file-system", desc => "Toggle FileSystem support",
    205202      define => "ENABLE_FILE_SYSTEM", default => 0, value => \$fileSystemSupport },
  • trunk/configure.ac

    r67300 r67614  
    657657AC_MSG_RESULT([$enable_fast_mobile_scrolling])
    658658
    659 # check whether to enable FileWriter support
    660 AC_MSG_CHECKING([whether to enable FileWriter support])
    661 AC_ARG_ENABLE(file_writer,
    662               AC_HELP_STRING([--enable-file-writer],
    663                              [enable support for FileWriter [default=no]]),
    664               [],[enable_file_writer="no"])
    665 AC_MSG_RESULT([$enable_file_writer])
    666 
    667659# check whether to enable code coverage
    668660AC_MSG_CHECKING([whether to enable code coverage support])
     
    911903AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"])
    912904AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"])
    913 AM_CONDITIONAL([ENABLE_FILE_WRITER],[test "$enable_file_writer" = "yes"])
    914905AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"])
    915906AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"])
     
    974965 JIT compilation                                          : $enable_jit
    975966 Filters support                                          : $enable_filters
    976  FileWriter support                                       : $enable_file_writer
    977967 Geolocation support                                      : $enable_geolocation
    978968 JavaScript debugger/profiler support                     : $enable_javascript_debugger
Note: See TracChangeset for help on using the changeset viewer.