Remove BLOB guards
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 May 2014 14:27:18 +0000 (14:27 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 May 2014 14:27:18 +0000 (14:27 +0000)
https://bugs.webkit.org/show_bug.cgi?id=132863

Patch by Tibor Meszaros <tmeszaros.u-szeged@partner.samsung.com> on 2014-05-27
Reviewed by Csaba Osztrogonác.

.:
* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmakeconfig.h.cmake:

Source/JavaScriptCore:
* Configurations/FeatureDefines.xcconfig:

Source/WebCore:
* Configurations/FeatureDefines.xcconfig:
* Modules/websockets/WebSocketChannel.cpp:
(WebCore::WebSocketChannel::WebSocketChannel):
(WebCore::WebSocketChannel::didFail):
(WebCore::WebSocketChannel::processOutgoingFrameQueue):
(WebCore::WebSocketChannel::abortOutgoingFrameQueue):
* Modules/websockets/WebSocketChannel.h:
* WebCore.exp.in:
* WebCore.vcxproj/WebCore.vcxproj:
* bindings/js/JSBlobCustom.cpp:
(WebCore::JSBlobConstructor::constructJSBlob):
* bindings/js/JSFileReaderCustom.cpp:
* dom/DOMExceptions.in:
* dom/EventTargetFactory.in:
* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::publicURLManager):
* dom/ScriptExecutionContext.h:
* fileapi/AsyncFileStream.cpp:
* fileapi/AsyncFileStream.h:
* fileapi/Blob.cpp:
(WebCore::Blob::Blob):
* fileapi/Blob.h:
(WebCore::Blob::slice):
* fileapi/Blob.idl:
* fileapi/FileError.h:
* fileapi/FileError.idl:
* fileapi/FileException.cpp:
* fileapi/FileException.h:
* fileapi/FileException.idl:
* fileapi/FileReader.cpp:
* fileapi/FileReader.h:
* fileapi/FileReader.idl:
* fileapi/FileReaderLoader.cpp:
* fileapi/FileReaderLoader.h:
* fileapi/FileReaderLoaderClient.h:
* fileapi/FileReaderSync.cpp:
* fileapi/FileReaderSync.h:
* fileapi/FileReaderSync.idl:
* fileapi/FileThread.cpp:
* fileapi/FileThread.h:
* fileapi/ThreadableBlobRegistry.cpp:
(WebCore::ThreadableBlobRegistry::registerFileBlobURL): Deleted.
(WebCore::ThreadableBlobRegistry::registerBlobURL): Deleted.
(WebCore::ThreadableBlobRegistry::registerBlobURLForSlice): Deleted.
(WebCore::ThreadableBlobRegistry::unregisterBlobURL): Deleted.
(WebCore::ThreadableBlobRegistry::blobSize): Deleted.
(WebCore::ThreadableBlobRegistry::getCachedOrigin): Deleted.
* fileapi/WebKitBlobBuilder.cpp:
(WebCore::BlobBuilder::append):
* fileapi/WebKitBlobBuilder.h:
* html/DOMURL.cpp:
* html/DOMURL.h:
* html/DOMURL.idl:
* html/PublicURLManager.cpp:
* html/PublicURLManager.h:
* loader/LoaderStrategy.cpp:
(WebCore::LoaderStrategy::createBlobRegistry):
* loader/LoaderStrategy.h:
* page/DOMWindow.idl:
* page/SecurityOrigin.cpp:
(WebCore::SecurityOrigin::shouldUseInnerURL):
(WebCore::getCachedOrigin):
* platform/FileStream.cpp:
* platform/FileStream.h:
* platform/FileStreamClient.h:
* platform/SchemeRegistry.cpp:
(WebCore::canDisplayOnlyIfCanRequestSchemes):
* platform/network/BlobRegistry.cpp:
* platform/network/BlobRegistryImpl.cpp:
* platform/network/BlobResourceHandle.cpp:
* platform/network/BlobResourceHandle.h:
* platform/network/FormData.cpp:
(WebCore::FormData::deepCopy):
(WebCore::FormData::appendFile):
(WebCore::FormData::appendBlob):
(WebCore::FormData::appendKeyValuePairItems):
(WebCore::FormData::resolveBlobReferences):
(WebCore::encodeElement):
(WebCore::decodeElement):
* platform/network/FormData.h:
(WebCore::FormDataElement::FormDataElement):
(WebCore::operator==):
* platform/network/cf/FormDataStreamCFNet.cpp:
(WebCore::closeCurrentStream):
(WebCore::advanceCurrentStream):
(WebCore::formCreate):
(WebCore::formRead):
(WebCore::setHTTPBody):
* platform/network/curl/ResourceHandleManager.cpp:
(WebCore::getFormElementsCount):
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::addEncodedBlobToSoupMessageBody):
(WebCore::addFormElementsToSoupMessage):
* workers/WorkerGlobalScope.idl:
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::send):
(WebCore::XMLHttpRequest::createRequest):

Source/WebKit/mac:
* Configurations/FeatureDefines.xcconfig:
* WebView/WebView.mm:
(+[WebView _canHandleRequest:forMainFrame:]):

Source/WebKit2:
* Configurations/FeatureDefines.xcconfig:
* NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:
* NetworkProcess/FileAPI/NetworkBlobRegistry.h:
* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::didClose):
(WebKit::NetworkConnectionToWebProcess::blobSize):
* NetworkProcess/NetworkConnectionToWebProcess.h:
* NetworkProcess/NetworkConnectionToWebProcess.messages.in:
* NetworkProcess/NetworkProcessPlatformStrategies.cpp:
* NetworkProcess/NetworkProcessPlatformStrategies.h:
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::NetworkResourceLoader):
* WebProcess/FileAPI/BlobRegistryProxy.cpp:
* WebProcess/FileAPI/BlobRegistryProxy.h:
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
* WebProcess/WebCoreSupport/WebPlatformStrategies.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::canHandleRequest):

Source/WTF:
* wtf/FeatureDefines.h:

Tools:
* Scripts/webkitperl/FeatureList.pm:

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

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

92 files changed:
ChangeLog
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/WTF/ChangeLog
Source/WTF/wtf/FeatureDefines.h
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/Modules/websockets/WebSocketChannel.cpp
Source/WebCore/Modules/websockets/WebSocketChannel.h
Source/WebCore/WebCore.exp.in
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/bindings/js/JSBlobCustom.cpp
Source/WebCore/bindings/js/JSFileReaderCustom.cpp
Source/WebCore/dom/DOMExceptions.in
Source/WebCore/dom/EventTargetFactory.in
Source/WebCore/dom/ScriptExecutionContext.cpp
Source/WebCore/dom/ScriptExecutionContext.h
Source/WebCore/fileapi/AsyncFileStream.cpp
Source/WebCore/fileapi/AsyncFileStream.h
Source/WebCore/fileapi/Blob.cpp
Source/WebCore/fileapi/Blob.h
Source/WebCore/fileapi/Blob.idl
Source/WebCore/fileapi/FileError.h
Source/WebCore/fileapi/FileError.idl
Source/WebCore/fileapi/FileException.cpp
Source/WebCore/fileapi/FileException.h
Source/WebCore/fileapi/FileException.idl
Source/WebCore/fileapi/FileReader.cpp
Source/WebCore/fileapi/FileReader.h
Source/WebCore/fileapi/FileReader.idl
Source/WebCore/fileapi/FileReaderLoader.cpp
Source/WebCore/fileapi/FileReaderLoader.h
Source/WebCore/fileapi/FileReaderLoaderClient.h
Source/WebCore/fileapi/FileReaderSync.cpp
Source/WebCore/fileapi/FileReaderSync.h
Source/WebCore/fileapi/FileReaderSync.idl
Source/WebCore/fileapi/FileThread.cpp
Source/WebCore/fileapi/FileThread.h
Source/WebCore/fileapi/ThreadableBlobRegistry.cpp
Source/WebCore/fileapi/WebKitBlobBuilder.cpp
Source/WebCore/fileapi/WebKitBlobBuilder.h
Source/WebCore/html/DOMURL.cpp
Source/WebCore/html/DOMURL.h
Source/WebCore/html/DOMURL.idl
Source/WebCore/html/PublicURLManager.cpp
Source/WebCore/html/PublicURLManager.h
Source/WebCore/loader/LoaderStrategy.cpp
Source/WebCore/loader/LoaderStrategy.h
Source/WebCore/page/DOMWindow.idl
Source/WebCore/page/SecurityOrigin.cpp
Source/WebCore/platform/FileStream.cpp
Source/WebCore/platform/FileStream.h
Source/WebCore/platform/FileStreamClient.h
Source/WebCore/platform/SchemeRegistry.cpp
Source/WebCore/platform/network/BlobRegistry.cpp
Source/WebCore/platform/network/BlobRegistryImpl.cpp
Source/WebCore/platform/network/BlobResourceHandle.cpp
Source/WebCore/platform/network/BlobResourceHandle.h
Source/WebCore/platform/network/FormData.cpp
Source/WebCore/platform/network/FormData.h
Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp
Source/WebCore/platform/network/curl/ResourceHandleManager.cpp
Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
Source/WebCore/workers/WorkerGlobalScope.idl
Source/WebCore/xml/XMLHttpRequest.cpp
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/FeatureDefines.xcconfig
Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp
Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h
Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp
Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h
Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in
Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.cpp
Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.h
Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp
Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h
Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h
Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Source/cmake/OptionsEfl.cmake
Source/cmake/OptionsGTK.cmake
Source/cmake/WebKitFeatures.cmake
Source/cmakeconfig.h.cmake
Tools/ChangeLog
Tools/Scripts/webkitperl/FeatureList.pm
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/FeatureDefines.props
WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props

index 5ed756877f8d5fd9f5dddddf390e7a2880bf87df..8c600a30ad3fb2b29a66ac88286ae1b4d38e4634 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2014-05-27  Tibor Meszaros  <tmeszaros.u-szeged@partner.samsung.com>
+
+        Remove BLOB guards
+        https://bugs.webkit.org/show_bug.cgi?id=132863
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Source/cmake/OptionsEfl.cmake:
+        * Source/cmake/OptionsGTK.cmake:
+        * Source/cmake/WebKitFeatures.cmake:
+        * Source/cmakeconfig.h.cmake:
+
 2014-05-27  Zsolt Borbely  <zsborbely.u-szeged@partner.samsung.com>
 
         Allow building CMake based ports with WEB_REPLAY
index fb9b6e572319390a2ba14ad8dfd972917a9fdb01..2ec635f8534c585733fcdb252f58518abd07de1a 100644 (file)
@@ -1,3 +1,12 @@
+2014-05-27  Tibor Meszaros  <tmeszaros.u-szeged@partner.samsung.com>
+
+        Remove BLOB guards
+        https://bugs.webkit.org/show_bug.cgi?id=132863
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2014-05-27  Zsolt Borbely  <zsborbely.u-szeged@partner.samsung.com>
 
         Allow building CMake based ports with WEB_REPLAY
index cb6bb3a334945f7592f4d037c746c15d6b01951f..257cc7891e2f3c75f8fd85462e13e03bdb9ba88b 100644 (file)
@@ -43,7 +43,6 @@ ENABLE_AVF_CAPTIONS_macosx_1090 = ;
 ENABLE_AVF_CAPTIONS_macosx_101000 = ENABLE_AVF_CAPTIONS;
 ENABLE_AVF_CAPTIONS_iphoneos = ENABLE_AVF_CAPTIONS;
 ENABLE_AVF_CAPTIONS_iphonesimulator = $(ENABLE_AVF_CAPTIONS_iphoneos);
-ENABLE_BLOB = ENABLE_BLOB;
 ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
 ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH;
 ENABLE_CANVAS_PROXY = ;
@@ -239,4 +238,4 @@ ENABLE_FTL_JIT_iphonesimulator = ;
 
 ENABLE_LLINT_C_LOOP = ;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
index 536ecb1f0aaaae66ef62d2922dd4a879f939d5c8..507ba39f16ca055e188c950b286b71ae21a31d28 100644 (file)
@@ -1,3 +1,12 @@
+2014-05-27  Tibor Meszaros  <tmeszaros.u-szeged@partner.samsung.com>
+
+        Remove BLOB guards
+        https://bugs.webkit.org/show_bug.cgi?id=132863
+
+        Reviewed by Csaba Osztrogonác.
+
+        * wtf/FeatureDefines.h:
+
 2014-05-27  Gwang Yoon Hwang  <yoon@igalia.com>
 
         [GLIB] RunLoop::dispatch always executes the function on the main thread instead of the target thread.
index f55d98477b7ea3d2982f11ddde79f768d074c0ef..817f0ca42e9255408d38fc767d96a1498a34aaee 100644 (file)
 #define ENABLE_BATTERY_STATUS 0
 #endif
 
-#if !defined(ENABLE_BLOB)
-#define ENABLE_BLOB 0
-#endif
-
 #if !defined(ENABLE_CANVAS_PATH)
 #define ENABLE_CANVAS_PATH 1
 #endif
index 856612a02ef579d190f8d5231287d700d1db6fb8..03a7f3b5c0b5365fa340da2dd4c6ebcebe19d181 100644 (file)
@@ -1,3 +1,108 @@
+2014-05-27  Tibor Meszaros  <tmeszaros.u-szeged@partner.samsung.com>
+
+        Remove BLOB guards
+        https://bugs.webkit.org/show_bug.cgi?id=132863
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * Modules/websockets/WebSocketChannel.cpp:
+        (WebCore::WebSocketChannel::WebSocketChannel):
+        (WebCore::WebSocketChannel::didFail):
+        (WebCore::WebSocketChannel::processOutgoingFrameQueue):
+        (WebCore::WebSocketChannel::abortOutgoingFrameQueue):
+        * Modules/websockets/WebSocketChannel.h:
+        * WebCore.exp.in:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * bindings/js/JSBlobCustom.cpp:
+        (WebCore::JSBlobConstructor::constructJSBlob):
+        * bindings/js/JSFileReaderCustom.cpp:
+        * dom/DOMExceptions.in:
+        * dom/EventTargetFactory.in:
+        * dom/ScriptExecutionContext.cpp:
+        (WebCore::ScriptExecutionContext::publicURLManager):
+        * dom/ScriptExecutionContext.h:
+        * fileapi/AsyncFileStream.cpp:
+        * fileapi/AsyncFileStream.h:
+        * fileapi/Blob.cpp:
+        (WebCore::Blob::Blob):
+        * fileapi/Blob.h:
+        (WebCore::Blob::slice):
+        * fileapi/Blob.idl:
+        * fileapi/FileError.h:
+        * fileapi/FileError.idl:
+        * fileapi/FileException.cpp:
+        * fileapi/FileException.h:
+        * fileapi/FileException.idl:
+        * fileapi/FileReader.cpp:
+        * fileapi/FileReader.h:
+        * fileapi/FileReader.idl:
+        * fileapi/FileReaderLoader.cpp:
+        * fileapi/FileReaderLoader.h:
+        * fileapi/FileReaderLoaderClient.h:
+        * fileapi/FileReaderSync.cpp:
+        * fileapi/FileReaderSync.h:
+        * fileapi/FileReaderSync.idl:
+        * fileapi/FileThread.cpp:
+        * fileapi/FileThread.h:
+        * fileapi/ThreadableBlobRegistry.cpp:
+        (WebCore::ThreadableBlobRegistry::registerFileBlobURL): Deleted.
+        (WebCore::ThreadableBlobRegistry::registerBlobURL): Deleted.
+        (WebCore::ThreadableBlobRegistry::registerBlobURLForSlice): Deleted.
+        (WebCore::ThreadableBlobRegistry::unregisterBlobURL): Deleted.
+        (WebCore::ThreadableBlobRegistry::blobSize): Deleted.
+        (WebCore::ThreadableBlobRegistry::getCachedOrigin): Deleted.
+        * fileapi/WebKitBlobBuilder.cpp:
+        (WebCore::BlobBuilder::append):
+        * fileapi/WebKitBlobBuilder.h:
+        * html/DOMURL.cpp:
+        * html/DOMURL.h:
+        * html/DOMURL.idl:
+        * html/PublicURLManager.cpp:
+        * html/PublicURLManager.h:
+        * loader/LoaderStrategy.cpp:
+        (WebCore::LoaderStrategy::createBlobRegistry):
+        * loader/LoaderStrategy.h:
+        * page/DOMWindow.idl:
+        * page/SecurityOrigin.cpp:
+        (WebCore::SecurityOrigin::shouldUseInnerURL):
+        (WebCore::getCachedOrigin):
+        * platform/FileStream.cpp:
+        * platform/FileStream.h:
+        * platform/FileStreamClient.h:
+        * platform/SchemeRegistry.cpp:
+        (WebCore::canDisplayOnlyIfCanRequestSchemes):
+        * platform/network/BlobRegistry.cpp:
+        * platform/network/BlobRegistryImpl.cpp:
+        * platform/network/BlobResourceHandle.cpp:
+        * platform/network/BlobResourceHandle.h:
+        * platform/network/FormData.cpp:
+        (WebCore::FormData::deepCopy):
+        (WebCore::FormData::appendFile):
+        (WebCore::FormData::appendBlob):
+        (WebCore::FormData::appendKeyValuePairItems):
+        (WebCore::FormData::resolveBlobReferences):
+        (WebCore::encodeElement):
+        (WebCore::decodeElement):
+        * platform/network/FormData.h:
+        (WebCore::FormDataElement::FormDataElement):
+        (WebCore::operator==):
+        * platform/network/cf/FormDataStreamCFNet.cpp:
+        (WebCore::closeCurrentStream):
+        (WebCore::advanceCurrentStream):
+        (WebCore::formCreate):
+        (WebCore::formRead):
+        (WebCore::setHTTPBody):
+        * platform/network/curl/ResourceHandleManager.cpp:
+        (WebCore::getFormElementsCount):
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::addEncodedBlobToSoupMessageBody):
+        (WebCore::addFormElementsToSoupMessage):
+        * workers/WorkerGlobalScope.idl:
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::send):
+        (WebCore::XMLHttpRequest::createRequest):
+
 2014-05-27  Zsolt Borbely  <zsborbely.u-szeged@partner.samsung.com>
 
         Allow building CMake based ports with WEB_REPLAY
index cb6bb3a334945f7592f4d037c746c15d6b01951f..257cc7891e2f3c75f8fd85462e13e03bdb9ba88b 100644 (file)
@@ -43,7 +43,6 @@ ENABLE_AVF_CAPTIONS_macosx_1090 = ;
 ENABLE_AVF_CAPTIONS_macosx_101000 = ENABLE_AVF_CAPTIONS;
 ENABLE_AVF_CAPTIONS_iphoneos = ENABLE_AVF_CAPTIONS;
 ENABLE_AVF_CAPTIONS_iphonesimulator = $(ENABLE_AVF_CAPTIONS_iphoneos);
-ENABLE_BLOB = ENABLE_BLOB;
 ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
 ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH;
 ENABLE_CANVAS_PROXY = ;
@@ -239,4 +238,4 @@ ENABLE_FTL_JIT_iphonesimulator = ;
 
 ENABLE_LLINT_C_LOOP = ;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
index 6ea47e9c6b4f104315dcf6bc5ee44f7584846438..39ed463fc025a9ada4b88a034bcd8459674d5a68 100644 (file)
@@ -81,9 +81,7 @@ WebSocketChannel::WebSocketChannel(Document* document, WebSocketChannelClient* c
     , m_hasContinuousFrame(false)
     , m_closeEventCode(CloseEventCodeAbnormalClosure)
     , m_outgoingFrameQueueStatus(OutgoingFrameQueueOpen)
-#if ENABLE(BLOB)
     , m_blobLoaderStatus(BlobLoaderNotStarted)
-#endif
 {
     if (Page* page = m_document->page())
         m_identifier = page->progress().createUniqueIdentifier();
@@ -342,7 +340,6 @@ void WebSocketChannel::didCancelAuthenticationChallenge(SocketStreamHandle*, con
 {
 }
 
-#if ENABLE(BLOB)
 void WebSocketChannel::didStartLoading()
 {
     LOG(Network, "WebSocketChannel %p didStartLoading()", this);
@@ -377,7 +374,6 @@ void WebSocketChannel::didFail(int errorCode)
     fail("Failed to load Blob: error code = " + String::number(errorCode)); // FIXME: Generate human-friendly reason message.
     deref();
 }
-#endif
 
 bool WebSocketChannel::appendToBuffer(const char* data, size_t len)
 {
@@ -725,7 +721,6 @@ void WebSocketChannel::processOutgoingFrameQueue()
             break;
 
         case QueuedFrameTypeBlob: {
-#if ENABLE(BLOB)
             switch (m_blobLoaderStatus) {
             case BlobLoaderNotStarted:
                 ref(); // Will be derefed after didFinishLoading() or didFail().
@@ -750,9 +745,6 @@ void WebSocketChannel::processOutgoingFrameQueue()
                 break;
             }
             }
-#else
-            fail("FileReader is not available. Could not send a Blob as WebSocket binary message.");
-#endif
             break;
         }
 
@@ -773,12 +765,10 @@ void WebSocketChannel::abortOutgoingFrameQueue()
 {
     m_outgoingFrameQueue.clear();
     m_outgoingFrameQueueStatus = OutgoingFrameQueueClosed;
-#if ENABLE(BLOB)
     if (m_blobLoaderStatus == BlobLoaderStarted) {
         m_blobLoader->cancel();
         didFail(FileError::ABORT_ERR);
     }
-#endif
 }
 
 bool WebSocketChannel::sendFrame(WebSocketFrame::OpCode opCode, const char* data, size_t dataLength)
index 7218504bc2341fc8fe59411df465a1949ab7f9a5..715946cae62c264b05a2bb4108b48ab7f827603b 100644 (file)
@@ -55,10 +55,7 @@ class SocketStreamHandle;
 class SocketStreamError;
 class WebSocketChannelClient;
 
-class WebSocketChannel : public RefCounted<WebSocketChannel>, public SocketStreamHandleClient, public ThreadableWebSocketChannel
-#if ENABLE(BLOB)
-                       , public FileReaderLoaderClient
-#endif
+class WebSocketChannel : public RefCounted<WebSocketChannel>, public SocketStreamHandleClient, public ThreadableWebSocketChannel, public FileReaderLoaderClient
 {
     WTF_MAKE_FAST_ALLOCATED;
 public:
@@ -111,13 +108,11 @@ public:
         CloseEventCodeMaximumUserDefined = 4999
     };
 
-#if ENABLE(BLOB)
     // FileReaderLoaderClient functions.
     virtual void didStartLoading();
     virtual void didReceiveData();
     virtual void didFinishLoading();
     virtual void didFail(int errorCode);
-#endif
 
     using RefCounted<WebSocketChannel>::ref;
     using RefCounted<WebSocketChannel>::deref;
@@ -182,14 +177,12 @@ private:
     // instead of call sendFrame() directly.
     bool sendFrame(WebSocketFrame::OpCode, const char* data, size_t dataLength);
 
-#if ENABLE(BLOB)
     enum BlobLoaderStatus {
         BlobLoaderNotStarted,
         BlobLoaderStarted,
         BlobLoaderFinished,
         BlobLoaderFailed
     };
-#endif
 
     Document* m_document;
     WebSocketChannelClient* m_client;
@@ -218,11 +211,9 @@ private:
     Deque<OwnPtr<QueuedFrame>> m_outgoingFrameQueue;
     OutgoingFrameQueueStatus m_outgoingFrameQueueStatus;
 
-#if ENABLE(BLOB)
     // FIXME: Load two or more Blobs simultaneously for better performance.
     OwnPtr<FileReaderLoader> m_blobLoader;
     BlobLoaderStatus m_blobLoaderStatus;
-#endif
 
     WebSocketDeflateFramer m_deflateFramer;
 };
index 8c4a341dba89b4b2e74b3a688cb069670f90e0d4..f4bfe2bf627e4fe1948bb907a1eba2b9f52d5ba2 100644 (file)
@@ -192,6 +192,7 @@ __ZN7WebCore11memoryCacheEv
 __ZN7WebCore11startOfLineERKNS_15VisiblePositionE
 __ZN7WebCore11startOfWordERKNS_15VisiblePositionENS_9EWordSideE
 __ZN7WebCore11writeToFileEiPKci
+__ZN7WebCore12BlobRegistryD2Ev
 __ZN7WebCore12DataTransferD1Ev
 __ZN7WebCore12EditingStyleD1Ev
 __ZN7WebCore12EventHandler10mouseMovedERKNS_18PlatformMouseEventE
@@ -252,6 +253,7 @@ __ZN7WebCore12UTF8EncodingEv
 __ZN7WebCore12UserActivity7startedEv
 __ZN7WebCore12UserActivityC1EPKc
 __ZN7WebCore12WorkerThread17workerThreadCountEv
+__ZN7WebCore12blobRegistryEv
 __ZN7WebCore12cacheStorageEv
 __ZN7WebCore12deleteCookieERKNS_21NetworkStorageSessionERKNS_3URLERKN3WTF6StringE
 __ZN7WebCore12gcControllerEv
@@ -356,6 +358,7 @@ __ZN7WebCore14FrameSelection5clearEv
 __ZN7WebCore14FrameSelection6modifyENS0_11EAlterationENS_18SelectionDirectionENS_15TextGranularityENS_14EUserTriggeredE
 __ZN7WebCore14FrameSelection9selectAllEv
 __ZN7WebCore14FrameSelectionC1EPNS_5FrameE
+__ZN7WebCore14LoaderStrategy18createBlobRegistryEv
 __ZN7WebCore14LoaderStrategy21resourceLoadSchedulerEv
 __ZN7WebCore14LoaderStrategy25loadResourceSynchronouslyEPNS_17NetworkingContextEmRKNS_15ResourceRequestENS_17StoredCredentialsENS_22ClientCredentialPolicyERNS_13ResourceErrorERNS_16ResourceResponseERN3WTF6VectorIcLm0ENSC_15CrashOnOverflowEEE
 __ZN7WebCore14PluginDocument12pluginWidgetEv
@@ -1996,11 +1999,13 @@ __ZNK7WebCore9RenderBox12clientHeightEv
 __ZNK7WebCore9RenderBox20flippedClientBoxRectEv
 __ZNK7WebCore9TreeScope14getElementByIdERKN3WTF6StringE
 __ZTVN7WebCore11PageConsoleE
+__ZTVN7WebCore12BlobRegistryE
 __ZTVN7WebCore12ChromeClientE
 __ZTVN7WebCore14LoaderStrategyE
 __ZTVN7WebCore14StaticNodeListE
 __ZTVN7WebCore15PlatformCALayerE
 __ZTVN7WebCore15StorageStrategyE
+__ZTVN7WebCore16BlobRegistryImplE
 __ZTVN7WebCore16DatabaseStrategyE
 __ZTVN7WebCore16IconDatabaseBaseE
 __ZTVN7WebCore17FrameLoaderClientE
@@ -2884,14 +2889,6 @@ __ZN7WebCore8Settings20gAVFoundationEnabledE
 __ZN7WebCore8Settings22setAVFoundationEnabledEb
 #endif
 
-#if ENABLE(BLOB)
-__ZN7WebCore12BlobRegistryD2Ev
-__ZN7WebCore12blobRegistryEv
-__ZN7WebCore14LoaderStrategy18createBlobRegistryEv
-__ZTVN7WebCore12BlobRegistryE
-__ZTVN7WebCore16BlobRegistryImplE
-#endif
-
 #if ENABLE(CACHE_PARTITIONING)
 __ZN7WebCore15ResourceRequest13partitionNameERKN3WTF6StringE
 _wkCachePartitionKey
index 5180fe4dd73d48cf0c6ba8720be9d6e34115aca3..5db3e666d86843532a71c2298cd8916b4a1b8a67 100644 (file)
     <ClCompile Include="..\platform\network\BlobData.cpp" />
     <ClCompile Include="..\platform\network\BlobDataFileReference.cpp" />
     <ClCompile Include="..\platform\network\BlobResourceHandle.cpp" />
+    <ClCompile Include="..\platform\network\BlobRegistry.cpp" />
+    <ClCompile Include="..\platform\network\BlobRegistryImpl.cpp" />
     <ClCompile Include="..\platform\network\Credential.cpp" />
     <ClCompile Include="..\platform\network\CredentialStorage.cpp" />
     <ClCompile Include="..\platform\network\DataURL.cpp" />
     <ClCompile Include="..\html\DOMURL.cpp" />
     <ClCompile Include="..\html\HTMLMediaSession.cpp" />
     <ClCompile Include="..\html\EmailInputType.cpp" />
+    <ClCompile Include="..\html\PublicURLManager.cpp" />
     <ClCompile Include="..\fileapi\File.cpp" />
     <ClCompile Include="..\fileapi\FileException.cpp" />
     <ClCompile Include="..\html\FileInputType.cpp" />
index bd53129b0f878ccac809364349135db5c66aeceb..8a6bf3ff6e953e041cbc68ad6c2bd19ef726c4e7 100644 (file)
@@ -117,14 +117,11 @@ EncodedJSValue JSC_HOST_CALL JSBlobConstructor::constructJSBlob(ExecState* exec)
         if (exec->hadException())
             return JSValue::encode(jsUndefined());
 
-#if ENABLE(BLOB)
         if (ArrayBuffer* arrayBuffer = toArrayBuffer(item))
             blobBuilder.append(arrayBuffer);
         else if (RefPtr<ArrayBufferView> arrayBufferView = toArrayBufferView(item))
             blobBuilder.append(arrayBufferView.release());
-        else
-#endif
-        if (Blob* blob = toBlob(item))
+        else if (Blob* blob = toBlob(item))
             blobBuilder.append(blob);
         else {
             String string = item.toString(exec)->value(exec);
index f2970b27bd6c8c13f654edbffb728642c86f19d8..bbc0d9ae553ee65c4574279c706bcbfe27276439 100644 (file)
@@ -30,8 +30,6 @@
 
 #include "config.h"
 
-#if ENABLE(BLOB)
-
 #include "JSFileReader.h"
 
 #include "FileReader.h"
@@ -51,5 +49,3 @@ JSValue JSFileReader::result(ExecState* exec) const
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(BLOB)
index 32d5a5e8b6fbdcc2911f07494ef54e6dac16f9cf..f06ebb3c299edeaaa5cc2eb12ef0b91a9b8242e6 100644 (file)
@@ -2,7 +2,7 @@ namespace=Exception
 
 DOMCoreException
 EventException
-FileException conditional=BLOB
+FileException
 RangeException
 SQLException conditional=SQL_DATABASE
 SVGException
index 15a77e954ae1210677117d2d933aa8533c96a168..7b4e4ced6726833b57ed02327de9fc40749e055e 100644 (file)
@@ -8,7 +8,7 @@ DedicatedWorkerGlobalScope
 DOMApplicationCache
 DOMWindow
 EventSource
-FileReader conditional=BLOB
+FileReader
 FontLoader conditional=FONT_LOAD_EVENTS
 IDBDatabase conditional=INDEXED_DATABASE
 IDBOpenDBRequest conditional=INDEXED_DATABASE
index ca86901171a5cf87e6a10969f6bbf4e845e8b0a3..2a751f3127e388452e88bae9096ce6014c13f697 100644 (file)
@@ -406,14 +406,12 @@ int ScriptExecutionContext::circularSequentialID()
     return m_circularSequentialID;
 }
 
-#if ENABLE(BLOB)
 PublicURLManager& ScriptExecutionContext::publicURLManager()
 {
     if (!m_publicURLManager)
         m_publicURLManager = PublicURLManager::create(this);
     return *m_publicURLManager;
 }
-#endif
 
 void ScriptExecutionContext::adjustMinimumTimerInterval(double oldMinimumTimerInterval)
 {
index 421648d4ffa622919fb482137bfca0ec2759ade4..b5f1583fac3c667d7dfe13de45b1e672942db54d 100644 (file)
@@ -80,9 +80,7 @@ public:
 
     virtual SecurityOrigin* topOrigin() const = 0;
 
-#if ENABLE(BLOB)
     PublicURLManager& publicURLManager();
-#endif
 
     // Active objects are not garbage collected even if inaccessible, e.g. because their activity may result in callbacks being invoked.
     bool canSuspendActiveDOMObjects();
@@ -217,9 +215,7 @@ private:
     ActiveDOMObject::ReasonForSuspension m_reasonForSuspendingActiveDOMObjects;
     bool m_activeDOMObjectsAreStopped;
 
-#if ENABLE(BLOB)
     std::unique_ptr<PublicURLManager> m_publicURLManager;
-#endif
 
 #if ENABLE(SQL_DATABASE)
     RefPtr<DatabaseContext> m_databaseContext;
index 29a28a9703bc1914fca0255c8fb7787a7127cde2..db29b0fa5f20ecc1939468467a01940ef8438463 100644 (file)
@@ -31,8 +31,6 @@
 
 #include "config.h"
 
-#if ENABLE(BLOB)
-
 #include "AsyncFileStream.h"
 
 #include "Blob.h"
@@ -231,5 +229,3 @@ void AsyncFileStream::truncateOnFileThread(long long position)
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(BLOB)
index 849ea2bc9472405fb04d5a716d5696a2c7d583e8..8eebfe0ef76efa9af8e38ab9561c61f44e218699 100644 (file)
@@ -32,8 +32,6 @@
 #ifndef AsyncFileStream_h
 #define AsyncFileStream_h
 
-#if ENABLE(BLOB)
-
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
@@ -85,6 +83,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB)
-
 #endif // AsyncFileStream_h
index b466d7e98019962813b9bf0614700a244d2333c5..f1f29b817e4281fe3900c8f04a474e45e6026471 100644 (file)
@@ -103,7 +103,6 @@ Blob::Blob(DeserializationContructor, const URL& srcURL, const String& type, lon
     ThreadableBlobRegistry::registerBlobURL(0, m_internalURL, srcURL);
 }
 
-#if ENABLE(BLOB)
 Blob::Blob(const URL& srcURL, long long start, long long end, const String& type)
     : m_type(Blob::normalizedContentType(type))
     , m_size(-1) // size is not necessarily equal to end - start.
@@ -111,7 +110,6 @@ Blob::Blob(const URL& srcURL, long long start, long long end, const String& type
     m_internalURL = BlobURL::createInternalURL();
     ThreadableBlobRegistry::registerBlobURLForSlice(m_internalURL, srcURL, start, end);
 }
-#endif
 
 Blob::~Blob()
 {
index 68830a21a8c3ddc7b44e20075856578b7a1a861d..a2ab5af0b80a6c1ab82f00835bad727448b0c627 100644 (file)
@@ -84,12 +84,10 @@ public:
     // URLRegistrable
     virtual URLRegistry& registry() const override;
 
-#if ENABLE(BLOB)
     PassRefPtr<Blob> slice(long long start = 0, long long end = std::numeric_limits<long long>::max(), const String& contentType = String()) const
     {
         return adoptRef(new Blob(m_internalURL, start, end, contentType));
     }
-#endif
 
 protected:
     Blob();
@@ -102,10 +100,8 @@ protected:
     enum DeserializationContructor { deserializationContructor };
     Blob(DeserializationContructor, const URL& srcURL, const String& type, long long size);
 
-#if ENABLE(BLOB)
     // For slicing.
     Blob(const URL& srcURL, long long start, long long end, const String& contentType);
-#endif
 
     // This is an internal URL referring to the blob data associated with this object. It serves
     // as an identifier for this blob. The internal URL is never used to source the blob's content
index ca2dd343b19e15ef55ad99698d55a53a9d161f5e..ac77abda9eed23730d6724b7f1bac96d249797f3 100644 (file)
@@ -40,9 +40,7 @@
     readonly attribute DOMString type;
 
 #if !defined(LANGUAGE_OBJECTIVE_C)
-#if defined(ENABLE_BLOB) && ENABLE_BLOB
     Blob slice(optional long long start, optional long long end, [TreatNullAs=NullString, TreatUndefinedAs=NullString] optional DOMString contentType);
 #endif
-#endif
 };
 
index 7678a51543532f645dc157c832b795f36e9c0813..66befa841ebbf74487358795a0058fe953b3b783 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef FileError_h
 #define FileError_h
 
-#if ENABLE(BLOB)
-
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 
@@ -70,6 +68,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB)
-
 #endif // FileError_h
index 866ce92745a9b7ff5f68765e2bf23e96611c7336..d9650f9183f9eaa3518a2e87237b1b71950b5e75 100644 (file)
@@ -29,7 +29,6 @@
  */
 
 [
-    Conditional=BLOB,
     JSNoStaticTables,
     ImplementationLacksVTable
 ] interface FileError {
index 8058038ee53f2aa6e03a6be75853c397d985c76a..1207bd87f9e16a38a752a981fc8114aac9a55ee9 100644 (file)
@@ -28,8 +28,6 @@
 
 #include "config.h"
 
-#if ENABLE(BLOB)
-
 #include "FileException.h"
 
 namespace WebCore {
@@ -71,5 +69,3 @@ bool FileException::initializeDescription(ExceptionCode ec, ExceptionCodeDescrip
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(BLOB)
index ccf7982df09768d6327669baeee06fbb7552b499..2e8f50b41645b4ca460239c66a4676e68c54fb0b 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef FileException_h
 #define FileException_h
 
-#if ENABLE(BLOB)
-
 #include "ExceptionBase.h"
 
 namespace WebCore {
@@ -80,6 +78,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB)
-
 #endif // FileException_h
index 8ff47c524e0554053400d25606ee7623c4cd9312..6cae7a52a30139b4a3f6f5ac6536cb6e0134d06a 100644 (file)
@@ -30,7 +30,6 @@
 
 [
     NoInterfaceObject,
-    Conditional=BLOB,
     DoNotCheckConstants,
     JSNoStaticTables,
     ImplementationLacksVTable,
index 67d69bb0d6211f8e2fdc8c1de7a2552e49437567..46679fecd44834f9599ccc6069c1856a38ea8e3e 100644 (file)
@@ -30,8 +30,6 @@
 
 #include "config.h"
 
-#if ENABLE(BLOB)
-
 #include "FileReader.h"
 
 #include "CrossThreadTask.h"
@@ -262,5 +260,3 @@ String FileReader::stringResult()
 }
 
 } // namespace WebCore
-#endif // ENABLE(BLOB)
index 789701635a71d5d827ebedfd59376a9b00e023f1..c30e4c03436357892b24dadd47cf240e4d0f85cd 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef FileReader_h
 #define FileReader_h
 
-#if ENABLE(BLOB)
-
 #include "ActiveDOMObject.h"
 #include "EventTarget.h"
 #include "FileError.h"
@@ -129,6 +127,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB)
-
 #endif // FileReader_h
index 6ad56e3238a9baba275e971169a1ddf766f418bc..00b91a3693716f04c9d885e4f8a21ef4b09fce7d 100644 (file)
@@ -31,7 +31,6 @@
 
 [
     GlobalContext=DOMWindow&WorkerGlobalScope,
-    Conditional=BLOB,
     ActiveDOMObject,
     Constructor,
     ConstructorCallWith=ScriptExecutionContext,
index 06fd3d3a885e30e22c46db5c6adaa3b5037b61a4..c8dacde795841cf7f7d0188b0980f72447aac434 100644 (file)
@@ -30,8 +30,6 @@
 
 #include "config.h"
 
-#if ENABLE(BLOB)
-
 #include "FileReaderLoader.h"
 
 #include "Blob.h"
@@ -357,5 +355,3 @@ void FileReaderLoader::setEncoding(const String& encoding)
 }
 
 } // namespace WebCore
-#endif // ENABLE(BLOB)
index 4356626134d0f93654693ea07a942aaab04866ca..a09f320d697041e60fb002498786f49a590c2411 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef FileReaderLoader_h
 #define FileReaderLoader_h
 
-#if ENABLE(BLOB)
-
 #include "FileError.h"
 #include "URL.h"
 #include "TextEncoding.h"
@@ -125,6 +123,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB)
-
 #endif // FileReaderLoader_h
index 4acb8ad3a139c4c162c5f71ffef1c9ae9b8e1d68..fde658bbf4951ba4f21765d34c071da3394e1ad9 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef FileReaderLoaderClient_h
 #define FileReaderLoaderClient_h
 
-#if ENABLE(BLOB)
-
 namespace WebCore {
 
 class FileReaderLoaderClient {
@@ -47,6 +45,4 @@ public:
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB)
-
 #endif // FileReaderLoaderClient_h
index 2d53afd1b9e7218b52d335280960162db643b1b2..53e624d3cf45668dc850fd7b430e38c808ad7665 100644 (file)
@@ -30,8 +30,6 @@
 
 #include "config.h"
 
-#if ENABLE(BLOB)
-
 #include "FileReaderSync.h"
 
 #include "Blob.h"
@@ -105,5 +103,3 @@ void FileReaderSync::startLoading(ScriptExecutionContext* scriptExecutionContext
 }
 
 } // namespace WebCore
-#endif // ENABLE(BLOB)
index 50140efcdd60d6598543ffc7ecbb3bd7806a0188..cd25360a0092e9c2f667b3fac832d399ada130bc 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef FileReaderSync_h
 #define FileReaderSync_h
 
-#if ENABLE(BLOB)
-
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
 #include <wtf/text/WTFString.h>
@@ -75,6 +73,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB)
-
 #endif // FileReaderSync_h
index 184f32200b2cb9dd1671d2d8b16c8e544b0d445f..1f7741c671894bfa38f7a7ee85216256d6f9551d 100644 (file)
@@ -30,7 +30,6 @@
 
 [
     GlobalContext=WorkerGlobalScope,
-    Conditional=BLOB,
     Constructor,
     JSNoStaticTables,
 ] interface FileReaderSync {
index e43f0e72d22cf5fcb2419d084f08d204aeb411de..2b31ca1f35edfde1d6590827d535c83b3090548a 100644 (file)
@@ -30,8 +30,6 @@
 
 #include "config.h"
 
-#if ENABLE(BLOB)
-
 #include "FileThread.h"
 
 #include "Logging.h"
@@ -113,5 +111,3 @@ void FileThread::runLoop()
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(BLOB)
index 372d5ce909747860a3e468f95f67aaf7fa912716..7fdc04d158f103db162bc7dc5121c94942a516f9 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef FileThread_h
 #define FileThread_h
 
-#if ENABLE(BLOB)
-
 #include "CrossThreadCopier.h"
 #include <functional>
 #include <wtf/MessageQueue.h>
@@ -95,6 +93,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB)
-
 #endif // FileThread_h
index 1d12be0da2731af66c1cf9855aee5553e12a09c1..79ef3e294d71786ceeae66de4711498fa2df3908 100644 (file)
@@ -85,8 +85,6 @@ public:
     Vector<BlobPart> blobParts;
 };
 
-#if ENABLE(BLOB)
-
 typedef HashMap<String, RefPtr<SecurityOrigin>> BlobUrlOriginMap;
 
 static ThreadSpecific<BlobUrlOriginMap>& originMap()
@@ -201,38 +199,4 @@ PassRefPtr<SecurityOrigin> ThreadableBlobRegistry::getCachedOrigin(const URL& ur
     return originMap()->get(url.string());
 }
 
-#else
-
-void ThreadableBlobRegistry::registerFileBlobURL(const URL&, const String&, const String&)
-{
-}
-
-void ThreadableBlobRegistry::registerBlobURL(const URL&, Vector<BlobPart>, const String&)
-{
-}
-
-void ThreadableBlobRegistry::registerBlobURL(SecurityOrigin*, const URL&, const URL&)
-{
-}
-
-void ThreadableBlobRegistry::registerBlobURLForSlice(const URL&, const URL&, long long, long long)
-{
-}
-
-void ThreadableBlobRegistry::unregisterBlobURL(const URL&)
-{
-}
-
-unsigned long long ThreadableBlobRegistry::blobSize(const URL&)
-{
-    return 0;
-}
-
-PassRefPtr<SecurityOrigin> ThreadableBlobRegistry::getCachedOrigin(const URL&)
-{
-    return 0;
-}
-
-#endif // ENABL(BLOB)
-
 } // namespace WebCore
index c10c05a28a5d9c2520b4fdc7b10ca7e9b0f3f604..645eb91e91758a6fc623c02945d72ad7d8b7a0b9 100644 (file)
@@ -69,7 +69,6 @@ void BlobBuilder::append(const String& text, const String& endingType)
     }
 }
 
-#if ENABLE(BLOB)
 void BlobBuilder::append(ArrayBuffer* arrayBuffer)
 {
     if (!arrayBuffer)
@@ -85,7 +84,6 @@ void BlobBuilder::append(PassRefPtr<ArrayBufferView> arrayBufferView)
 
     m_appendableData.append(static_cast<const char*>(arrayBufferView->baseAddress()), arrayBufferView->byteLength());
 }
-#endif
 
 void BlobBuilder::append(Blob* blob)
 {
index 49d19f632406a569cb182f3e79bd47d1e3ba5d30..a436a22e11167e5fc16c71a97535a4267821f504 100644 (file)
@@ -48,10 +48,8 @@ public:
 
     void append(Blob*);
     void append(const String& text, const String& ending);
-#if ENABLE(BLOB)
     void append(JSC::ArrayBuffer*);
     void append(PassRefPtr<JSC::ArrayBufferView>);
-#endif
 
     Vector<BlobPart> finalize();
 
index 5b49dcc0260865d976d2528964b8996011b80311..dd28ee225212c633adb5679370177fa55eb62c76 100644 (file)
@@ -27,8 +27,6 @@
 #include "DOMURL.h"
 
 #include "SecurityOrigin.h"
-
-#if ENABLE(BLOB)
 #include "ActiveDOMObject.h"
 #include "Blob.h"
 #include "BlobURL.h"
@@ -37,7 +35,6 @@
 #include "ResourceRequest.h"
 #include "ScriptExecutionContext.h"
 #include <wtf/MainThread.h>
-#endif // ENABLE(BLOB)
 
 namespace WebCore {
 
@@ -93,9 +90,6 @@ void DOMURL::setHref(const String& url, ExceptionCode& ec)
         ec = TypeError;
 }
 
-
-#if ENABLE(BLOB)
-
 String DOMURL::createObjectURL(ScriptExecutionContext* scriptExecutionContext, Blob* blob)
 {
     if (!scriptExecutionContext || !blob)
@@ -129,6 +123,4 @@ void DOMURL::revokeObjectURL(ScriptExecutionContext* scriptExecutionContext, con
     scriptExecutionContext->publicURLManager().revoke(url);
 }
 
-#endif // ENABLE(BLOB)
-
 } // namespace WebCore
index 896ae3fb53c2384a947001dc34229c07e4d3e2dc..4ff61726560977992fc3a45f4b6069ca998e8b02 100644 (file)
@@ -52,12 +52,11 @@ public:
     void setHref(const String& url);
     void setHref(const String&, ExceptionCode&);
 
-#if ENABLE(BLOB)
     static String createObjectURL(ScriptExecutionContext*, Blob*);
     static void revokeObjectURL(ScriptExecutionContext*, const String&);
 
     static String createPublicURL(ScriptExecutionContext*, URLRegistrable*);
-#endif
+
 private:
     DOMURL(const String& url, const String& base, ExceptionCode&);
     DOMURL(const String& url, const DOMURL& base, ExceptionCode&);
index 27b6b6f73d8cd71aea9b88e7c9d555ef2671f549..876b34b653fdfbaa8b31625e8bf3a759380786aa 100644 (file)
@@ -36,8 +36,8 @@
     InterfaceName=URL,
     ImplementationLacksVTable,
 ] interface DOMURL {
-    [CallWith=ScriptExecutionContext,TreatReturnedNullStringAs=Null,Conditional=BLOB] static DOMString createObjectURL(Blob? blob);
-    [CallWith=ScriptExecutionContext,Conditional=BLOB] static void revokeObjectURL(DOMString url);
+    [CallWith=ScriptExecutionContext,TreatReturnedNullStringAs=Null] static DOMString createObjectURL(Blob? blob);
+    [CallWith=ScriptExecutionContext] static void revokeObjectURL(DOMString url);
 };
 
 DOMURL implements URLUtils;
index 410286d96d261eb3f2395087b3ffae1eedd818ab..a56a4a2dbba027dd3bc123a63c2afd99fbbd8913 100644 (file)
@@ -26,9 +26,6 @@
 
 #include "config.h"
 #include "PublicURLManager.h"
-
-#if ENABLE(BLOB)
-
 #include "URL.h"
 #include "URLRegistry.h"
 #include <wtf/text/StringHash.h>
@@ -84,5 +81,3 @@ void PublicURLManager::stop()
 }
 
 }
-
-#endif // ENABLE(BLOB)
index 70876d19db20181a171407958e7176cf79443973..6c512497cd4e644e94f1c548afda27befaf0be8a 100644 (file)
@@ -26,7 +26,6 @@
 #ifndef PublicURLManager_h
 #define PublicURLManager_h
 
-#if ENABLE(BLOB)
 #include "ActiveDOMObject.h"
 #include <memory>
 #include <wtf/HashMap.h>
@@ -63,5 +62,4 @@ private:
 
 } // namespace WebCore
 
-#endif // BLOB
 #endif // PUBLICURLMANAGER_h
index fc4400772be9f7ab4468ae6bc2d6a2710ae4bcde..899fd521db3372e75be32bf816523a235665b4a4 100644 (file)
@@ -42,12 +42,9 @@ void LoaderStrategy::loadResourceSynchronously(NetworkingContext* context, unsig
     ResourceHandle::loadResourceSynchronously(context, request, storedCredentials, error, response, data);
 }
 
-#if ENABLE(BLOB)
 BlobRegistry* LoaderStrategy::createBlobRegistry()
 {
     return new BlobRegistryImpl;
 }
-#endif
-
 
 } // namespace WebCore
index 0e625d35a6512b4dbddbef356501c6dee1131d8e..d2783ae67a90dd12ac00bd611f3d0798610fb521 100644 (file)
@@ -44,9 +44,7 @@ public:
 
     virtual void loadResourceSynchronously(NetworkingContext*, unsigned long identifier, const ResourceRequest&, StoredCredentials, ClientCredentialPolicy, ResourceError&, ResourceResponse&, Vector<char>& data);
 
-#if ENABLE(BLOB)
     virtual BlobRegistry* createBlobRegistry();
-#endif
 
 protected:
     virtual ~LoaderStrategy()
index a5924975f683a7d94c45f1fb3717930a47f9a916..fd1e3e8b759803ef29d2df64aa09b3a9586dc26b 100644 (file)
     [Conditional=IOS_TOUCH_EVENTS, CustomGetter] attribute TouchConstructor Touch; // Usable with the new operator
     [Conditional=IOS_TOUCH_EVENTS, CustomGetter] attribute TouchListConstructor TouchList; // Usable with the new operator
 
-    [Conditional=BLOB] attribute DOMURLConstructor webkitURL; // FIXME: deprecate this.
+    attribute DOMURLConstructor webkitURL; // FIXME: deprecate this.
     attribute MutationObserverConstructor WebKitMutationObserver; // FIXME: Add metrics to determine when we can remove this.
     [Conditional=INDEXED_DATABASE] attribute IDBCursorConstructor webkitIDBCursor;
     [Conditional=INDEXED_DATABASE] attribute IDBDatabaseConstructor webkitIDBDatabase;
index c47b62bae04865859cd9ff77784d1ed3d2459047..871b282ed951442c8cc29283c4887dee08d09bf9 100644 (file)
@@ -55,11 +55,9 @@ static bool schemeRequiresHost(const URL& url)
 
 bool SecurityOrigin::shouldUseInnerURL(const URL& url)
 {
-#if ENABLE(BLOB)
     // FIXME: Blob URLs don't have inner URLs. Their form is "blob:<inner-origin>/<UUID>", so treating the part after "blob:" as a URL is incorrect.
     if (url.protocolIs("blob"))
         return true;
-#endif
     UNUSED_PARAM(url);
     return false;
 }
@@ -78,12 +76,8 @@ URL SecurityOrigin::extractInnerURL(const URL& url)
 
 static PassRefPtr<SecurityOrigin> getCachedOrigin(const URL& url)
 {
-#if ENABLE(BLOB)
     if (url.protocolIs("blob"))
         return ThreadableBlobRegistry::getCachedOrigin(url);
-#else
-    UNUSED_PARAM(url);
-#endif
     return 0;
 }
 
index ad1657b03b37938889dc47a7dbb75a2ffe647d31..ff5aee1aff5694a6b8aec50c62f1e3cc0a652d79 100644 (file)
@@ -30,8 +30,6 @@
 
 #include "config.h"
 
-#if ENABLE(BLOB)
-
 #include "FileStream.h"
 
 #include "FileSystem.h"
@@ -147,5 +145,3 @@ bool FileStream::truncate(long long)
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(BLOB)
index eeeaa0ea71df5b60b0750b63c54c17714d43ac08..ae8a84e4164ac446b89857ea53e8f8c68505b066 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef FileStream_h
 #define FileStream_h
 
-#if ENABLE(BLOB)
-
 #include "FileSystem.h"
 #include <wtf/Forward.h>
 #include <wtf/PassRefPtr.h>
@@ -95,6 +93,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB)
-
 #endif // FileStream_h
index b4539a63102a8be764478d788ecebf3d01e53ba7..14fa50135756bedcdbed6924f11c2a340cd895d1 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef FileStreamClient_h
 #define FileStreamClient_h
 
-#if ENABLE(BLOB)
-
 namespace WebCore {
 
 class FileStreamClient {
@@ -53,6 +51,4 @@ protected:
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB)
-
 #endif // FileStreamClient_h
index 9ed90909d57434d015cb2008d5781c4d140b1986..7dc3b2b50975f7af43bc209a2232829320c8b741 100644 (file)
@@ -98,11 +98,9 @@ static URLSchemesMap& canDisplayOnlyIfCanRequestSchemes()
 {
     DEPRECATED_DEFINE_STATIC_LOCAL(URLSchemesMap, canDisplayOnlyIfCanRequestSchemes, ());
 
-#if ENABLE(BLOB)
     if (canDisplayOnlyIfCanRequestSchemes.isEmpty()) {
         canDisplayOnlyIfCanRequestSchemes.add("blob");
     }
-#endif // ENABLE(BLOB)
 
     return canDisplayOnlyIfCanRequestSchemes;
 }
index 4a61df4c9885da7c0acc864b0569371a2957b70a..86018fe31dddae72cbb146ca689b2e39e46b99f7 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "BlobRegistry.h"
 
-#if ENABLE(BLOB)
-
 #include "BlobRegistryImpl.h"
 #include "LoaderStrategy.h"
 #include "PlatformStrategies.h"
@@ -52,5 +50,3 @@ BlobRegistry::~BlobRegistry()
 }
 
 }
-
-#endif
index 9f2cd6624dec6f2973d8f76ccfb33b90a88a645f..f09b9ed387f46719639d0df32c9f7f756cfd406f 100644 (file)
@@ -32,8 +32,6 @@
 #include "config.h"
 #include "BlobRegistryImpl.h"
 
-#if ENABLE(BLOB)
-
 #include "BlobData.h"
 #include "BlobPart.h"
 #include "BlobResourceHandle.h"
@@ -237,5 +235,3 @@ unsigned long long BlobRegistryImpl::blobSize(const URL& url)
 }
 
 } // namespace WebCore
-
-#endif
index c45470713a7d98b8b20ad6ecac12733b8dca8645..3046cd1f445eb9694fa444f0162182e935f5c73d 100644 (file)
@@ -30,8 +30,6 @@
 
 #include "config.h"
 
-#if ENABLE(BLOB)
-
 #include "BlobResourceHandle.h"
 
 #include "AsyncFileStream.h"
@@ -689,5 +687,3 @@ void BlobResourceHandle::notifyFinish()
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(BLOB)
index 47db9d1098099331ad950add44849a75e2194665..6acb7fc31db412a2ef8d75decdf66a7163dc1a8d 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef BlobResourceHandle_h
 #define BlobResourceHandle_h
 
-#if ENABLE(BLOB)
-
 #include "FileStreamClient.h"
 #include "ResourceHandle.h"
 #include <wtf/PassRefPtr.h>
@@ -114,6 +112,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(BLOB)
-
 #endif // BlobResourceHandle_h
index ce9e7ec1d531e00d77994ca9452a8e2b736036cb..0b861789733d3669d8a4b795202a434dafcd1d62 100644 (file)
@@ -131,17 +131,11 @@ PassRefPtr<FormData> FormData::deepCopy() const
             formData->m_elements.uncheckedAppend(FormDataElement(element.m_data));
             break;
         case FormDataElement::Type::EncodedFile:
-#if ENABLE(BLOB)
             formData->m_elements.uncheckedAppend(FormDataElement(element.m_filename, element.m_fileStart, element.m_fileLength, element.m_expectedFileModificationTime, element.m_shouldGenerateFile));
-#else
-            formData->m_elements.uncheckedAppend(FormDataElement(element.m_filename, element.m_shouldGenerateFile));
-#endif
             break;
-#if ENABLE(BLOB)
         case FormDataElement::Type::EncodedBlob:
             formData->m_elements.uncheckedAppend(FormDataElement(element.m_url));
             break;
-#endif
         }
     }
     return formData.release();
@@ -154,14 +148,9 @@ void FormData::appendData(const void* data, size_t size)
 
 void FormData::appendFile(const String& filename, bool shouldGenerateFile)
 {
-#if ENABLE(BLOB)
     m_elements.append(FormDataElement(filename, 0, BlobDataItem::toEndOfFile, invalidFileTime(), shouldGenerateFile));
-#else
-    m_elements.append(FormDataElement(filename, shouldGenerateFile));
-#endif
 }
 
-#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));
@@ -171,7 +160,6 @@ void FormData::appendBlob(const URL& blobURL)
 {
     m_elements.append(FormDataElement(blobURL));
 }
-#endif
 
 void FormData::appendKeyValuePairItems(const FormDataList& list, const TextEncoding& encoding, bool isMultiPartForm, Document* document, EncodingType encodingType)
 {
@@ -242,10 +230,8 @@ void FormData::appendKeyValuePairItems(const FormDataList& list, const TextEncod
                     if (!file->path().isEmpty())
                         appendFile(file->path(), shouldGenerateFile);
                 }
-#if ENABLE(BLOB)
                 else
                     appendBlob(value.blob()->url());
-#endif
             } else
                 appendData(value.data().data(), value.data().length());
             appendData("\r\n", 2);
@@ -294,7 +280,6 @@ String FormData::flattenToString() const
     return Latin1Encoding().decode(reinterpret_cast<const char*>(bytes.data()), bytes.size());
 }
 
-#if ENABLE(BLOB)
 static void appendBlobResolved(FormData* formData, const URL& url)
 {
     if (!blobRegistry().isBlobRegistryImpl()) {
@@ -354,7 +339,6 @@ PassRefPtr<FormData> FormData::resolveBlobReferences()
     }
     return newFormData.release();
 }
-#endif
 
 void FormData::generateFiles(Document* document)
 {
@@ -423,22 +407,14 @@ static void encodeElement(Encoder& encoder, const FormDataElement& element)
         encoder.encodeString(element.m_filename);
         encoder.encodeString(element.m_generatedFilename);
         encoder.encodeBool(element.m_shouldGenerateFile);
-#if ENABLE(BLOB)
         encoder.encodeInt64(element.m_fileStart);
         encoder.encodeInt64(element.m_fileLength);
         encoder.encodeDouble(element.m_expectedFileModificationTime);
-#else
-        encoder.encodeInt64(0);
-        encoder.encodeInt64(0);
-        encoder.encodeDouble(invalidFileTime());
-#endif
         return;
 
-#if ENABLE(BLOB)
     case FormDataElement::Type::EncodedBlob:
         encoder.encodeString(element.m_url.string());
         return;
-#endif
     }
 
     ASSERT_NOT_REACHED();
@@ -456,18 +432,14 @@ static void encodeElement(KeyedEncoder& encoder, const FormDataElement& element)
         encoder.encodeString("filename", element.m_filename);
         encoder.encodeString("generatedFilename", element.m_generatedFilename);
         encoder.encodeBool("shouldGenerateFile", element.m_shouldGenerateFile);
-#if ENABLE(BLOB)
         encoder.encodeInt64("fileStart", element.m_fileStart);
         encoder.encodeInt64("fileLength", element.m_fileLength);
         encoder.encodeDouble("expectedFileModificationTime", element.m_expectedFileModificationTime);
-#endif
         return;
 
-#if ENABLE(BLOB)
     case FormDataElement::Type::EncodedBlob:
         encoder.encodeString("url", element.m_url.string());
         return;
-#endif
     }
 
     ASSERT_NOT_REACHED();
@@ -517,15 +489,12 @@ static bool decodeElement(Decoder& decoder, FormDataElement& element)
             return false;
 
         element.m_filename = filenameOrURL;
-#if ENABLE(BLOB)
         element.m_fileStart = fileStart;
         element.m_fileLength = fileLength;
         element.m_expectedFileModificationTime = expectedFileModificationTime;
-#endif
         return true;
     }
 
-#if ENABLE(BLOB)
     case FormDataElement::Type::EncodedBlob:
         element.m_type = FormDataElement::Type::EncodedBlob;
         String blobURLString;
@@ -533,7 +502,6 @@ static bool decodeElement(Decoder& decoder, FormDataElement& element)
             return false;
         element.m_url = URL(URL(), blobURLString);
         return true;
-#endif
 
     }
 
@@ -546,9 +514,7 @@ static bool decodeElement(KeyedDecoder& decoder, FormDataElement& element)
         switch (type) {
         case FormDataElement::Type::Data:
         case FormDataElement::Type::EncodedFile:
-#if ENABLE(BLOB)
         case FormDataElement::Type::EncodedBlob:
-#endif
             return true;
         }
 
@@ -570,7 +536,6 @@ static bool decodeElement(KeyedDecoder& decoder, FormDataElement& element)
         if (!decoder.decodeBool("shouldGenerateFile", element.m_shouldGenerateFile))
             return false;
 
-#if ENABLE(BLOB)
         int64_t fileStart;
         if (!decoder.decodeInt64("fileStart", fileStart))
             return false;
@@ -590,11 +555,9 @@ static bool decodeElement(KeyedDecoder& decoder, FormDataElement& element)
         element.m_fileStart = fileStart;
         element.m_fileLength = fileLength;
         element.m_expectedFileModificationTime = expectedFileModificationTime;
-#endif
         break;
     }
 
-#if ENABLE(BLOB)
     case FormDataElement::Type::EncodedBlob: {
         String blobURLString;
         if (!decoder.decodeString("url", blobURLString))
@@ -603,7 +566,6 @@ static bool decodeElement(KeyedDecoder& decoder, FormDataElement& element)
         element.m_url = URL(URL(), blobURLString);
         break;
     }
-#endif
     }
 
     return true;
index c06d2187f6e0f1c4e7760138ec49971fe496bc34..147e89d5506ac1b8219c710ee55a3d83e20e3585 100644 (file)
@@ -39,9 +39,7 @@ public:
     enum class Type {
         Data,
         EncodedFile,
-#if ENABLE(BLOB)
         EncodedBlob,
-#endif
     };
 
     FormDataElement()
@@ -55,7 +53,6 @@ public:
     {
     }
 
-#if ENABLE(BLOB)
     FormDataElement(const String& filename, long long fileStart, long long fileLength, double expectedFileModificationTime, bool shouldGenerateFile)
         : m_type(Type::EncodedFile)
         , m_filename(filename)
@@ -72,25 +69,14 @@ public:
         , m_url(blobURL)
     {
     }
-#else
-    FormDataElement(const String& filename, bool shouldGenerateFile)
-        : m_type(Type::EncodedFile)
-        , m_filename(filename)
-        , m_shouldGenerateFile(shouldGenerateFile)
-        , m_ownsGeneratedFile(false)
-    {
-    }
-#endif
 
     Type m_type;
     Vector<char> m_data;
     String m_filename;
-#if ENABLE(BLOB)
     URL m_url; // For Blob or URL.
     long long m_fileStart;
     long long m_fileLength;
     double m_expectedFileModificationTime;
-#endif
     // FIXME: Generated file support in FormData is almost identical to Blob, they should be merged.
     // We can't just switch to using Blobs for all files for two reasons:
     // 1. Not all platforms enable BLOB support.
@@ -110,13 +96,9 @@ inline bool operator==(const FormDataElement& a, const FormDataElement& b)
     if (a.m_type == FormDataElement::Type::Data)
         return a.m_data == b.m_data;
     if (a.m_type == FormDataElement::Type::EncodedFile)
-#if ENABLE(BLOB)
         return a.m_filename == b.m_filename && a.m_fileStart == b.m_fileStart && a.m_fileLength == b.m_fileLength && a.m_expectedFileModificationTime == b.m_expectedFileModificationTime;
     if (a.m_type == FormDataElement::Type::EncodedBlob)
         return a.m_url == b.m_url;
-#else
-        return a.m_filename == b.m_filename;
-#endif
 
     return true;
 }
@@ -154,20 +136,16 @@ public:
 
     void appendData(const void* data, size_t);
     void appendFile(const String& filePath, bool shouldGenerateFile = false);
-#if ENABLE(BLOB)
     void appendFileRange(const String& filename, long long start, long long length, double expectedModificationTime, bool shouldGenerateFile = false);
     void appendBlob(const URL& blobURL);
-#endif
     char* expandDataStore(size_t);
 
     void flatten(Vector<char>&) const; // omits files
     String flattenToString() const; // omits files
 
-#if ENABLE(BLOB)
     // Resolve all blob references so we only have file and data.
     // If the FormData has no blob references to resolve, this is returned.
     PassRefPtr<FormData> resolveBlobReferences();
-#endif
 
     bool isEmpty() const { return m_elements.isEmpty(); }
     const Vector<FormDataElement>& elements() const { return m_elements; }
index 219c821b39b75878bc94e303f9016ad6d902dd1f..3ed8276f78cac9524ee4b05da34f383ef49e192a 100644 (file)
@@ -104,9 +104,7 @@ struct FormStreamFields {
     SchedulePairHashSet scheduledRunLoopPairs;
     Vector<FormDataElement> remainingElements; // in reverse order
     CFReadStreamRef currentStream;
-#if ENABLE(BLOB)
     long long currentStreamRangeLength;
-#endif
     MallocPtr<char> currentData;
     CFReadStreamRef formStream;
     unsigned long long streamLength;
@@ -120,9 +118,7 @@ static void closeCurrentStream(FormStreamFields* form)
         CFReadStreamSetClient(form->currentStream, kCFStreamEventNone, 0, 0);
         CFRelease(form->currentStream);
         form->currentStream = 0;
-#if ENABLE(BLOB)
         form->currentStreamRangeLength = BlobDataItem::toEndOfFile;
-#endif
     }
 
     form->currentData = nullptr;
@@ -145,27 +141,23 @@ static bool advanceCurrentStream(FormStreamFields* form)
         form->currentStream = CFReadStreamCreateWithBytesNoCopy(0, reinterpret_cast<const UInt8*>(data.get()), size, kCFAllocatorNull);
         form->currentData = std::move(data);
     } else {
-#if ENABLE(BLOB)
         // Check if the file has been changed or not if required.
         if (isValidFileTime(nextInput.m_expectedFileModificationTime)) {
             time_t fileModificationTime;
             if (!getFileModificationTime(nextInput.m_filename, fileModificationTime) || fileModificationTime != static_cast<time_t>(nextInput.m_expectedFileModificationTime))
                 return false;
         }
-#endif
         const String& path = nextInput.m_shouldGenerateFile ? nextInput.m_generatedFilename : nextInput.m_filename;
         form->currentStream = CFReadStreamCreateWithFile(0, pathAsURL(path).get());
         if (!form->currentStream) {
             // The file must have been removed or become unreadable.
             return false;
         }
-#if ENABLE(BLOB)
         if (nextInput.m_fileStart > 0) {
             RetainPtr<CFNumberRef> position = adoptCF(CFNumberCreate(0, kCFNumberLongLongType, &nextInput.m_fileStart));
             CFReadStreamSetProperty(form->currentStream, kCFStreamPropertyFileCurrentOffset, position.get());
         }
         form->currentStreamRangeLength = nextInput.m_fileLength;
-#endif
     }
     form->remainingElements.removeLast();
 
@@ -201,9 +193,7 @@ static void* formCreate(CFReadStreamRef stream, void* context)
     FormStreamFields* newInfo = new FormStreamFields;
     newInfo->formData = formContext->formData.release();
     newInfo->currentStream = 0;
-#if ENABLE(BLOB)
     newInfo->currentStreamRangeLength = BlobDataItem::toEndOfFile;
-#endif
     newInfo->formStream = stream; // Don't retain. That would create a reference cycle.
     newInfo->streamLength = formContext->streamLength;
     newInfo->bytesSent = 0;
@@ -254,10 +244,8 @@ static CFIndex formRead(CFReadStreamRef, UInt8* buffer, CFIndex bufferLength, CF
 
     while (form->currentStream) {
         CFIndex bytesToRead = bufferLength;
-#if ENABLE(BLOB)
         if (form->currentStreamRangeLength != BlobDataItem::toEndOfFile && form->currentStreamRangeLength < bytesToRead)
             bytesToRead = static_cast<CFIndex>(form->currentStreamRangeLength);
-#endif
         CFIndex bytesRead = CFReadStreamRead(form->currentStream, buffer, bytesToRead);
         if (bytesRead < 0) {
             *error = CFReadStreamGetError(form->currentStream);
@@ -267,10 +255,8 @@ static CFIndex formRead(CFReadStreamRef, UInt8* buffer, CFIndex bufferLength, CF
             error->error = 0;
             *atEOF = FALSE;
             form->bytesSent += bytesRead;
-#if ENABLE(BLOB)
             if (form->currentStreamRangeLength != BlobDataItem::toEndOfFile)
                 form->currentStreamRangeLength -= bytesRead;
-#endif
 
             return bytesRead;
         }
@@ -385,10 +371,8 @@ void setHTTPBody(CFMutableURLRequestRef request, PassRefPtr<FormData> prpFormDat
         }
     }
 
-#if ENABLE(BLOB)
     formData = formData->resolveBlobReferences();
     count = formData->elements().size();
-#endif
 
     // Precompute the content length so NSURLConnection doesn't use chunked mode.
     unsigned long long length = 0;
@@ -397,13 +381,11 @@ void setHTTPBody(CFMutableURLRequestRef request, PassRefPtr<FormData> prpFormDat
         if (element.m_type == FormDataElement::Type::Data)
             length += element.m_data.size();
         else {
-#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 != BlobDataItem::toEndOfFile) {
                 length += element.m_fileLength;
                 continue;
             }
-#endif
             long long fileSize;
             if (getFileSize(element.m_shouldGenerateFile ? element.m_generatedFilename : element.m_filename, fileSize))
                 length += fileSize;
index 82c3db1db4ebf7f14b1c75e20314b5eb223a6fe2..c8d24afaabb1e37cf28769a842e93314cf4178ed 100644 (file)
@@ -753,11 +753,9 @@ static inline size_t getFormElementsCount(ResourceHandle* job)
     if (!formData)
         return 0;
 
-#if ENABLE(BLOB)
     // Resolve the blob elements so the formData can correctly report it's size.
     formData = formData->resolveBlobReferences();
     job->firstRequest().setHTTPBody(formData);
-#endif
 
     return formData->elements().size();
 }
index 1f9cb6c044a5d2f55bdefd1c8887caa0893e11d7..bbe3b4939c58644dc6ee3f5f283a210040ed0b23 100644 (file)
 #include <wtf/text/Base64.h>
 #include <wtf/text/CString.h>
 
-#if ENABLE(BLOB)
 #include "BlobData.h"
 #include "BlobRegistryImpl.h"
-#endif
 
 #if PLATFORM(GTK)
 #include "CredentialBackingStore.h"
@@ -752,7 +750,6 @@ static bool addFileToSoupMessageBody(SoupMessage* message, const String& fileNam
     return true;
 }
 
-#if ENABLE(BLOB)
 static bool blobIsOutOfDate(const BlobDataItem& blobItem)
 {
     ASSERT(blobItem.type == BlobDataItem::File);
@@ -790,7 +787,6 @@ static void addEncodedBlobToSoupMessageBody(SoupMessage* message, const FormData
     for (size_t i = 0; i < blobData->items().size(); ++i)
         addEncodedBlobItemToSoupMessageBody(message, blobData->items()[i], totalBodySize);
 }
-#endif // ENABLE(BLOB)
 
 static bool addFormElementsToSoupMessage(SoupMessage* message, const char*, FormData* httpBody, unsigned long& totalBodySize)
 {
@@ -816,10 +812,8 @@ static bool addFormElementsToSoupMessage(SoupMessage* message, const char*, Form
             continue;
         }
 
-#if ENABLE(BLOB)
         ASSERT(element.m_type == FormDataElement::Type::EncodedBlob);
         addEncodedBlobToSoupMessageBody(message, element, totalBodySize);
-#endif
     }
     return true;
 }
index 5d0bd4ecbae6b3c688af9d6a6baff52003d8bf73..668d885ba2f7ca6a6def6c6215f7cab8ab1fda1e 100644 (file)
@@ -57,7 +57,7 @@
 
     // Additional constructors
 
-    [Conditional=BLOB] attribute DOMURLConstructor webkitURL; // FIXME: deprecate this.
+    attribute DOMURLConstructor webkitURL; // FIXME: deprecate this.
 };
 
 WorkerGlobalScope implements WindowTimers;
index 84e492dafe5f0229ade469eeb9b151a3a4bff3fc..4d2784570278c1765fd831eef611a7712404b9f3 100644 (file)
@@ -660,12 +660,7 @@ void XMLHttpRequest::send(Blob* body, ExceptionCode& ec)
         }
 
         m_requestEntityBody = FormData::create();
-#if ENABLE(BLOB)
         m_requestEntityBody->appendBlob(body->url());
-#else
-        if (body->isFile())
-            m_requestEntityBody->appendFile(toFile(body)->path());
-#endif
     }
 
     createRequest(ec);
@@ -727,13 +722,11 @@ void XMLHttpRequest::sendForInspectorXHRReplay(PassRefPtr<FormData> formData, Ex
 
 void XMLHttpRequest::createRequest(ExceptionCode& ec)
 {
-#if ENABLE(BLOB)
     // Only GET request is supported for blob URL.
     if (m_url.protocolIs("blob") && m_method != "GET") {
         ec = XMLHttpRequestException::NETWORK_ERR;
         return;
     }
-#endif
 
     // The presence of upload event listeners forces us to use preflighting because POSTing to an URL that does not
     // permit cross origin requests should look exactly like POSTing to an URL that does not respond at all.
index 7f8d262ac1467c35d246a129019962db838c4055..76e7db43a296a67e46b823b9ec2485fe911d279a 100644 (file)
@@ -1,3 +1,14 @@
+2014-05-27  Tibor Meszaros  <tmeszaros.u-szeged@partner.samsung.com>
+
+        Remove BLOB guards
+        https://bugs.webkit.org/show_bug.cgi?id=132863
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * WebView/WebView.mm:
+        (+[WebView _canHandleRequest:forMainFrame:]):
+
 2014-05-24  Chris Fleizach  <cfleizach@apple.com>
 
         AX: fix coordinate mapping for iOS accessibility
index cb6bb3a334945f7592f4d037c746c15d6b01951f..257cc7891e2f3c75f8fd85462e13e03bdb9ba88b 100644 (file)
@@ -43,7 +43,6 @@ ENABLE_AVF_CAPTIONS_macosx_1090 = ;
 ENABLE_AVF_CAPTIONS_macosx_101000 = ENABLE_AVF_CAPTIONS;
 ENABLE_AVF_CAPTIONS_iphoneos = ENABLE_AVF_CAPTIONS;
 ENABLE_AVF_CAPTIONS_iphonesimulator = $(ENABLE_AVF_CAPTIONS_iphoneos);
-ENABLE_BLOB = ENABLE_BLOB;
 ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
 ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH;
 ENABLE_CANVAS_PROXY = ;
@@ -239,4 +238,4 @@ ENABLE_FTL_JIT_iphonesimulator = ;
 
 ENABLE_LLINT_C_LOOP = ;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
index 0578f7e00a1e84f993b30115afd2c2732cdb097c..584f5b13a9837f4431cd039e854167a25894e25d 100644 (file)
@@ -2721,10 +2721,8 @@ static inline IMP getMethod(id o, SEL s)
     if ([scheme _webkit_isCaseInsensitiveEqualToString:@"applewebdata"])
         return YES;
 
-#if ENABLE(BLOB)
     if ([scheme _webkit_isCaseInsensitiveEqualToString:@"blob"])
         return YES;
-#endif
 
     return NO;
 }
index d4b9765f1456662bd681db65858e309a9b89990a..ea132e1d9d292fbe6aba9657e3157b5ba69bb6fb 100644 (file)
@@ -1,3 +1,29 @@
+2014-05-27  Tibor Meszaros  <tmeszaros.u-szeged@partner.samsung.com>
+
+        Remove BLOB guards
+        https://bugs.webkit.org/show_bug.cgi?id=132863
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:
+        * NetworkProcess/FileAPI/NetworkBlobRegistry.h:
+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+        (WebKit::NetworkConnectionToWebProcess::didClose):
+        (WebKit::NetworkConnectionToWebProcess::blobSize):
+        * NetworkProcess/NetworkConnectionToWebProcess.h:
+        * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+        * NetworkProcess/NetworkProcessPlatformStrategies.cpp:
+        * NetworkProcess/NetworkProcessPlatformStrategies.h:
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::NetworkResourceLoader):
+        * WebProcess/FileAPI/BlobRegistryProxy.cpp:
+        * WebProcess/FileAPI/BlobRegistryProxy.h:
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::canHandleRequest):
+
 2014-05-26  Tim Horton  <timothy_horton@apple.com>
 
         [wk2] RemoteLayerBackingStore front buffers should be purgeable when unparented
index cb6bb3a334945f7592f4d037c746c15d6b01951f..257cc7891e2f3c75f8fd85462e13e03bdb9ba88b 100644 (file)
@@ -43,7 +43,6 @@ ENABLE_AVF_CAPTIONS_macosx_1090 = ;
 ENABLE_AVF_CAPTIONS_macosx_101000 = ENABLE_AVF_CAPTIONS;
 ENABLE_AVF_CAPTIONS_iphoneos = ENABLE_AVF_CAPTIONS;
 ENABLE_AVF_CAPTIONS_iphonesimulator = $(ENABLE_AVF_CAPTIONS_iphoneos);
-ENABLE_BLOB = ENABLE_BLOB;
 ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
 ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH;
 ENABLE_CANVAS_PROXY = ;
@@ -239,4 +238,4 @@ ENABLE_FTL_JIT_iphonesimulator = ;
 
 ENABLE_LLINT_C_LOOP = ;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
index 81a284b9a16bf73a309877e70974da34d46537eb..9b339fd2744c57b68e6fb13842bcb20c7348e14c 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "NetworkBlobRegistry.h"
 
-#if ENABLE(BLOB) && ENABLE(NETWORK_PROCESS)
+#if ENABLE(NETWORK_PROCESS)
 
 #include "BlobDataFileReferenceWithSandboxExtension.h"
 #include "SandboxExtension.h"
index d3605f6ad0d76c3650377d954d1f90fcfcfafade..e5db63e38dcfbfbeadf71262c96dbc9ebe652c17 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef NetworkBlobRegistry_h
 #define NetworkBlobRegistry_h
 
-#if ENABLE(BLOB) && ENABLE(NETWORK_PROCESS)
+#if ENABLE(NETWORK_PROCESS)
 
 #include <WebCore/URLHash.h>
 #include <wtf/HashMap.h>
@@ -68,6 +68,6 @@ private:
 
 }
 
-#endif // ENABLE(BLOB) && ENABLE(NETWORK_PROCESS)
+#endif // ENABLE(NETWORK_PROCESS)
 
 #endif // NetworkBlobRegistry_h
index c0eee5d15edc490eef46cd0cd51ede135efedfdf..6d22103b335ff5a6334e749fb40a386b31c9d0ce 100644 (file)
@@ -98,9 +98,7 @@ void NetworkConnectionToWebProcess::didClose(IPC::Connection*)
     for (HashMap<ResourceLoadIdentifier, RefPtr<NetworkResourceLoader>>::iterator i = m_networkResourceLoaders.begin(); i != end; ++i)
         i->value->abort();
 
-#if ENABLE(BLOB)
     NetworkBlobRegistry::shared().connectionToWebProcessDidClose(this);
-#endif
 
     m_networkResourceLoaders.clear();
     
@@ -222,7 +220,6 @@ void NetworkConnectionToWebProcess::deleteCookie(SessionID sessionID, const URL&
     WebCore::deleteCookie(storageSession(sessionID), url, cookieName);
 }
 
-#if ENABLE(BLOB)
 void NetworkConnectionToWebProcess::registerFileBlobURL(const URL& url, const String& path, const SandboxExtension::Handle& extensionHandle, const String& contentType)
 {
     RefPtr<SandboxExtension> extension = SandboxExtension::create(extensionHandle);
@@ -254,7 +251,6 @@ void NetworkConnectionToWebProcess::blobSize(const URL& url, uint64_t& resultSiz
 {
     resultSize = NetworkBlobRegistry::shared().blobSize(this, url);
 }
-#endif
 
 } // namespace WebKit
 
index 4c343034a318a58353ae8dd14ddcabb2f6fad7c6..f302d2d26394fa04ed2ba2a0bb507d8b468c43c4 100644 (file)
@@ -86,14 +86,12 @@ private:
     void getRawCookies(WebCore::SessionID, const WebCore::URL& firstParty, const WebCore::URL&, Vector<WebCore::Cookie>&);
     void deleteCookie(WebCore::SessionID, const WebCore::URL&, const String& cookieName);
 
-#if ENABLE(BLOB)
     void registerFileBlobURL(const WebCore::URL&, const String& path, const SandboxExtension::Handle&, const String& contentType);
     void registerBlobURL(const WebCore::URL&, Vector<WebCore::BlobPart>, const String& contentType);
     void registerBlobURLFromURL(const WebCore::URL&, const WebCore::URL& srcURL);
     void registerBlobURLForSlice(const WebCore::URL&, const WebCore::URL& srcURL, int64_t start, int64_t end);
     void blobSize(const WebCore::URL&, uint64_t& resultSize);
     void unregisterBlobURL(const WebCore::URL&);
-#endif
 
     RefPtr<IPC::Connection> m_connection;
 
index 53120cbaeacca5252f41d9eef18984cd580bcd38..53fb7290eb5dd5416e3978f40db9261725a7132a 100644 (file)
@@ -43,14 +43,12 @@ messages -> NetworkConnectionToWebProcess LegacyReceiver {
     GetRawCookies(WebCore::SessionID sessionID, WebCore::URL firstParty, WebCore::URL url) -> (Vector<WebCore::Cookie> cookies)
     DeleteCookie(WebCore::SessionID sessionID, WebCore::URL url, String cookieName)
 
-#if ENABLE(BLOB)
     RegisterFileBlobURL(WebCore::URL url, String path, WebKit::SandboxExtension::Handle extensionHandle, String contentType)
     RegisterBlobURL(WebCore::URL url, Vector<WebCore::BlobPart> blobParts, String contentType)
     RegisterBlobURLFromURL(WebCore::URL url, WebCore::URL srcURL)
     RegisterBlobURLForSlice(WebCore::URL url, WebCore::URL srcURL, int64_t start, int64_t end)
     UnregisterBlobURL(WebCore::URL url)
     BlobSize(WebCore::URL url) -> (uint64_t resultSize)
-#endif
 }
 
 #endif // ENABLE(NETWORK_PROCESS)
index bf3a095302cb9d9de297ceca166a121a719295f6..55d8a994ab35392d4d2888bd79cdbe6285a92f18 100644 (file)
@@ -85,13 +85,9 @@ void NetworkProcessPlatformStrategies::loadResourceSynchronously(NetworkingConte
     ASSERT_NOT_REACHED();
 }
 
-#if ENABLE(BLOB)
 BlobRegistry* NetworkProcessPlatformStrategies::createBlobRegistry()
 {
     return new BlobRegistryImpl;
 }
 
-#endif
-
-
 }
index 4a017855334aeaa18a6c0cdf522546aa7f4084a0..60be6158cea1bdd8bb0eccdd46b3ed09b815ffb9 100644 (file)
@@ -48,9 +48,7 @@ private:
     // WebCore::LoaderStrategy
     virtual WebCore::ResourceLoadScheduler* resourceLoadScheduler() override;
     virtual void loadResourceSynchronously(WebCore::NetworkingContext*, unsigned long resourceLoadIdentifier, const WebCore::ResourceRequest&, WebCore::StoredCredentials, WebCore::ClientCredentialPolicy, WebCore::ResourceError&, WebCore::ResourceResponse&, Vector<char>& data) override;
-#if ENABLE(BLOB)
     virtual WebCore::BlobRegistry* createBlobRegistry() override;
-#endif
 };
 
 } // namespace WebKit
index 26b471c96876e32ed18ec670c8cfd1eebf656c46..79084409821c611d0c822c08d4dcf3d45cf9beb4 100644 (file)
@@ -82,7 +82,6 @@ NetworkResourceLoader::NetworkResourceLoader(const NetworkResourceLoadParameters
             m_requestBodySandboxExtensions.append(extension);
     }
 
-#if ENABLE(BLOB)
     if (m_request.httpBody()) {
         for (const FormDataElement& element : m_request.httpBody()->elements()) {
             if (element.m_type == FormDataElement::Type::EncodedBlob)
@@ -94,7 +93,7 @@ NetworkResourceLoader::NetworkResourceLoader(const NetworkResourceLoadParameters
         ASSERT(!SandboxExtension::create(parameters.resourceSandboxExtension));
         m_fileReferences.appendVector(NetworkBlobRegistry::shared().filesInBlob(connection, m_request.url()));
     } else
-#endif
+
     if (RefPtr<SandboxExtension> resourceSandboxExtension = SandboxExtension::create(parameters.resourceSandboxExtension))
         m_resourceSandboxExtensions.append(resourceSandboxExtension);
 
index eeceb66c7b3ff9587ca932cf418a921f1083a74a..45335ed8876a61029a0632a54f516a54cb6b8534 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "BlobRegistryProxy.h"
 
-#if ENABLE(BLOB) && ENABLE(NETWORK_PROCESS)
+#if ENABLE(NETWORK_PROCESS)
 
 #include "NetworkConnectionToWebProcessMessages.h"
 #include "NetworkProcessConnection.h"
@@ -91,4 +91,4 @@ unsigned long long BlobRegistryProxy::blobSize(const URL& url)
 
 }
 
-#endif // ENABLE(BLOB) && ENABLE(NETWORK_PROCESS)
+#endif // ENABLE(NETWORK_PROCESS)
index a5e20bdb3b26cacac29029d35d9a4549675945bb..8cc069ae5f2528bd0302374c5673a7fc8e21c9d2 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef BlobRegistryProxy_h
 #define BlobRegistryProxy_h
 
-#if ENABLE(BLOB) && ENABLE(NETWORK_PROCESS)
+#if ENABLE(NETWORK_PROCESS)
 
 #include <WebCore/BlobRegistry.h>
 
@@ -44,6 +44,6 @@ public:
 
 }
 
-#endif // ENABLE(BLOB) && ENABLE(NETWORK_PROCESS)
+#endif // ENABLE(NETWORK_PROCESS)
 
 #endif // BlobRegistryProxy_h
index 78a53375b09209c7befa98b52caccf4bc5d2e5ea..76aa2fd9cf4cc8783bdaa6420f2f6993d4bce6b5 100644 (file)
@@ -276,7 +276,6 @@ void WebPlatformStrategies::loadResourceSynchronously(NetworkingContext* context
     }
 }
 
-#if ENABLE(BLOB)
 BlobRegistry* WebPlatformStrategies::createBlobRegistry()
 {
     if (!WebProcess::shared().usesNetworkProcess())
@@ -284,7 +283,6 @@ BlobRegistry* WebPlatformStrategies::createBlobRegistry()
     return new BlobRegistryProxy;    
 }
 #endif
-#endif
 
 // PluginStrategy
 
index 7dcd0775ea9d04e533a5b8ea27adbc4d14cdb979..32484123d2c6f4d1a064046542132199bd60fb91 100644 (file)
@@ -75,9 +75,7 @@ private:
 #if ENABLE(NETWORK_PROCESS)
     virtual WebCore::ResourceLoadScheduler* resourceLoadScheduler() override;
     virtual void loadResourceSynchronously(WebCore::NetworkingContext*, unsigned long resourceLoadIdentifier, const WebCore::ResourceRequest&, WebCore::StoredCredentials, WebCore::ClientCredentialPolicy, WebCore::ResourceError&, WebCore::ResourceResponse&, Vector<char>& data) override;
-#if ENABLE(BLOB)
     virtual WebCore::BlobRegistry* createBlobRegistry() override;
-#endif
 #endif
 
     // WebCore::PluginStrategy
index cbb2bd3fd669bc437d2ab73e0ba3b5a9c875a677..94f31fcaad6fe220ad238d411b8c7f8d57cd1e98 100644 (file)
@@ -3820,10 +3820,8 @@ bool WebPage::canHandleRequest(const WebCore::ResourceRequest& request)
     if (SchemeRegistry::shouldLoadURLSchemeAsEmptyDocument(request.url().protocol()))
         return true;
 
-#if ENABLE(BLOB)
     if (request.url().protocolIs("blob"))
         return true;
-#endif
 
     return platformCanHandleRequest(request);
 }
index e06db6794bb852bc81e563a8eead74d1fde6a3f2..d5e305e6924b93767f2e01ddafbdf2cf0d59db7e 100644 (file)
@@ -51,7 +51,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_RENDERING ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BLOB ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_FILTERS ON)
index 85390bffd93f43edf3ff4c057a044271ceff7465..31e8048d6f5df2438d8af67bd335579b7fa3ed4d 100644 (file)
@@ -20,7 +20,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_RENDERING ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BLOB ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT OFF)
index a2d9c77c2d2d987541986c8156a850d42918ec97..ab9318e0dd0aee6755e08f39ff3abba61d2c1abb 100644 (file)
@@ -17,7 +17,6 @@ macro(WEBKIT_OPTION_BEGIN)
     WEBKIT_OPTION_DEFINE(ENABLE_API_TESTS "Enable public API unit tests" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_ASSEMBLER_WX_EXCLUSIVE "Toggle Assembler WX Exclusive support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_BATTERY_STATUS "Toggle battery status API support" OFF)
-    WEBKIT_OPTION_DEFINE(ENABLE_BLOB "Toggle Blob support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CANVAS_PATH "Toggle Canvas Path support" ON)
     WEBKIT_OPTION_DEFINE(ENABLE_CANVAS_PROXY "Toggle CanvasProxy support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CHANNEL_MESSAGING "Toggle MessageChannel and MessagePort support" ON)
index f588439d9d04a95fd30b7aa681bf433b01736151..3581d85b6864ccdbd74a0fabd1a0982c361b6ac0 100644 (file)
@@ -7,7 +7,6 @@
 #cmakedefine01 ENABLE_API_TESTS
 #cmakedefine01 ENABLE_ASSEMBLER_WX_EXCLUSIVE
 #cmakedefine01 ENABLE_BATTERY_STATUS
-#cmakedefine01 ENABLE_BLOB
 #cmakedefine01 ENABLE_CANVAS_PATH
 #cmakedefine01 ENABLE_CANVAS_PROXY
 #cmakedefine01 ENABLE_CHANNEL_MESSAGING
index 6d9cca803d3bfbbe2e6d7ef4f3bd4bff9e08ba64..2901dcfb482c4ee369400171788eaa72185c44e9 100644 (file)
@@ -1,3 +1,12 @@
+2014-05-27  Tibor Meszaros  <tmeszaros.u-szeged@partner.samsung.com>
+
+        Remove BLOB guards
+        https://bugs.webkit.org/show_bug.cgi?id=132863
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Scripts/webkitperl/FeatureList.pm:
+
 2014-05-27  Alberto Garcia  <berto@igalia.com>
 
         Remove leftover comment from r165182.
index a0f191ee925aa424dd4413ffc07ed955d31911ce..d2ecc5b063fcbb1fe5ac25bbfbba2f980f66d6f6 100644 (file)
@@ -45,7 +45,6 @@ my (
     $threeDRenderingSupport,
     $accelerated2DCanvasSupport,
     $batteryStatusSupport,
-    $blobSupport,
     $canvasPathSupport,
     $canvasProxySupport,
     $channelMessagingSupport,
@@ -161,9 +160,6 @@ my @features = (
     { option => "battery-status", desc => "Toggle Battery Status support",
       define => "ENABLE_BATTERY_STATUS", default => isEfl(), value => \$batteryStatusSupport },
 
-    { option => "blob", desc => "Toggle Blob support",
-      define => "ENABLE_BLOB", default => ((isAppleMacWebKit() && !isIOSWebKit()) || isGtk() || isEfl()), value => \$blobSupport },
-
     { option => "canvas-path", desc => "Toggle Canvas Path support",
       define => "ENABLE_CANVAS_PATH", default => 1, value => \$canvasPathSupport },
 
index be04f4b5baca545d46832d40449d41a19bd2adcd..6624842e3be92bf67395913bd736e7f4963258a2 100644 (file)
@@ -1,3 +1,13 @@
+2014-05-27  Tibor Meszaros  <tmeszaros.u-szeged@partner.samsung.com>
+
+        Remove BLOB guards
+        https://bugs.webkit.org/show_bug.cgi?id=132863
+
+        Reviewed by Csaba Osztrogonác.
+
+        * win/tools/vsprops/FeatureDefines.props:
+        * win/tools/vsprops/FeatureDefinesCairo.props:
+
 2014-05-20  Dean Jackson  <dino@apple.com>
 
         [Mac] Allow popup menus to override default appearance
index af6306dd43928ddbe01ee910f0e95277e7558775..adaf0672a93a4b39bc60b1d9c964479c57a5b0fb 100644 (file)
@@ -4,7 +4,6 @@
     <ENABLE_3D_RENDERING>ENABLE_3D_RENDERING</ENABLE_3D_RENDERING>
     <ENABLE_ACCELERATED_2D_CANVAS />
     <ENABLE_ACCELERATED_OVERFLOW_SCROLLING />
-    <ENABLE_BLOB />
     <ENABLE_CANVAS_PATH>ENABLE_CANVAS_PATH</ENABLE_CANVAS_PATH>
     <ENABLE_CANVAS_PROXY />
     <ENABLE_CHANNEL_MESSAGING>ENABLE_CHANNEL_MESSAGING</ENABLE_CHANNEL_MESSAGING>
@@ -91,7 +90,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-<PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_BLOB);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_TEMPLATE_ELEMENT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_TEMPLATE_ELEMENT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
       <Value>$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>
     </BuildMacro>
-    <BuildMacro Include="ENABLE_BLOB">
-      <Value>$(ENABLE_BLOB)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
-    </BuildMacro>
     <BuildMacro Include="ENABLE_CANVAS_PATH">
       <Value>$(ENABLE_CANVAS_PATH)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>
index ed9957c924b0ad78032d76801f3cb61423a43026..88afcf65b8fc2cbfb6172eda95586f2f65f89134 100644 (file)
@@ -4,7 +4,6 @@
     <ENABLE_3D_RENDERING />
     <ENABLE_ACCELERATED_2D_CANVAS />
     <ENABLE_ACCELERATED_OVERFLOW_SCROLLING />
-    <ENABLE_BLOB />
     <ENABLE_CANVAS_PATH>ENABLE_CANVAS_PATH</ENABLE_CANVAS_PATH>
     <ENABLE_CANVAS_PROXY />
     <ENABLE_CHANNEL_MESSAGING>ENABLE_CHANNEL_MESSAGING</ENABLE_CHANNEL_MESSAGING>
@@ -91,7 +90,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile> 
-<PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_BLOB);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_TEMPLATE_ELEMENT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_TEMPLATE_ELEMENT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
       <Value>$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>
     </BuildMacro>
-    <BuildMacro Include="ENABLE_BLOB">
-      <Value>$(ENABLE_BLOB)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
-    </BuildMacro>
     <BuildMacro Include="ENABLE_CANVAS_PATH">
       <Value>$(ENABLE_CANVAS_PATH)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>