Unify blob related feature defines to ENABLE(BLOB).

https://bugs.webkit.org/show_bug.cgi?id=43081

Reviewed by David Levin.

.:

* cmakeconfig.h.cmake:
* configure.ac:

JavaScriptCore:

* Configurations/FeatureDefines.xcconfig:

WebCore:

* Configurations/FeatureDefines.xcconfig:
* GNUmakefile.am:
* WebCore.pri:
* bindings/js/JSEventTarget.cpp:
(WebCore::toJS):
* bindings/v8/V8DOMWrapper.cpp:
(WebCore::V8DOMWrapper::convertEventTargetToV8Object):
* dom/EventTarget.cpp:
* dom/EventTarget.h:
* dom/ExceptionCode.h:
(WebCore::):
* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::~ScriptExecutionContext):
* dom/ScriptExecutionContext.h:
* html/Blob.cpp:
* html/Blob.h:
* html/Blob.idl:
* html/FileError.h:
* html/FileError.idl:
* html/FileReader.cpp:
* html/FileReader.h:
* html/FileReader.idl:
* html/FileStream.cpp:
(WebCore::FileStream::openForRead):
* html/FileStream.h:
* html/FileStreamClient.h:
* html/FileStreamProxy.cpp:
* html/FileStreamProxy.h:
* html/FileThread.cpp:
* html/FileThread.h:
* page/DOMWindow.idl:
* platform/BlobItem.cpp:
(WebCore::getFileSnapshotModificationTime):
(WebCore::DataBlobItem::slice):
(WebCore::FileBlobItem::slice):
* platform/BlobItem.h:
* platform/network/FormData.cpp:
(WebCore::FormData::deepCopy):
(WebCore::FormData::appendFile):
(WebCore::FormData::appendItem):
(WebCore::FormData::appendKeyValuePairItems):
* platform/network/FormData.h:
(WebCore::operator==):
* platform/network/mac/FormDataStreamMac.mm:
(WebCore::closeCurrentStream):
(WebCore::advanceCurrentStream):
(WebCore::formCreate):
(WebCore::formRead):
(WebCore::setHTTPBody):

WebKit/chromium:

* features.gypi:
* src/WebHTTPBody.cpp:
(WebKit::WebHTTPBody::elementAt):
(WebKit::WebHTTPBody::appendFileRange):

WebKit/mac:

* Configurations/FeatureDefines.xcconfig:

WebKit2:

* Configurations/FeatureDefines.xcconfig:

WebKitLibraries:

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

WebKitTools:

* Scripts/build-webkit:

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

diff --git a/ChangeLog b/ChangeLog
index 2b3927ea544bf1cea1a964469b714440d9808e6b..700e22466f29ef2be87311c8da739a933509c6e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-05  Jian Li  <jianli@chromium.org>
+
+        Reviewed by David Levin.
+
+        Unify blob related feature defines to ENABLE(BLOB).
+        https://bugs.webkit.org/show_bug.cgi?id=43081
+
+        * cmakeconfig.h.cmake:
+        * configure.ac:
+
 2010-08-05  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 
         Reviewed by Xan Lopez.

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 9eaef25cc66c58fb339cc624a0d4471a0fb2ec5e..8797655f15a0167b81baafd9b18564f6af367113 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-05  Jian Li  <jianli@chromium.org>
+
+        Reviewed by David Levin.
+
+        Unify blob related feature defines to ENABLE(BLOB).
+        https://bugs.webkit.org/show_bug.cgi?id=43081
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2010-08-05  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 
         Rubber-stamped by Xan Lopez.

diff --git a/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/JavaScriptCore/Configurations/FeatureDefines.xcconfig
index 96eda36774ab287fc0c4cda1aef5418d3324cd81..f2b4c09e4da1ea177a84858cd5d701f6072b7ce7 100644 (file)
--- a/JavaScriptCore/Configurations/FeatureDefines.xcconfig
+++ b/JavaScriptCore/Configurations/FeatureDefines.xcconfig
@@ -46,8 +46,8 @@ ENABLE_3D_RENDERING_macosx_1050 = ENABLE_3D_RENDERING;
 ENABLE_3D_RENDERING_macosx_1060 = ENABLE_3D_RENDERING;
 ENABLE_3D_RENDERING_macosx_1070 = ENABLE_3D_RENDERING;
 
-ENABLE_BLOB_SLICE = $(ENABLE_BLOB_SLICE_$(REAL_PLATFORM_NAME));
-ENABLE_BLOB_SLICE_macosx = ENABLE_BLOB_SLICE;
+ENABLE_BLOB = $(ENABLE_BLOB_$(REAL_PLATFORM_NAME));
+ENABLE_BLOB_macosx = ENABLE_BLOB;
 
 ENABLE_CHANNEL_MESSAGING = $(ENABLE_CHANNEL_MESSAGING_$(REAL_PLATFORM_NAME));
 ENABLE_CHANNEL_MESSAGING_macosx = ENABLE_CHANNEL_MESSAGING;
@@ -69,9 +69,6 @@ ENABLE_EVENTSOURCE = ENABLE_EVENTSOURCE;
 ENABLE_FILTERS = $(ENABLE_FILTERS_$(REAL_PLATFORM_NAME));
 ENABLE_FILTERS_macosx = ENABLE_FILTERS;
 
-ENABLE_FILE_READER = $(ENABLE_FILE_READER_$(REAL_PLATFORM_NAME));
-ENABLE_FILE_READER_macosx = ENABLE_FILE_READER;
-
 ENABLE_FILE_WRITER = ;
 ENABLE_FILE_SYSTEM = ;
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
@@ -123,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_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_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_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);

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 80fa3348b9f4c2fd79a0946470aeacc4752c66b9..2e8bdf25461691d98ea39e0fbd8ef09517627e1d 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,60 @@
+2010-08-05  Jian Li  <jianli@chromium.org>
+ 
+        Reviewed by David Levin.
+
+        Unify blob related feature defines to ENABLE(BLOB).
+        https://bugs.webkit.org/show_bug.cgi?id=43081
+
+        * Configurations/FeatureDefines.xcconfig:
+        * GNUmakefile.am:
+        * WebCore.pri:
+        * bindings/js/JSEventTarget.cpp:
+        (WebCore::toJS):
+        * bindings/v8/V8DOMWrapper.cpp:
+        (WebCore::V8DOMWrapper::convertEventTargetToV8Object):
+        * dom/EventTarget.cpp:
+        * dom/EventTarget.h:
+        * dom/ExceptionCode.h:
+        (WebCore::):
+        * dom/ScriptExecutionContext.cpp:
+        (WebCore::ScriptExecutionContext::~ScriptExecutionContext):
+        * dom/ScriptExecutionContext.h:
+        * html/Blob.cpp:
+        * html/Blob.h:
+        * html/Blob.idl:
+        * html/FileError.h:
+        * html/FileError.idl:
+        * html/FileReader.cpp:
+        * html/FileReader.h:
+        * html/FileReader.idl:
+        * html/FileStream.cpp:
+        (WebCore::FileStream::openForRead):
+        * html/FileStream.h:
+        * html/FileStreamClient.h:
+        * html/FileStreamProxy.cpp:
+        * html/FileStreamProxy.h:
+        * html/FileThread.cpp:
+        * html/FileThread.h:
+        * page/DOMWindow.idl:
+        * platform/BlobItem.cpp:
+        (WebCore::getFileSnapshotModificationTime):
+        (WebCore::DataBlobItem::slice):
+        (WebCore::FileBlobItem::slice):
+        * platform/BlobItem.h:
+        * platform/network/FormData.cpp:
+        (WebCore::FormData::deepCopy):
+        (WebCore::FormData::appendFile):
+        (WebCore::FormData::appendItem):
+        (WebCore::FormData::appendKeyValuePairItems):
+        * platform/network/FormData.h:
+        (WebCore::operator==):
+        * platform/network/mac/FormDataStreamMac.mm:
+        (WebCore::closeCurrentStream):
+        (WebCore::advanceCurrentStream):
+        (WebCore::formCreate):
+        (WebCore::formRead):
+        (WebCore::setHTTPBody):
+
 2010-08-05  Xan Lopez  <xlopez@igalia.com>
 
         Reviewed by Gustavo Noronha.

diff --git a/WebCore/Configurations/FeatureDefines.xcconfig b/WebCore/Configurations/FeatureDefines.xcconfig
index 96eda36774ab287fc0c4cda1aef5418d3324cd81..f2b4c09e4da1ea177a84858cd5d701f6072b7ce7 100644 (file)
--- a/WebCore/Configurations/FeatureDefines.xcconfig
+++ b/WebCore/Configurations/FeatureDefines.xcconfig
@@ -46,8 +46,8 @@ ENABLE_3D_RENDERING_macosx_1050 = ENABLE_3D_RENDERING;
 ENABLE_3D_RENDERING_macosx_1060 = ENABLE_3D_RENDERING;
 ENABLE_3D_RENDERING_macosx_1070 = ENABLE_3D_RENDERING;
 
-ENABLE_BLOB_SLICE = $(ENABLE_BLOB_SLICE_$(REAL_PLATFORM_NAME));
-ENABLE_BLOB_SLICE_macosx = ENABLE_BLOB_SLICE;
+ENABLE_BLOB = $(ENABLE_BLOB_$(REAL_PLATFORM_NAME));
+ENABLE_BLOB_macosx = ENABLE_BLOB;
 
 ENABLE_CHANNEL_MESSAGING = $(ENABLE_CHANNEL_MESSAGING_$(REAL_PLATFORM_NAME));
 ENABLE_CHANNEL_MESSAGING_macosx = ENABLE_CHANNEL_MESSAGING;
@@ -69,9 +69,6 @@ ENABLE_EVENTSOURCE = ENABLE_EVENTSOURCE;
 ENABLE_FILTERS = $(ENABLE_FILTERS_$(REAL_PLATFORM_NAME));
 ENABLE_FILTERS_macosx = ENABLE_FILTERS;
 
-ENABLE_FILE_READER = $(ENABLE_FILE_READER_$(REAL_PLATFORM_NAME));
-ENABLE_FILE_READER_macosx = ENABLE_FILE_READER;
-
 ENABLE_FILE_WRITER = ;
 ENABLE_FILE_SYSTEM = ;
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
@@ -123,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_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_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_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);

diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 24ef312d2cd4b8db693eecec259dcbb24396735a..dc3754887cc1e773b0fddad53110c962d4ae21f2 100644 (file)
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -4310,20 +4310,12 @@ webcore_cppflags += -DENABLE_WEB_SOCKETS=0
 endif  # END ENABLE_WEB_SOCKETS
 
 # ---
-# Blob.slice support
+# Blob support
 # ---
-if ENABLE_BLOB_SLICE
-FEATURE_DEFINES += ENABLE_BLOB_SLICE=1
-webcore_cppflags += -DENABLE_BLOB_SLICE=1
-endif  # END ENABLE_BLOB_SLICE
-
-# ---
-# FileReader support
-# ---
-if ENABLE_FILE_READER
-FEATURE_DEFINES += ENABLE_FILE_READER=1
-webcore_cppflags += -DENABLE_FILE_READER=1
-endif  # END ENABLE_FILE_READER
+if ENABLE_BLOB
+FEATURE_DEFINES += ENABLE_BLOB=1
+webcore_cppflags += -DENABLE_BLOB=1
+endif  # END ENABLE_BLOB
 
 # ---
 # FileWriter support

diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri
index ce0f7012a35b78841c3bfb65d25da7e61887cd6c..b5817942b57e02a800b32444598ec59a94eeb5cb 100644 (file)
--- a/WebCore/WebCore.pri
+++ b/WebCore/WebCore.pri
@@ -67,7 +67,7 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) {
 !contains(DEFINES, ENABLE_SANDBOX=.): DEFINES += ENABLE_SANDBOX=1
 !contains(DEFINES, ENABLE_METER_TAG=.): DEFINES += ENABLE_METER_TAG=1
 !contains(DEFINES, ENABLE_PROGRESS_TAG=.): DEFINES += ENABLE_PROGRESS_TAG=1
-!contains(DEFINES, ENABLE_BLOB_SLICE=.): DEFINES += ENABLE_BLOB_SLICE=0
+!contains(DEFINES, ENABLE_BLOB=.): DEFINES += ENABLE_BLOB=0
 !contains(DEFINES, ENABLE_NOTIFICATIONS=.): DEFINES += ENABLE_NOTIFICATIONS=1
 !contains(DEFINES, ENABLE_IMAGE_RESIZER=.): DEFINES += ENABLE_IMAGE_RESIZER=0
 !contains(DEFINES, ENABLE_INPUT_SPEECH=.): DEFINES += ENABLE_INPUT_SPEECH=0

diff --git a/WebCore/bindings/js/JSEventTarget.cpp b/WebCore/bindings/js/JSEventTarget.cpp
index c5fce640adc758bc0f4c16c71d339c279b898070..c86845de0e97c12e85fcf14c4fbcb92098f4097f 100644 (file)
--- a/WebCore/bindings/js/JSEventTarget.cpp
+++ b/WebCore/bindings/js/JSEventTarget.cpp
@@ -88,7 +88,7 @@
 #include "WebSocket.h"
 #endif
 
-#if ENABLE(FILE_READER)
+#if ENABLE(BLOB)
 #include "JSFileReader.h"
 #include "FileReader.h"
 #endif
@@ -164,7 +164,7 @@ JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, EventTarget* targ
         return toJS(exec, webSocket);
 #endif
 
-#if ENABLE(FILE_READER)
+#if ENABLE(BLOB)
     if (FileReader* fileReader = target->toFileReader())
         return toJS(exec, globalObject, fileReader);
 #endif

diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp
index 4a09c348d0a7418251bc16cb89f16ad63e1a8b8b..d6f05f4a69cf5bee06812ebba9b26a49dd1006f1 100644 (file)
--- a/WebCore/bindings/v8/V8DOMWrapper.cpp
+++ b/WebCore/bindings/v8/V8DOMWrapper.cpp
@@ -423,7 +423,7 @@ v8::Handle<v8::Value> V8DOMWrapper::convertEventTargetToV8Object(EventTarget* ta
         return toV8(eventSource);
 #endif
 
-#if ENABLE(FILE_READER)
+#if ENABLE(BLOB)
     if (FileReader* fileReader = target->toFileReader())
         return toV8(fileReader);
 #endif

diff --git a/WebCore/dom/EventTarget.cpp b/WebCore/dom/EventTarget.cpp
index cb6be7aa93a0574c31b7c1685a94372bbe8f057e..42a153a691f43521e00c466a0f847d87dc773ffb 100644 (file)
--- a/WebCore/dom/EventTarget.cpp
+++ b/WebCore/dom/EventTarget.cpp
@@ -156,7 +156,7 @@ Notification* EventTarget::toNotification()
 }
 #endif
 
-#if ENABLE(FILE_READER)
+#if ENABLE(BLOB)
 FileReader* EventTarget::toFileReader()
 {
     return 0;

diff --git a/WebCore/dom/EventTarget.h b/WebCore/dom/EventTarget.h
index 0e8c343df4c0ee5b20170365901010cf76110810..1ff9031f39151dba6215903a2d600b7699420dba 100644 (file)
--- a/WebCore/dom/EventTarget.h
+++ b/WebCore/dom/EventTarget.h
@@ -120,7 +120,7 @@ namespace WebCore {
 #if ENABLE(NOTIFICATIONS)
         virtual Notification* toNotification();
 #endif
-#if ENABLE(FILE_READER)
+#if ENABLE(BLOB)
         virtual FileReader* toFileReader();
 #endif
 

diff --git a/WebCore/dom/ExceptionCode.h b/WebCore/dom/ExceptionCode.h
index ef73052d8164b1c548a31c695f878372bc1b32dc..ed15a2efd6e430daa05517d59a2c5d33acf04810 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(FILE_READER) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
         NOT_READABLE_ERR = 24,
         ENCODING_ERR = 26,
 #endif

diff --git a/WebCore/dom/ScriptExecutionContext.cpp b/WebCore/dom/ScriptExecutionContext.cpp
index 291243d2335c89cd130997c086c8c33c2362e675..f7ac603e61f91262362d6faa69e342a1bd48f832 100644 (file)
--- a/WebCore/dom/ScriptExecutionContext.cpp
+++ b/WebCore/dom/ScriptExecutionContext.cpp
@@ -31,7 +31,7 @@
 #include "Database.h"
 #include "DatabaseTask.h"
 #include "DatabaseThread.h"
-#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
 #include "FileThread.h"
 #endif
 #include "MessagePort.h"
@@ -86,7 +86,7 @@ ScriptExecutionContext::~ScriptExecutionContext()
         m_databaseThread = 0;
     }
 #endif
-#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
     if (m_fileThread) {
         m_fileThread->stop();
         m_fileThread = 0;
@@ -241,7 +241,7 @@ DOMTimer* ScriptExecutionContext::findTimeout(int timeoutId)
     return m_timeouts.get(timeoutId);
 }
 
-#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
 FileThread* ScriptExecutionContext::fileThread()
 {
     if (!m_fileThread) {

diff --git a/WebCore/dom/ScriptExecutionContext.h b/WebCore/dom/ScriptExecutionContext.h
index 4cd483ab1f537a7eaf61e8770c7a81153246aaff..2ec98aeff48a8d664d20b7b738a57dd18058416e 100644 (file)
--- a/WebCore/dom/ScriptExecutionContext.h
+++ b/WebCore/dom/ScriptExecutionContext.h
@@ -45,7 +45,7 @@ namespace WebCore {
     class DatabaseThread;
 #endif
     class DOMTimer;
-#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
     class FileThread;
 #endif
     class MessagePort;
@@ -129,7 +129,7 @@ namespace WebCore {
         JSC::JSGlobalData* globalData();
 #endif
 
-#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
         FileThread* fileThread();
         void stopFileThread();
 #endif
@@ -160,7 +160,7 @@ namespace WebCore {
         bool m_hasOpenDatabases; // This never changes back to false, even after the database thread is closed.
 #endif
 
-#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
         RefPtr<FileThread> m_fileThread;
 #endif
     };

diff --git a/WebCore/html/Blob.cpp b/WebCore/html/Blob.cpp
index a41fb2e0e537d9d9bcf12a0aba6fc9f1864b2fd6..977ffa6953b11439791e9cc5abb3e9c1463e22cf 100644 (file)
--- a/WebCore/html/Blob.cpp
+++ b/WebCore/html/Blob.cpp
@@ -70,7 +70,7 @@ const String& Blob::path() const
     return m_items[0]->toFileBlobItem()->path();
 }
 
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
 PassRefPtr<Blob> Blob::slice(ScriptExecutionContext* scriptExecutionContext, long long start, long long length, const String& contentType) const
 {
     if (start < 0)
@@ -97,6 +97,6 @@ PassRefPtr<Blob> Blob::slice(ScriptExecutionContext* scriptExecutionContext, lon
     }
     return Blob::create(scriptExecutionContext, contentType, items);
 }
-#endif // ENABLE(BLOB_SLICE)
+#endif // ENABLE(BLOB)
 
 } // namespace WebCore

diff --git a/WebCore/html/Blob.h b/WebCore/html/Blob.h
index 12ccca713ca9d41afb424d0129c54758eda32160..7afc7a0579dfc5e3df6386b2bc80ffd90fc84483 100644 (file)
--- a/WebCore/html/Blob.h
+++ b/WebCore/html/Blob.h
@@ -67,7 +67,7 @@ public:
 
     const BlobItemList& items() const { return m_items; }
 
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
     PassRefPtr<Blob> slice(ScriptExecutionContext*, long long start, long long length, const String& contentType = String()) const;
 #endif
 

diff --git a/WebCore/html/Blob.idl b/WebCore/html/Blob.idl
index 626bb73cc5da9dd6e1fda6a8951ddd5286cd29ab..e063b6de36908203e09868404e7447e6b090e38d 100644 (file)
--- a/WebCore/html/Blob.idl
+++ b/WebCore/html/Blob.idl
@@ -35,7 +35,7 @@ module html {
         readonly attribute DOMString type;
 
 #if !defined(LANGUAGE_OBJECTIVE_C)
-#if defined(ENABLE_BLOB_SLICE) && ENABLE_BLOB_SLICE
+#if defined(ENABLE_BLOB) && ENABLE_BLOB
         [CallWith=ScriptExecutionContext] Blob slice(in long long start, in long long length, in [Optional, ConvertUndefinedOrNullToNullString] DOMString contentType);
 #endif
 #endif

diff --git a/WebCore/html/FileError.h b/WebCore/html/FileError.h
index 8190883186f5e13b7eeaab4b58559a947ac9bc56..1c74c07726784650939a3104c35cc04330b16151 100644 (file)
--- a/WebCore/html/FileError.h
+++ b/WebCore/html/FileError.h
@@ -31,7 +31,7 @@
 #ifndef FileError_h
 #define FileError_h
 
-#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
 
 #include "ExceptionCode.h"
 #include <wtf/PassRefPtr.h>
@@ -55,6 +55,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
+#endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
 
 #endif // FileError_h

diff --git a/WebCore/html/FileError.idl b/WebCore/html/FileError.idl
index 555d103d9b32eb9710e2d38b501985827fb45be8..3423e7201767f901fb847b65db334b874ccf5f9e 100644 (file)
--- a/WebCore/html/FileError.idl
+++ b/WebCore/html/FileError.idl
@@ -30,7 +30,7 @@
 
 module html {
     interface [
-        Conditional=FILE_READER|FILE_WRITER,
+        Conditional=BLOB|FILE_WRITER,
         DontCheckEnums
     ] FileError {
 #if !defined(LANGUAGE_OBJECTIVE_C)

diff --git a/WebCore/html/FileReader.cpp b/WebCore/html/FileReader.cpp
index b44ec9d4997b6f59b5ff8fad9879c9efbbce7c93..88f218f31a5defed32ed5d0dec67f65a7fa5c3c2 100644 (file)
--- a/WebCore/html/FileReader.cpp
+++ b/WebCore/html/FileReader.cpp
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(FILE_READER)
+#if ENABLE(BLOB)
 
 #include "FileReader.h"
 
@@ -311,4 +311,4 @@ void FileReader::convertToDataURL()
 
 } // namespace WebCore
  
-#endif // ENABLE(FILE_READER)
+#endif // ENABLE(BLOB)

diff --git a/WebCore/html/FileReader.h b/WebCore/html/FileReader.h
index 80d425ca6c6f1c0f92927ee3475c6a6da52ac09a..5e0e601697244b307f133b80e80aaea8d8cbbd4c 100644 (file)
--- a/WebCore/html/FileReader.h
+++ b/WebCore/html/FileReader.h
@@ -31,7 +31,7 @@
 #ifndef FileReader_h
 #define FileReader_h
 
-#if ENABLE(FILE_READER)
+#if ENABLE(BLOB)
 
 #include "ActiveDOMObject.h"
 #include "EventTarget.h"
@@ -166,6 +166,6 @@ private:
 
 } // namespace WebCore
 
-#endif
+#endif // ENABLE(BLOB)
 
 #endif // FileReader_h

diff --git a/WebCore/html/FileReader.idl b/WebCore/html/FileReader.idl
index ad0e187dfd0b57fb804be6a49fa73a0fb2bca2c9..fb3b97922c857a24c3c1ba2d91101d55f7be6df9 100644 (file)
--- a/WebCore/html/FileReader.idl
+++ b/WebCore/html/FileReader.idl
@@ -30,7 +30,7 @@
 
 module html {
     interface [
-        Conditional=FILE_READER,
+        Conditional=BLOB,
         CanBeConstructed,
         CallWith=ScriptExecutionContext,
         EventTarget,

diff --git a/WebCore/html/FileStream.cpp b/WebCore/html/FileStream.cpp
index f859b63a1c1b34c36e74c09124fa0913f6af6704..abe7bad84979c609aabab863b4d2dfbb885a8074 100644 (file)
--- a/WebCore/html/FileStream.cpp
+++ b/WebCore/html/FileStream.cpp
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
 
 #include "FileStream.h"
 
@@ -98,7 +98,6 @@ void FileStream::openForRead(Blob* blob)
         return;
     }
 
-#if ENABLE(BLOB_SLICE)
     const FileRangeBlobItem* fileRangeItem = fileItem->toFileRangeBlobItem();
     if (fileRangeItem) {
         // Check the modificationt time for the possible file change.
@@ -115,7 +114,6 @@ void FileStream::openForRead(Blob* blob)
             }
         }
     }
-#endif
 
     // Get the size.
     m_totalBytesToRead = blob->size();
@@ -182,4 +180,4 @@ void FileStream::truncate(long long)
 
 } // namespace WebCore
 
-#endif // ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
+#endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)

diff --git a/WebCore/html/FileStream.h b/WebCore/html/FileStream.h
index 9d3f7b88d09257bc688c1a9a4b9647f72aac8fe0..a15cd59dd7fffbd16981acefb4feada441336e63 100644 (file)
--- a/WebCore/html/FileStream.h
+++ b/WebCore/html/FileStream.h
@@ -31,7 +31,7 @@
 #ifndef FileStream_h
 #define FileStream_h
 
-#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
 
 #include "FileStreamClient.h"
 #include "FileSystem.h"
@@ -73,6 +73,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
+#endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
 
 #endif // FileStream_h

diff --git a/WebCore/html/FileStreamClient.h b/WebCore/html/FileStreamClient.h
index 05c7df5ad47dd76ba8209467cf0ce8dad0db6d2d..2e7091fa4571f3941c5fb74dff62c433a1c7f236 100644 (file)
--- a/WebCore/html/FileStreamClient.h
+++ b/WebCore/html/FileStreamClient.h
@@ -31,7 +31,7 @@
 #ifndef FileStreamClient_h
 #define FileStreamClient_h
 
-#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
 
 #include "ExceptionCode.h"
 
@@ -58,6 +58,6 @@ protected:
 
 } // namespace WebCore
 
-#endif // ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
+#endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
 
 #endif // FileStreamClient_h

diff --git a/WebCore/html/FileStreamProxy.cpp b/WebCore/html/FileStreamProxy.cpp
index e2516df991b5a54434bd50f14a709392b681f2fb..e3b9e7927bf03d689c9875e313d5ca499c27d4c3 100644 (file)
--- a/WebCore/html/FileStreamProxy.cpp
+++ b/WebCore/html/FileStreamProxy.cpp
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
 
 #include "FileStreamProxy.h"
 
@@ -199,4 +199,4 @@ void FileStreamProxy::didStop()
 
 } // namespace WebCore
 
-#endif // ENABLE(FILE_WRITER)
+#endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)

diff --git a/WebCore/html/FileStreamProxy.h b/WebCore/html/FileStreamProxy.h
index 66d8cb31b4faad6860e7c1fdfaa308e38378b018..0bdbcee2acb4b5f2e77c0dd1ed1cadd0235f65ba 100644 (file)
--- a/WebCore/html/FileStreamProxy.h
+++ b/WebCore/html/FileStreamProxy.h
@@ -32,7 +32,7 @@
 #ifndef FileStreamProxy_h
 #define FileStreamProxy_h
 
-#if ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
+#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
 
 #include "FileStreamClient.h"
 #include <wtf/PassRefPtr.h>
@@ -87,6 +87,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(FILE_READER) || ENABLE(FILE_WRITER)
+#endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
 
 #endif // FileStreamProxy_h

diff --git a/WebCore/html/FileThread.cpp b/WebCore/html/FileThread.cpp
index 3a3413c0800f88cd8a11c68c08e46ad2812fe771..4e48cfb282db5188f9ef40db4968404a99a68578 100644 (file)
--- a/WebCore/html/FileThread.cpp
+++ b/WebCore/html/FileThread.cpp
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(FILE_WRITER) || ENABLE(FILE_READER)
+#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
 
 #include "FileThread.h"
 
@@ -116,4 +116,4 @@ void* FileThread::runLoop()
 
 } // namespace WebCore
 
-#endif // ENABLE(FILE_WRITER) || ENABLE(FILE_READER)
+#endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)

diff --git a/WebCore/html/FileThread.h b/WebCore/html/FileThread.h
index 2eba98e000a5434cae8f4ae5cedc8d0ada2e5c7b..16acacc4f2d518a277297971f0a2eeaa45b9c3d8 100644 (file)
--- a/WebCore/html/FileThread.h
+++ b/WebCore/html/FileThread.h
@@ -31,7 +31,7 @@
 #ifndef FileThread_h
 #define FileThread_h
 
-#if ENABLE(FILE_WRITER) || ENABLE(FILE_READER)
+#if ENABLE(BLOB) || ENABLE(FILE_WRITER)
 
 #include <wtf/MessageQueue.h>
 #include <wtf/PassOwnPtr.h>
@@ -83,6 +83,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(FILE_WRITER) || ENABLE(FILE_READER)
+#endif // ENABLE(BLOB) || ENABLE(FILE_WRITER)
 
 #endif // FileThread_h

diff --git a/WebCore/page/DOMWindow.idl b/WebCore/page/DOMWindow.idl
index b3522026d3fff7f4255d257e75fdfab582068657..dc1c3234abd2836c95fd53b005bea500127097da 100644 (file)
--- a/WebCore/page/DOMWindow.idl
+++ b/WebCore/page/DOMWindow.idl
@@ -747,10 +747,10 @@ module window {
 
         attribute DOMFormDataConstructor FormData;
 
-        attribute [Conditional=FILE_READER|FILE_WRITER] FileErrorConstructor FileError;
-        attribute [Conditional=FILE_READER] FileReaderConstructor FileReader;
+        attribute [Conditional=BLOB|FILE_WRITER] FileErrorConstructor FileError;
+        attribute [Conditional=BLOB] FileReaderConstructor FileReader;
 
-        attribute BlobBuilderConstructor BlobBuilder;
+        attribute [Conditional=BLOB] BlobBuilderConstructor BlobBuilder;
 
 #endif // defined(LANGUAGE_JAVASCRIPT)
 

diff --git a/WebCore/platform/BlobItem.cpp b/WebCore/platform/BlobItem.cpp
index cc5e6c79172bd8227c6952978731453c4148b183..591516d4a6ce8549b0068df6f23234ef3853c477 100644 (file)
--- a/WebCore/platform/BlobItem.cpp
+++ b/WebCore/platform/BlobItem.cpp
@@ -37,7 +37,7 @@
 
 namespace WebCore {
 
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
 static const double invalidModificationTime = 0;
 
 static double getFileSnapshotModificationTime(const String& path)
@@ -48,11 +48,11 @@ static double getFileSnapshotModificationTime(const String& path)
         return static_cast<double>(modificationTime);
     return invalidModificationTime;
 }
-#endif // ENABLE(BLOB_SLICE)
+#endif // ENABLE(BLOB)
 
 // DataBlobItem ----------------------------------------------------------------
 
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
 PassRefPtr<BlobItem> DataBlobItem::slice(long long start, long long length)
 {
     ASSERT(start >= 0 && length >= 0);
@@ -63,7 +63,7 @@ PassRefPtr<BlobItem> DataBlobItem::slice(long long start, long long length)
         length = size() - start;
     return DataRangeBlobItem::create(this, start, length);
 }
-#endif // ENABLE(BLOB_SLICE)
+#endif
 
 // FileBlobItem ----------------------------------------------------------------
 
@@ -101,7 +101,7 @@ unsigned long long FileBlobItem::size() const
     return static_cast<unsigned long long>(size);
 }
 
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
 PassRefPtr<BlobItem> FileBlobItem::slice(long long start, long long length)
 {
     ASSERT(start >= 0 && length >= 0);
@@ -115,7 +115,7 @@ PassRefPtr<BlobItem> FileBlobItem::slice(long long start, long long length)
     double modificationTime = fileRangeItem ? fileRangeItem->snapshotModificationTime() : getFileSnapshotModificationTime(path());
     return FileRangeBlobItem::create(path(), start, length, modificationTime);
 }
-#endif // ENABLE(BLOB_SLICE)
+#endif // ENABLE(BLOB)
 
 // StringBlobItem --------------------------------------------------------------
 
@@ -141,7 +141,7 @@ ByteArrayBlobItem::ByteArrayBlobItem(const char* data, size_t size)
     m_bytesArray.append(data, size);
 }
 
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
 
 // DataRangeBlobItem -----------------------------------------------------------
 
@@ -187,6 +187,6 @@ FileRangeBlobItem::FileRangeBlobItem(const String& path, long long start, long l
     m_uniqueName.replace("-", ""); // For safty, remove '-' from the filename snce some servers may not like it.
 }
 
-#endif // ENABLE(BLOB_SLICE)
+#endif // ENABLE(BLOB)
 
 } // namespace WebCore

diff --git a/WebCore/platform/BlobItem.h b/WebCore/platform/BlobItem.h
index 3741f3ff459d0bd6bdbc1b8c94498cbeb9907a44..42ece9224555d8a51ffce6a8a8bab87451f746d8 100644 (file)
--- a/WebCore/platform/BlobItem.h
+++ b/WebCore/platform/BlobItem.h
@@ -70,13 +70,13 @@ public:
     virtual const StringBlobItem* toStringBlobItem() const { return 0; }
     virtual const ByteArrayBlobItem* toByteArrayBlobItem() const { return 0; }
     virtual const FileBlobItem* toFileBlobItem() const { return 0; }
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
     virtual const DataRangeBlobItem* toDataRangeBlobItem() const { return 0; }
     virtual const FileRangeBlobItem* toFileRangeBlobItem() const { return 0; }
 
     // Note: no external methods except for Blob::slice should call this.
     virtual PassRefPtr<BlobItem> slice(long long start, long long length) = 0;
-#endif // ENABLE(BLOB_SLICE)
+#endif // ENABLE(BLOB)
 
 protected:
     BlobItem() { }
@@ -90,9 +90,9 @@ public:
 
     // BlobItem methods.
     virtual const DataBlobItem* toDataBlobItem() const { return this; }
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
     virtual PassRefPtr<BlobItem> slice(long long start, long long length);
-#endif // ENABLE(BLOB_SLICE)
+#endif // ENABLE(BLOB)
 };
 
 class FileBlobItem : public BlobItem {
@@ -110,9 +110,9 @@ public:
     // BlobItem methods.
     virtual unsigned long long size() const;
     virtual const FileBlobItem* toFileBlobItem() const { return this; }
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
     virtual PassRefPtr<BlobItem> slice(long long start, long long length);
-#endif // ENABLE(BLOB_SLICE)
+#endif // ENABLE(BLOB)
 
 protected:
     FileBlobItem(const String& path);
@@ -159,7 +159,7 @@ private:
     Vector<char> m_bytesArray;
 };
 
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
 
 // BlobItem class for sliced data (string or bytes-array).
 class DataRangeBlobItem : public DataBlobItem {
@@ -202,7 +202,7 @@ private:
     double m_snapshotModificationTime;
 };
 
-#endif // ENABLE(BLOB_SLICE)
+#endif // ENABLE(BLOB)
 
 } // namespace WebCore
 

diff --git a/WebCore/platform/network/FormData.cpp b/WebCore/platform/network/FormData.cpp
index 80f17da6934b66af5877ef9f6ea93f1c5063bae4..31506ea2f5dd72dd060ad686229c814bbe636025 100644 (file)
--- a/WebCore/platform/network/FormData.cpp
+++ b/WebCore/platform/network/FormData.cpp
@@ -34,7 +34,7 @@
 
 namespace WebCore {
 
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
 const long long FormDataElement::toEndOfFile = -1;
 const double FormDataElement::doNotCheckFileChange = 0;
 #endif
@@ -133,7 +133,7 @@ PassRefPtr<FormData> FormData::deepCopy() const
             formData->m_elements.append(FormDataElement(e.m_data));
             break;
         case FormDataElement::encodedFile:
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
             formData->m_elements.append(FormDataElement(e.m_filename, e.m_fileStart, e.m_fileLength, e.m_expectedFileModificationTime, e.m_shouldGenerateFile));
 #else
             formData->m_elements.append(FormDataElement(e.m_filename, e.m_shouldGenerateFile));
@@ -156,7 +156,7 @@ void FormData::appendData(const void* data, size_t size)
 
 void FormData::appendFile(const String& filename, bool shouldGenerateFile)
 {
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
     m_elements.append(FormDataElement(filename, 0, FormDataElement::toEndOfFile, FormDataElement::doNotCheckFileChange, shouldGenerateFile));
 #else
     m_elements.append(FormDataElement(filename, shouldGenerateFile));
@@ -184,7 +184,7 @@ void FormData::appendItem(const BlobItem* item, bool shouldGenerateFile)
         return;
     }
 
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
     const FileRangeBlobItem* fileRangeItem = item->toFileRangeBlobItem();
     if (fileRangeItem) {
         appendFileRange(fileItem->path(), fileRangeItem->start(), fileRangeItem->size(), fileRangeItem->snapshotModificationTime(), shouldGenerateFile);
@@ -195,7 +195,7 @@ void FormData::appendItem(const BlobItem* item, bool shouldGenerateFile)
     appendFile(fileItem->path(), shouldGenerateFile);
 }
 
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
 void FormData::appendFileRange(const String& filename, long long start, long long length, double expectedModificationTime, bool shouldGenerateFile)
 {
     m_elements.append(FormDataElement(filename, start, length, expectedModificationTime, shouldGenerateFile));
@@ -245,7 +245,7 @@ void FormData::appendKeyValuePairItems(const BlobItemList& items, const TextEnco
                 FormDataBuilder::addFilenameToMultiPartHeader(header, encoding, fileName);
 
                 // If the item is sliced from a file, do not add the content type.
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
                 if (!fileName.isEmpty() && !value->toFileRangeBlobItem()) {
 #else
                 if (!fileName.isEmpty()) {

diff --git a/WebCore/platform/network/FormData.h b/WebCore/platform/network/FormData.h
index 95eb2582b331b68b93c32b1663699e3214c10569..fdb27f224e7edc5e95b9324740e7f1d8b3c5e73c 100644 (file)
--- a/WebCore/platform/network/FormData.h
+++ b/WebCore/platform/network/FormData.h
@@ -36,7 +36,7 @@ public:
     FormDataElement() : m_type(data) { }
     FormDataElement(const Vector<char>& array) : m_type(data), m_data(array) { }
 
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
     FormDataElement(const String& filename, long long fileStart, long long fileLength, double expectedFileModificationTime, bool shouldGenerateFile) : m_type(encodedFile), m_filename(filename), m_fileStart(fileStart), m_fileLength(fileLength), m_expectedFileModificationTime(expectedFileModificationTime), m_shouldGenerateFile(shouldGenerateFile) { }
 #else
     FormDataElement(const String& filename, bool shouldGenerateFile) : m_type(encodedFile), m_filename(filename), m_shouldGenerateFile(shouldGenerateFile) { }
@@ -45,7 +45,7 @@ public:
     enum { data, encodedFile } m_type;
     Vector<char> m_data;
     String m_filename;
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
     long long m_fileStart;
     long long m_fileLength;
     double m_expectedFileModificationTime;
@@ -53,7 +53,7 @@ public:
     String m_generatedFilename;
     bool m_shouldGenerateFile;
 
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
     static const long long toEndOfFile;
     static const double doNotCheckFileChange;
 #endif
@@ -68,7 +68,7 @@ inline bool operator==(const FormDataElement& a, const FormDataElement& b)
         return false;
     if (a.m_data != b.m_data)
         return false;
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
     if (a.m_filename != b.m_filename || a.m_fileStart != b.m_fileStart || a.m_fileLength != b.m_fileLength || a.m_expectedFileModificationTime != b.m_expectedFileModificationTime)
 #else
     if (a.m_filename != b.m_filename)
@@ -98,7 +98,7 @@ public:
     void appendData(const void* data, size_t);
     void appendItems(const BlobItemList&);
     void appendFile(const String& filename, bool shouldGenerateFile = false);
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
     void appendFileRange(const String& filename, long long start, long long length, double expectedModificationTime, bool shouldGenerateFile = false);
 #endif
 

diff --git a/WebCore/platform/network/mac/FormDataStreamMac.mm b/WebCore/platform/network/mac/FormDataStreamMac.mm
index db2e13b045c32d9cb4ee6dcb7aaccb2a840784bf..c7bd2e749d9dec9e9b0afcf67915e922c9acc071 100644 (file)
--- a/WebCore/platform/network/mac/FormDataStreamMac.mm
+++ b/WebCore/platform/network/mac/FormDataStreamMac.mm
@@ -124,7 +124,7 @@ struct FormStreamFields {
     SchedulePairHashSet scheduledRunLoopPairs;
     Vector<FormDataElement> remainingElements; // in reverse order
     CFReadStreamRef currentStream;
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
     long long currentStreamRangeLength;
 #endif
     char* currentData;
@@ -140,7 +140,7 @@ static void closeCurrentStream(FormStreamFields *form)
         CFReadStreamSetClient(form->currentStream, kCFStreamEventNone, NULL, NULL);
         CFRelease(form->currentStream);
         form->currentStream = NULL;
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
         form->currentStreamRangeLength = FormDataElement::toEndOfFile;
 #endif
     }
@@ -167,7 +167,7 @@ static bool advanceCurrentStream(FormStreamFields* form)
         form->currentStream = CFReadStreamCreateWithBytesNoCopy(0, reinterpret_cast<const UInt8*>(data), size, kCFAllocatorNull);
         form->currentData = data;
     } else {
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
         // Check if the file has been changed or not if required.
         if (nextInput.m_expectedFileModificationTime != FormDataElement::doNotCheckFileChange) {
             time_t fileModificationTime;
@@ -183,7 +183,7 @@ static bool advanceCurrentStream(FormStreamFields* form)
             // The file must have been removed or become unreadable.
             return false;
         }
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
         if (nextInput.m_fileStart > 0) {
             CFNumberRef position = CFNumberCreate(0, kCFNumberLongLongType, &nextInput.m_fileStart);
             CFReadStreamSetProperty(form->currentStream, kCFStreamPropertyFileCurrentOffset, position);
@@ -224,7 +224,7 @@ static void* formCreate(CFReadStreamRef stream, void* context)
 
     FormStreamFields* newInfo = new FormStreamFields;
     newInfo->currentStream = NULL;
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
     newInfo->currentStreamRangeLength = FormDataElement::toEndOfFile;
 #endif
     newInfo->currentData = 0;
@@ -272,7 +272,7 @@ static CFIndex formRead(CFReadStreamRef stream, UInt8* buffer, CFIndex bufferLen
 
     while (form->currentStream) {
         CFIndex bytesToRead = bufferLength;
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
         if (form->currentStreamRangeLength != FormDataElement::toEndOfFile && form->currentStreamRangeLength < bytesToRead)
             bytesToRead = static_cast<CFIndex>(form->currentStreamRangeLength);
 #endif
@@ -285,7 +285,7 @@ static CFIndex formRead(CFReadStreamRef stream, UInt8* buffer, CFIndex bufferLen
             error->error = 0;
             *atEOF = FALSE;
             form->bytesSent += bytesRead;
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
             if (form->currentStreamRangeLength != FormDataElement::toEndOfFile)
                 form->currentStreamRangeLength -= bytesRead;
 #endif
@@ -401,7 +401,7 @@ void setHTTPBody(NSMutableURLRequest *request, PassRefPtr<FormData> formData)
         if (element.m_type == FormDataElement::data)
             length += element.m_data.size();
         else {
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
             // If we're sending the file range, use the existing range length for now. We will detect if the file has been changed right before we read the file and abort the operation if necessary.
             if (element.m_fileLength != FormDataElement::toEndOfFile) {
                 length += element.m_fileLength;

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 0bc66eb7e3a690482d91afa6fc597e8223501821..20b72c8804fa00ecca1b448a56192626e5dc26eb 100644 (file)
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-05  Jian Li  <jianli@chromium.org>
+
+        Reviewed by David Levin.
+
+        Unify blob related feature defines to ENABLE(BLOB).
+        https://bugs.webkit.org/show_bug.cgi?id=43081
+
+        * features.gypi:
+        * src/WebHTTPBody.cpp:
+        (WebKit::WebHTTPBody::elementAt):
+        (WebKit::WebHTTPBody::appendFileRange):
+
 2010-08-05  Nico Weber  <thakis@chromium.org>
 
         Reviewed by Jeremy Orlow.

diff --git a/WebKit/chromium/features.gypi b/WebKit/chromium/features.gypi
index 559ebd825a9eafc4b1df3fc6acfa38cafa409f99..9b758f9d66386cee35046fe83a1b8b5954b7cc8b 100644 (file)
--- a/WebKit/chromium/features.gypi
+++ b/WebKit/chromium/features.gypi
@@ -40,7 +40,7 @@
       # features_override.gypi inline documentation for more details.
       'feature_defines%': [
         'ENABLE_3D_CANVAS=1',
-        'ENABLE_BLOB_SLICE=1',
+        'ENABLE_BLOB=1',
         'ENABLE_CHANNEL_MESSAGING=1',
         'ENABLE_DASHBOARD_SUPPORT=0',
         'ENABLE_DATABASE=1',
@@ -49,7 +49,6 @@
         'ENABLE_DIRECTORY_UPLOAD=1',
         'ENABLE_DOM_STORAGE=1',
         'ENABLE_EVENTSOURCE=1',
-        'ENABLE_FILE_READER=1',
         'ENABLE_FILE_WRITER=1',
         'ENABLE_FILE_SYSTEM=1',
         'ENABLE_FILTERS=1',

diff --git a/WebKit/chromium/src/WebHTTPBody.cpp b/WebKit/chromium/src/WebHTTPBody.cpp
index d062576e981dac229e92c9a5c2b569841d4e767d..fa7538761bf5000198b8746969b9a32c570cc5ee 100644 (file)
--- a/WebKit/chromium/src/WebHTTPBody.cpp
+++ b/WebKit/chromium/src/WebHTTPBody.cpp
@@ -79,7 +79,7 @@ bool WebHTTPBody::elementAt(size_t index, Element& result) const
         result.type = Element::TypeData;
         result.data.assign(element.m_data.data(), element.m_data.size());
         result.filePath.reset();
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
         result.fileStart = 0;
         result.fileLength = 0;
         result.fileInfo.modificationTime = 0.0;
@@ -89,7 +89,7 @@ bool WebHTTPBody::elementAt(size_t index, Element& result) const
         result.type = Element::TypeFile;
         result.data.reset();
         result.filePath = element.m_filename;
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
         result.fileStart = element.m_fileStart;
         result.fileLength = element.m_fileLength;
         result.fileInfo.modificationTime = element.m_expectedFileModificationTime;
@@ -123,7 +123,7 @@ void WebHTTPBody::appendFile(const WebString& filePath)
 
 void WebHTTPBody::appendFileRange(const WebString& filePath, long long fileStart, long long fileLength, const WebFileInfo& fileInfo)
 {
-#if ENABLE(BLOB_SLICE)
+#if ENABLE(BLOB)
     ensureMutable();
     m_private->appendFileRange(filePath, fileStart, fileLength, fileInfo.modificationTime);
 #endif

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 31b8a0ae43bf4ca4a18200e6f09ae310b5713bc8..74a70dfa11672d71d48cd6e161a9e807173a1695 100644 (file)
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-05  Jian Li  <jianli@chromium.org>
+
+        Reviewed by David Levin.
+
+        Unify blob related feature defines to ENABLE(BLOB).
+        https://bugs.webkit.org/show_bug.cgi?id=43081
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2010-08-03  Joseph Pecoraro  <joepeck@webkit.org>
 
         Reviewed by David Kilzer.

diff --git a/WebKit/mac/Configurations/FeatureDefines.xcconfig b/WebKit/mac/Configurations/FeatureDefines.xcconfig
index 96eda36774ab287fc0c4cda1aef5418d3324cd81..f2b4c09e4da1ea177a84858cd5d701f6072b7ce7 100644 (file)
--- a/WebKit/mac/Configurations/FeatureDefines.xcconfig
+++ b/WebKit/mac/Configurations/FeatureDefines.xcconfig
@@ -46,8 +46,8 @@ ENABLE_3D_RENDERING_macosx_1050 = ENABLE_3D_RENDERING;
 ENABLE_3D_RENDERING_macosx_1060 = ENABLE_3D_RENDERING;
 ENABLE_3D_RENDERING_macosx_1070 = ENABLE_3D_RENDERING;
 
-ENABLE_BLOB_SLICE = $(ENABLE_BLOB_SLICE_$(REAL_PLATFORM_NAME));
-ENABLE_BLOB_SLICE_macosx = ENABLE_BLOB_SLICE;
+ENABLE_BLOB = $(ENABLE_BLOB_$(REAL_PLATFORM_NAME));
+ENABLE_BLOB_macosx = ENABLE_BLOB;
 
 ENABLE_CHANNEL_MESSAGING = $(ENABLE_CHANNEL_MESSAGING_$(REAL_PLATFORM_NAME));
 ENABLE_CHANNEL_MESSAGING_macosx = ENABLE_CHANNEL_MESSAGING;
@@ -69,9 +69,6 @@ ENABLE_EVENTSOURCE = ENABLE_EVENTSOURCE;
 ENABLE_FILTERS = $(ENABLE_FILTERS_$(REAL_PLATFORM_NAME));
 ENABLE_FILTERS_macosx = ENABLE_FILTERS;
 
-ENABLE_FILE_READER = $(ENABLE_FILE_READER_$(REAL_PLATFORM_NAME));
-ENABLE_FILE_READER_macosx = ENABLE_FILE_READER;
-
 ENABLE_FILE_WRITER = ;
 ENABLE_FILE_SYSTEM = ;
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
@@ -123,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_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_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_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);

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 48121283251c1fec42aeebca090148c7d701d242..c361658c7f0d2bb0ace530f1f82b91ae1812591b 100644 (file)
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-05  Jian Li  <jianli@chromium.org>
+
+        Reviewed by David Levin.
+
+        Unify blob related feature defines to ENABLE(BLOB).
+        https://bugs.webkit.org/show_bug.cgi?id=43081
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2010-08-05  Balazs Kelemen  <kb@inf.u-szeged.hu>
 
         Rubber-stamped by Kenneth Rohde Christiansen.

diff --git a/WebKit2/Configurations/FeatureDefines.xcconfig b/WebKit2/Configurations/FeatureDefines.xcconfig
index 4966cd3e1307f4f97ae54555ba2410e357288838..3017ce5c4d31d242f05ad0e269d3dea434fc43b5 100644 (file)
--- a/WebKit2/Configurations/FeatureDefines.xcconfig
+++ b/WebKit2/Configurations/FeatureDefines.xcconfig
@@ -46,8 +46,8 @@ ENABLE_3D_RENDERING_macosx_1050 = ENABLE_3D_RENDERING;
 ENABLE_3D_RENDERING_macosx_1060 = ENABLE_3D_RENDERING;
 ENABLE_3D_RENDERING_macosx_1070 = ENABLE_3D_RENDERING;
 
-ENABLE_BLOB_SLICE = $(ENABLE_BLOB_SLICE_$(REAL_PLATFORM_NAME));
-ENABLE_BLOB_SLICE_macosx = ENABLE_BLOB_SLICE;
+ENABLE_BLOB = $(ENABLE_BLOB_$(REAL_PLATFORM_NAME));
+ENABLE_BLOB_macosx = ENABLE_BLOB;
 
 ENABLE_CHANNEL_MESSAGING = $(ENABLE_CHANNEL_MESSAGING_$(REAL_PLATFORM_NAME));
 ENABLE_CHANNEL_MESSAGING_macosx = ENABLE_CHANNEL_MESSAGING;
@@ -69,9 +69,6 @@ ENABLE_EVENTSOURCE = ENABLE_EVENTSOURCE;
 ENABLE_FILTERS = $(ENABLE_FILTERS_$(REAL_PLATFORM_NAME));
 ENABLE_FILTERS_macosx = ENABLE_FILTERS;
 
-ENABLE_FILE_READER = $(ENABLE_FILE_READER_$(REAL_PLATFORM_NAME));
-ENABLE_FILE_READER_macosx = ENABLE_FILE_READER;
-
 ENABLE_FILE_WRITER = ;
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 
@@ -122,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_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);
+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);

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 31ad59cb67891d9d3db7f8234c62205797b92404..3d603d9c1289acd9038d44e5c71ce9eff0bc950b 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-05  Jian Li  <jianli@chromium.org>
+
+        Reviewed by David Levin.
+
+        Unify blob related feature defines to ENABLE(BLOB).
+        https://bugs.webkit.org/show_bug.cgi?id=43081
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
 2010-08-04  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Darin Adler.

diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
index 1340e4709b273d43a529167754ecb2c3655a958d..73622e154d152ba518d706d192119905fa6a7af8 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_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_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_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)"
        />
   <UserMacro
                Name="ENABLE_3D_CANVAS"
@@ -22,7 +22,7 @@
                PerformEnvironmentSet="true"
        />
   <UserMacro
-               Name="ENABLE_BLOB_SLICE"
+               Name="ENABLE_BLOB"
                Value=""
                PerformEnvironmentSet="true"
        />
@@ -76,11 +76,6 @@
                Value="ENABLE_FILTERS"
                PerformEnvironmentSet="true"
        />
-  <UserMacro
-               Name="ENABLE_FILE_READER"
-               Value=""
-               PerformEnvironmentSet="true"
-       />
   <UserMacro
                Name="ENABLE_FILE_WRITER"
                Value=""

diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
index 4fda17cd4524083b23a09c9778154cfa49c4f50b..f3c5b94c7809bdaff744ac1567f4425f2503ffff 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_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_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_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)"
        />
   <UserMacro
                Name="ENABLE_3D_CANVAS"
@@ -22,7 +22,7 @@
                PerformEnvironmentSet="true"
        />
   <UserMacro
-               Name="ENABLE_BLOB_SLICE"
+               Name="ENABLE_BLOB"
                Value=""
                PerformEnvironmentSet="true"
        />
@@ -76,11 +76,6 @@
                Value="ENABLE_FILTERS"
                PerformEnvironmentSet="true"
        />
-  <UserMacro
-               Name="ENABLE_FILE_READER"
-               Value=""
-               PerformEnvironmentSet="true"
-       />
   <UserMacro
                Name="ENABLE_FILE_WRITER"
                Value=""

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 16eddfb737fb296c0d5c5966431a5450a529edb1..656a076abefbebe09d6378edd81fe8660b9edfce 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-05  Jian Li  <jianli@chromium.org>
+
+        Reviewed by David Levin.
+
+        Unify blob related feature defines to ENABLE(BLOB).
+        https://bugs.webkit.org/show_bug.cgi?id=43081
+
+        * Scripts/build-webkit:
+
 2010-08-05  Satish Sampath  <satish@chromium.org>
 
         Reviewed by Jeremy Orlow.

diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index a260ee84355b36f45eadcc5edce9035a2fd8fd18..3b8dd9c6925ddca30002f7956a628ec4ee802b69 100755 (executable)
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -60,8 +60,8 @@ my ($linkPrefetchSupport, $threeDCanvasSupport, $threeDRenderingSupport, $channe
     $javaScriptDebuggerSupport, $mathmlSupport, $offlineWebApplicationSupport, $rubySupport, $systemMallocSupport, $sandboxSupport, $sharedWorkersSupport,
     $svgSupport, $svgAnimationSupport, $svgAsImageSupport, $svgDOMObjCBindingsSupport, $svgFontsSupport,
     $svgForeignObjectSupport, $svgUseSupport, $videoSupport, $webSocketsSupport, $webTimingSupport, $wmlSupport, $wcssSupport, $xhtmlmpSupport, $workersSupport,
-    $xpathSupport, $xsltSupport, $coverageSupport, $notificationsSupport, $blobSliceSupport, $tiledBackingStoreSupport,
-    $fileReaderSupport, $fileWriterSupport, $fileSystemSupport, $directoryUploadSupport, $deviceOrientationSupport);
+    $xpathSupport, $xsltSupport, $coverageSupport, $notificationsSupport, $blobSupport, $tiledBackingStoreSupport,
+    $fileWriterSupport, $fileSystemSupport, $directoryUploadSupport, $deviceOrientationSupport);
 
 my @features = (
     { option => "link-prefetch", desc => "Toggle pre fetching support",
@@ -73,8 +73,8 @@ my @features = (
     { option => "3d-rendering", desc => "Toggle 3D rendering support",
       define => "ENABLE_3D_RENDERING", default => (isAppleMacWebKit() && !isTiger()), value => \$threeDRenderingSupport },
 
-    { option => "blob-slice", desc => "Toggle Blob.slice support",
-      define => "ENABLE_BLOB_SLICE", default => (isAppleMacWebKit()), value => \$blobSliceSupport },
+    { option => "blob", desc => "Toggle Blob support",
+      define => "ENABLE_BLOB", default => (isAppleMacWebKit()), value => \$blobSupport },
 
     { option => "channel-messaging", desc => "Toggle MessageChannel and MessagePort support",
       define => "ENABLE_CHANNEL_MESSAGING", default => 1, value => \$channelMessagingSupport },
@@ -196,9 +196,6 @@ my @features = (
     { option => "xslt", desc => "Toggle XSLT support",
       define => "ENABLE_XSLT", default => 1, value => \$xsltSupport },
 
-    { option => "file-reader", desc => "Toggle FileReader support",
-      define => "ENABLE_FILE_READER", default => isAppleWebKit(), value => \$fileReaderSupport },
-
     { option => "file-writer", desc => "Toggle FileWriter support",
       define => "ENABLE_FILE_WRITER", default => 0, value => \$fileWriterSupport },
 

diff --git a/cmakeconfig.h.cmake b/cmakeconfig.h.cmake
index 14f7a806987b988344d35fdfc0d09d869b3e7873..b605bb908dd6cbd34d3ff86362e2678ff297af10 100644 (file)
--- a/cmakeconfig.h.cmake
+++ b/cmakeconfig.h.cmake
@@ -2,7 +2,7 @@
 #define CMAKECONFIG_H
 
 #define ENABLE_AS_IMAGE @ENABLE_AS_IMAGE_VALUE@
-#define ENABLE_BLOB_SLICE @ENABLE_BLOB_SLICE_VALUE@
+#define ENABLE_BLOB @ENABLE_BLOB_VALUE@
 #define ENABLE_CHANNEL_MESSAGING @ENABLE_CHANNEL_MESSAGING_VALUE@
 #define ENABLE_DATABASE @ENABLE_DATABASE_VALUE@
 #define ENABLE_DATAGRID @ENABLE_DATAGRID_VALUE@

diff --git a/configure.ac b/configure.ac
index 204d8fbdc2d66386f04b3b85466d66e327ee8af8..365de7266fe0b649457b86d715714a00d50bcb1f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -630,13 +630,13 @@ AC_ARG_ENABLE(web_timing,
               [],[enable_web_timing="no"])
 AC_MSG_RESULT([$enable_web_timing])
 
-# check whether to enable Blob.slice support
-AC_MSG_CHECKING([whether to enable Blob.slice support])
-AC_ARG_ENABLE(blob_slice,
-              AC_HELP_STRING([--enable-blob-slice],
-                             [enable support for Blob.slice [default=no]]),
-              [],[enable_blob_slice="no"])
-AC_MSG_RESULT([$enable_blob_slice])
+# check whether to enable Blob support
+AC_MSG_CHECKING([whether to enable Blob support])
+AC_ARG_ENABLE(blob,
+              AC_HELP_STRING([--enable-blob],
+                             [enable support for Blob [default=no]]),
+              [],[enable_blob="no"])
+AC_MSG_RESULT([$enable_blob])
 
 # check whether to enable Fast Mobile Scrolling support
 AC_MSG_CHECKING([whether to enable Fast Mobile Scrolling])
@@ -646,14 +646,6 @@ AC_ARG_ENABLE(fast_mobile_scrolling,
               [],[enable_fast_mobile_scrolling="no"])
 AC_MSG_RESULT([$enable_fast_mobile_scrolling])
 
-# check whether to enable FileReader support
-AC_MSG_CHECKING([whether to enable FileReader support])
-AC_ARG_ENABLE(file_reader,
-              AC_HELP_STRING([--enable-file-reader],
-                             [enable support for FileReader [default=no]]),
-              [],[enable_file_reader="no"])
-AC_MSG_RESULT([$enable_file_reader])
-
 # check whether to enable FileWriter support
 AC_MSG_CHECKING([whether to enable FileWriter support])
 AC_ARG_ENABLE(file_writer,
@@ -885,7 +877,7 @@ AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"])
 # WebKit feature conditionals
 AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"])
 AM_CONDITIONAL([ENABLE_3D_TRANSFORMS],[test "$enable_3D_transforms" = "yes"])
-AM_CONDITIONAL([ENABLE_BLOB_SLICE],[test "$enable_blob_slice" = "yes"])
+AM_CONDITIONAL([ENABLE_BLOB],[test "$enable_blob" = "yes"])
 AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"])
 AM_CONDITIONAL([ENABLE_JAVASCRIPT_DEBUGGER],[test "$enable_javascript_debugger" = "yes"])
 AM_CONDITIONAL([ENABLE_OFFLINE_WEB_APPLICATIONS],[test "$enable_offline_web_applications" = "yes"])
@@ -904,7 +896,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_READER],[test "$enable_file_reader" = "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"])
@@ -961,12 +952,11 @@ Build configuration:
  Optimized memory allocator                               : $enable_fast_malloc
 Features:
  3D Transforms                                            : $enable_3D_transforms
- Blob.slice support                                       : $enable_blob_slice
+ Blob support                                             : $enable_blob
  Directory upload                                         : $enable_directory_upload
  Fast Mobile Scrolling                                    : $enable_fast_mobile_scrolling
  JIT compilation                                          : $enable_jit
  Filters support                                          : $enable_filters
- FileReader support                                       : $enable_file_reader
  FileWriter support                                       : $enable_file_writer
  Geolocation support                                      : $enable_geolocation
  JavaScript debugger/profiler support                     : $enable_javascript_debugger