Changeset 62049 in webkit


Ignore:
Timestamp:
Jun 28, 2010 4:53:10 PM (14 years ago)
Author:
johnnyg@google.com
Message:

2010-06-28 John Gregg <johnnyg@google.com>

Reviewed by Kent Tamura.

add ENABLE_DIRECTORY_UPLOAD build support
https://bugs.webkit.org/show_bug.cgi?id=41100

  • Configurations/FeatureDefines.xcconfig:

2010-06-23 John Gregg <johnnyg@google.com>

Reviewed by Kent Tamura.

add ENABLE_DIRECTORY_UPLOAD build support
https://bugs.webkit.org/show_bug.cgi?id=41100

  • features.gypi:

2010-06-23 John Gregg <johnnyg@google.com>

Reviewed by Kent Tamura.

add ENABLE_DIRECTORY_UPLOAD build support
https://bugs.webkit.org/show_bug.cgi?id=41100

  • Configurations/FeatureDefines.xcconfig:

2010-06-23 John Gregg <johnnyg@google.com>

Reviewed by Kent Tamura.

add ENABLE_DIRECTORY_UPLOAD build support
https://bugs.webkit.org/show_bug.cgi?id=41100

  • win/tools/vsprops/FeatureDefines.vsprops:
  • win/tools/vsprops/FeatureDefinesCairo.vsprops:

2010-06-23 John Gregg <johnnyg@google.com>

Reviewed by Kent Tamura.

add ENABLE_DIRECTORY_UPLOAD build support
https://bugs.webkit.org/show_bug.cgi?id=41100

  • Configurations/FeatureDefines.xcconfig:
  • GNUmakefile.am:
  • WebCore.pri:

2010-06-28 John Gregg <johnnyg@google.com>

Reviewed by Kent Tamura.

add ENABLE_DIRECTORY_UPLOAD build support
https://bugs.webkit.org/show_bug.cgi?id=41100

  • configure.ac:

2010-06-23 John Gregg <johnnyg@google.com>

Reviewed by Kent Tamura.

add ENABLE_DIRECTORY_UPLOAD build support
https://bugs.webkit.org/show_bug.cgi?id=41100

  • Scripts/build-webkit:

2010-06-23 John Gregg <johnnyg@google.com>

Reviewed by Kent Tamura.

add ENABLE_DIRECTORY_UPLOAD build support
https://bugs.webkit.org/show_bug.cgi?id=41100

  • Configurations/FeatureDefines.xcconfig:
Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r62027 r62049  
     12010-06-28  John Gregg  <johnnyg@google.com>
     2
     3        Reviewed by Kent Tamura.
     4
     5        add ENABLE_DIRECTORY_UPLOAD build support
     6        https://bugs.webkit.org/show_bug.cgi?id=41100
     7
     8        * configure.ac:
     9
    1102010-06-28  Xan Lopez  <xlopez@igalia.com>
    211
  • trunk/JavaScriptCore/ChangeLog

    r62044 r62049  
     12010-06-28  John Gregg  <johnnyg@google.com>
     2
     3        Reviewed by Kent Tamura.
     4
     5        add ENABLE_DIRECTORY_UPLOAD build support
     6        https://bugs.webkit.org/show_bug.cgi?id=41100
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102010-06-28  Xan Lopez  <xlopez@igalia.com>
    211
  • trunk/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r61950 r62049  
    4949ENABLE_DATALIST = ENABLE_DATALIST;
    5050ENABLE_DEVICE_ORIENTATION = ;
     51ENABLE_DIRECTORY_UPLOAD = ;
    5152ENABLE_DOM_STORAGE = ENABLE_DOM_STORAGE;
    5253ENABLE_EVENTSOURCE = ENABLE_EVENTSOURCE;
     
    8485ENABLE_XSLT = ENABLE_XSLT;
    8586
    86 FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB_SLICE) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_READER) $(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);
     87FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB_SLICE) $(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_READER) $(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);
    8788
  • trunk/WebCore/ChangeLog

    r62047 r62049  
     12010-06-23  John Gregg  <johnnyg@google.com>
     2
     3        Reviewed by Kent Tamura.
     4
     5        add ENABLE_DIRECTORY_UPLOAD build support
     6        https://bugs.webkit.org/show_bug.cgi?id=41100
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9        * GNUmakefile.am:
     10        * WebCore.pri:
     11
    1122010-06-28  Adam Barth  <abarth@webkit.org>
    213
  • trunk/WebCore/Configurations/FeatureDefines.xcconfig

    r61950 r62049  
    4949ENABLE_DATALIST = ENABLE_DATALIST;
    5050ENABLE_DEVICE_ORIENTATION = ;
     51ENABLE_DIRECTORY_UPLOAD = ;
    5152ENABLE_DOM_STORAGE = ENABLE_DOM_STORAGE;
    5253ENABLE_EVENTSOURCE = ENABLE_EVENTSOURCE;
     
    8485ENABLE_XSLT = ENABLE_XSLT;
    8586
    86 FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB_SLICE) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_READER) $(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);
     87FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB_SLICE) $(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_READER) $(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);
     88
  • trunk/WebCore/GNUmakefile.am

    r62034 r62049  
    25932593
    25942594# ----
     2595# Support for <input type="file" directory>
     2596# ----
     2597if ENABLE_DIRECTORY_UPLOAD
     2598FEATURE_DEFINES += ENABLE_DIRECTORY_UPLOAD=1
     2599webcore_cppflags += -DENABLE_DIRECTORY_UPLOAD=1
     2600
     2601else
     2602
     2603webcore_cppflags += -DENABLE_DIRECTORY_UPLOAD=0
     2604
     2605endif # END ENABLE_DIRECTORY_UPLOAD
     2606
     2607# ----
    25952608# HTML5 client-side session and persistent storage
    25962609# ----
  • trunk/WebCore/WebCore.pri

    r61964 r62049  
    4242!contains(DEFINES, ENABLE_CHANNEL_MESSAGING=.): DEFINES += ENABLE_CHANNEL_MESSAGING=1
    4343!contains(DEFINES, ENABLE_ORIENTATION_EVENTS=.): DEFINES += ENABLE_ORIENTATION_EVENTS=0
     44!contains(DEFINES, ENABLE_DIRECTORY_UPLOAD=.): DEFINES += ENABLE_DIRECTORY_UPLOAD=0
    4445
    4546# turn on SQLITE support if any of the dependent features are turned on
  • trunk/WebKit/chromium/ChangeLog

    r62039 r62049  
     12010-06-23  John Gregg  <johnnyg@google.com>
     2
     3        Reviewed by Kent Tamura.
     4
     5        add ENABLE_DIRECTORY_UPLOAD build support
     6        https://bugs.webkit.org/show_bug.cgi?id=41100
     7
     8        * features.gypi:
     9
    1102010-06-28  Zhe Su  <suzhe@chromium.org>
    211
  • trunk/WebKit/chromium/features.gypi

    r61950 r62049  
    4646        'ENABLE_DATABASE=1',
    4747        'ENABLE_DATAGRID=0',
     48        'ENABLE_DIRECTORY_UPLOAD=1',
    4849        'ENABLE_DOM_STORAGE=1',
    4950        'ENABLE_EVENTSOURCE=1',
  • trunk/WebKit/mac/ChangeLog

    r61989 r62049  
     12010-06-23  John Gregg  <johnnyg@google.com>
     2
     3        Reviewed by Kent Tamura.
     4
     5        add ENABLE_DIRECTORY_UPLOAD build support
     6        https://bugs.webkit.org/show_bug.cgi?id=41100
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102010-06-28  Eric Seidel  <eric@webkit.org>
    211
  • trunk/WebKit/mac/Configurations/FeatureDefines.xcconfig

    r61950 r62049  
    4949ENABLE_DATALIST = ENABLE_DATALIST;
    5050ENABLE_DEVICE_ORIENTATION = ;
     51ENABLE_DIRECTORY_UPLOAD = ;
    5152ENABLE_DOM_STORAGE = ENABLE_DOM_STORAGE;
    5253ENABLE_EVENTSOURCE = ENABLE_EVENTSOURCE;
     
    8485ENABLE_XSLT = ENABLE_XSLT;
    8586
    86 FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB_SLICE) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_READER) $(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);
     87FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB_SLICE) $(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_READER) $(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);
  • trunk/WebKit2/ChangeLog

    r62025 r62049  
     12010-06-23  John Gregg  <johnnyg@google.com>
     2
     3        Reviewed by Kent Tamura.
     4
     5        add ENABLE_DIRECTORY_UPLOAD build support
     6        https://bugs.webkit.org/show_bug.cgi?id=41100
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102010-06-28  Sam Weinig  <sam@webkit.org>
    211
  • trunk/WebKit2/Configurations/FeatureDefines.xcconfig

    r61950 r62049  
    4848ENABLE_DATAGRID = ;
    4949ENABLE_DATALIST = ENABLE_DATALIST;
     50ENABLE_DIRECTORY_UPLOAD = ;
    5051ENABLE_DOM_STORAGE = ENABLE_DOM_STORAGE;
    5152ENABLE_EVENTSOURCE = ENABLE_EVENTSOURCE;
     
    8283ENABLE_XSLT = ENABLE_XSLT;
    8384
    84 FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB_SLICE) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_READER) $(ENABLE_FILE_WRITER) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(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);
     85<<<<<<< .mine
     86FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB_SLICE) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_READER) $(ENABLE_FILE_WRITER) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(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_WML) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
     87=======
     88FEATURE_DEFINES = $(ENABLE_3D_CANVAS) $(ENABLE_3D_RENDERING) $(ENABLE_BLOB_SLICE) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_DATABASE) $(ENABLE_DATAGRID) $(ENABLE_DATALIST) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILTERS) $(ENABLE_FILE_READER) $(ENABLE_FILE_WRITER) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(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);
     89>>>>>>> .r62017
  • trunk/WebKitLibraries/ChangeLog

    r61981 r62049  
     12010-06-23  John Gregg  <johnnyg@google.com>
     2
     3        Reviewed by Kent Tamura.
     4
     5        add ENABLE_DIRECTORY_UPLOAD build support
     6        https://bugs.webkit.org/show_bug.cgi?id=41100
     7
     8        * win/tools/vsprops/FeatureDefines.vsprops:
     9        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
     10
    1112010-06-27  Steve Falkenburg  <sfalken@apple.com>
    212
  • trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops

    r61980 r62049  
    1010  <Tool
    1111                Name="VCCLCompilerTool"
    12                 PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_BLOB_SLICE);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_READER);$(ENABLE_FILE_WRITER);$(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_SLICE);$(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_READER);$(ENABLE_FILE_WRITER);$(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
     
    5858        />
    5959  <UserMacro
     60                Name="ENABLE_DIRECTORY_UPLOAD"
     61                Value=""
     62                PerformEnvironmentSet="true"
     63        />
     64  <UserMacro
    6065                Name="ENABLE_DOM_STORAGE"
    6166                Value="ENABLE_DOM_STORAGE"
  • trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops

    r61981 r62049  
    1010  <Tool
    1111                Name="VCCLCompilerTool"
    12                 PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_BLOB_SLICE);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_READER);$(ENABLE_FILE_WRITER);$(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_SLICE);$(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_READER);$(ENABLE_FILE_WRITER);$(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
     
    5858        />
    5959  <UserMacro
     60                Name="ENABLE_DIRECTORY_UPLOAD"
     61                Value=""
     62                PerformEnvironmentSet="true"
     63        />
     64  <UserMacro
    6065                Name="ENABLE_DOM_STORAGE"
    6166                Value="ENABLE_DOM_STORAGE"
  • trunk/WebKitTools/ChangeLog

    r62048 r62049  
     12010-06-23  John Gregg  <johnnyg@google.com>
     2
     3        Reviewed by Kent Tamura.
     4
     5        add ENABLE_DIRECTORY_UPLOAD build support
     6        https://bugs.webkit.org/show_bug.cgi?id=41100
     7
     8        * Scripts/build-webkit:
     9
    1102010-06-28  Gustavo Noronha Silva  <gns@gnome.org>
    211
  • trunk/WebKitTools/Scripts/build-webkit

    r61950 r62049  
    6262    $svgForeignObjectSupport, $svgUseSupport, $videoSupport, $webSocketsSupport, $webTimingSupport, $wmlSupport, $wcssSupport, $xhtmlmpSupport, $workersSupport,
    6363    $xpathSupport, $xsltSupport, $coverageSupport, $notificationsSupport, $blobSliceSupport, $tiledBackingStoreSupport,
    64     $fileReaderSupport, $fileWriterSupport);
     64    $fileReaderSupport, $fileWriterSupport, $directoryUploadSupport);
    6565
    6666my @features = (
     
    9292      define => "ENABLE_DATALIST", default => 1, value => \$datalistSupport },
    9393         
     94    { option => "directory-upload", desc => "Toogle Directory upload support",
     95      define => "ENABLE_DIRECTORY_UPLOAD", default => 0, value => \$directoryUploadSupport },
     96
    9497    { option => "dom-storage", desc => "Toggle DOM Storage Support",
    9598      define => "ENABLE_DOM_STORAGE", default => 1, value => \$domStorageSupport },
  • trunk/configure.ac

    r62027 r62049  
    529529AC_MSG_RESULT([$enable_workers])
    530530
     531# check whether to enable directory upload support
     532AC_MSG_CHECKING([whether to enable directory upload support])
     533AC_ARG_ENABLE(directory_upload,
     534              AC_HELP_STRING([--enable-directory-upload],
     535                             [enable support for directory upload [default=no]]),
     536              [], [enable_directory_upload="no"])
     537AC_MSG_RESULT([$enable_directory_upload])
     538
    531539# turn off svg features if --disable-svg is requested
    532540if test "$enable_svg" = "no"; then
     
    869877AM_CONDITIONAL([ENABLE_JAVASCRIPT_DEBUGGER],[test "$enable_javascript_debugger" = "yes"])
    870878AM_CONDITIONAL([ENABLE_OFFLINE_WEB_APPLICATIONS],[test "$enable_offline_web_applications" = "yes"])
     879AM_CONDITIONAL([ENABLE_DIRECTORY_UPLOAD],[test "$enable_directory_upload" = "yes"])
    871880AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"])
    872881AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"])
     
    940949 3D Transforms                                            : $enable_3D_transforms
    941950 Blob.slice support                                       : $enable_blob_slice
     951 Directory upload                                         : $enable_directory_upload
    942952 Fast Mobile Scrolling                                    : $enable_fast_mobile_scrolling
    943953 JIT compilation                                          : $enable_jit
Note: See TracChangeset for help on using the changeset viewer.