Diff
Modified: trunk/LayoutTests/ChangeLog (115665 => 115666)
--- trunk/LayoutTests/ChangeLog 2012-04-30 21:10:21 UTC (rev 115665)
+++ trunk/LayoutTests/ChangeLog 2012-04-30 21:11:45 UTC (rev 115666)
@@ -1,3 +1,18 @@
+2012-04-30 Sam Weinig <[email protected]>
+
+ Remove BlobBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=84036
+
+ Reviewed by Anders Carlsson.
+
+ * fast/js/constructor-length.html:
+ * platform/mac/fast/js/constructor-length-expected.txt:
+ Remove WebKitBlobBuilder from this test, as it is not exposed on all platforms,
+ and add Blob, which is.
+
+ * platform/mac/Skipped:
+ Skip fast/files/blob-builder-crash.html, since we no longer support WebKitBlobBuilder.
+
2012-04-30 Mark Hahnenberg <[email protected]>
fast/js/random-array-gc-stress times out in debug mode
Modified: trunk/LayoutTests/fast/js/constructor-length.html (115665 => 115666)
--- trunk/LayoutTests/fast/js/constructor-length.html 2012-04-30 21:10:21 UTC (rev 115665)
+++ trunk/LayoutTests/fast/js/constructor-length.html 2012-04-30 21:11:45 UTC (rev 115666)
@@ -10,6 +10,7 @@
shouldBe('ArrayBuffer.length', '1');
shouldBe('AudioContext.length', '0');
shouldBe('BeforeLoadEvent.length', '2');
+shouldBe('Blob.length', '2');
shouldBe('CloseEvent.length', '2');
shouldBe('CustomEvent.length', '2');
shouldBe('DOMFormData.length', '0');
@@ -47,7 +48,6 @@
shouldBe('Uint8ClampedArray.length', '1');
shouldBe('WebGLContextEvent.length', '2');
shouldBe('WebKitAnimationEvent.length', '2');
-shouldBe('WebKitBlobBuilder.length', '0');
shouldBe('WebKitCSSMatrix.length', '1');
shouldBe('WebKitMutationObserver.length', '1');
shouldBe('WebKitPoint.length', '2');
Modified: trunk/LayoutTests/platform/mac/Skipped (115665 => 115666)
--- trunk/LayoutTests/platform/mac/Skipped 2012-04-30 21:10:21 UTC (rev 115665)
+++ trunk/LayoutTests/platform/mac/Skipped 2012-04-30 21:11:45 UTC (rev 115666)
@@ -793,3 +793,6 @@
# Requires rebaseline after bug 83978
tables/mozilla_expected_failures/collapsing_borders/bug41262-5.html
+
+# The Mac port does not support the legacy WebKitBlobBuilder class.
+fast/files/blob-builder-crash.html
\ No newline at end of file
Modified: trunk/LayoutTests/platform/mac/fast/js/constructor-length-expected.txt (115665 => 115666)
--- trunk/LayoutTests/platform/mac/fast/js/constructor-length-expected.txt 2012-04-30 21:10:21 UTC (rev 115665)
+++ trunk/LayoutTests/platform/mac/fast/js/constructor-length-expected.txt 2012-04-30 21:11:45 UTC (rev 115666)
@@ -6,6 +6,7 @@
PASS ArrayBuffer.length is 1
FAIL AudioContext.length should be 0. Threw exception ReferenceError: Can't find variable: AudioContext
PASS BeforeLoadEvent.length is 2
+PASS Blob.length is 2
PASS CloseEvent.length is 2
PASS CustomEvent.length is 2
FAIL DOMFormData.length should be 0. Threw exception ReferenceError: Can't find variable: DOMFormData
@@ -43,7 +44,6 @@
PASS Uint8ClampedArray.length is 1
PASS WebGLContextEvent.length is 2
PASS WebKitAnimationEvent.length is 2
-PASS WebKitBlobBuilder.length is 0
PASS WebKitCSSMatrix.length is 1
PASS WebKitMutationObserver.length is 1
PASS WebKitPoint.length is 2
Modified: trunk/Source/WebCore/ChangeLog (115665 => 115666)
--- trunk/Source/WebCore/ChangeLog 2012-04-30 21:10:21 UTC (rev 115665)
+++ trunk/Source/WebCore/ChangeLog 2012-04-30 21:11:45 UTC (rev 115666)
@@ -1,3 +1,18 @@
+2012-04-29 Sam Weinig <[email protected]>
+
+ Remove BlobBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=84036
+
+ Reviewed by Anders Carlsson.
+
+ * GNUmakefile.am:
+ * fileapi/WebKitBlobBuilder.idl:
+ * page/DOMWindow.idl:
+ * workers/WorkerContext.idl:
+ Make exposing the WebKitBlobBuilder JS object conditional on a new
+ ENABLE_LEGACY_WEBKIT_BLOB_BUILDER flag. Don't enable this for the Mac,
+ but do for everyone else.
+
2012-04-30 Anders Carlsson <[email protected]>
Add a barrier-style dispatch member function to ScrollingThread
Modified: trunk/Source/WebCore/GNUmakefile.am (115665 => 115666)
--- trunk/Source/WebCore/GNUmakefile.am 2012-04-30 21:10:21 UTC (rev 115665)
+++ trunk/Source/WebCore/GNUmakefile.am 2012-04-30 21:11:45 UTC (rev 115666)
@@ -558,6 +558,14 @@
endif # END ENABLE_BLOB
# ---
+# Legacy WebKitBlobBuilder support
+# ---
+if ENABLE_LEGACY_WEBKIT_BLOB_BUILDER
+FEATURE_DEFINES += ENABLE_LEGACY_WEBKIT_BLOB_BUILDER=1
+webcore_cppflags += -DENABLE_LEGACY_WEBKIT_BLOB_BUILDER=1
+endif # END ENABLE_LEGACY_WEBKIT_BLOB_BUILDER
+
+# ---
# Animation API support
# ---
if ENABLE_ANIMATION_API
Modified: trunk/Source/WebCore/fileapi/WebKitBlobBuilder.idl (115665 => 115666)
--- trunk/Source/WebCore/fileapi/WebKitBlobBuilder.idl 2012-04-30 21:10:21 UTC (rev 115665)
+++ trunk/Source/WebCore/fileapi/WebKitBlobBuilder.idl 2012-04-30 21:11:45 UTC (rev 115666)
@@ -30,6 +30,7 @@
module html {
interface [
+ Conditional=LEGACY_WEBKIT_BLOB_BUILDER,
Constructor,
JSGenerateToNativeObject,
JSNoStaticTables
Modified: trunk/Source/WebCore/page/DOMWindow.idl (115665 => 115666)
--- trunk/Source/WebCore/page/DOMWindow.idl 2012-04-30 21:10:21 UTC (rev 115665)
+++ trunk/Source/WebCore/page/DOMWindow.idl 2012-04-30 21:11:45 UTC (rev 115666)
@@ -769,7 +769,7 @@
attribute [Conditional=BLOB|FILE_SYSTEM] FileErrorConstructor FileError;
attribute [Conditional=BLOB] FileReaderConstructor FileReader;
- attribute [Conditional=BLOB] WebKitBlobBuilderConstructor WebKitBlobBuilder;
+ attribute [Conditional=BLOB&LEGACY_WEBKIT_BLOB_BUILDER] WebKitBlobBuilderConstructor WebKitBlobBuilder;
attribute [Conditional=BLOB] DOMURLConstructor webkitURL;
Modified: trunk/Source/WebCore/workers/WorkerContext.idl (115665 => 115666)
--- trunk/Source/WebCore/workers/WorkerContext.idl 2012-04-30 21:10:21 UTC (rev 115665)
+++ trunk/Source/WebCore/workers/WorkerContext.idl 2012-04-30 21:11:45 UTC (rev 115666)
@@ -83,7 +83,7 @@
#endif
#if defined(ENABLE_BLOB) && ENABLE_BLOB
- attribute WebKitBlobBuilderConstructor WebKitBlobBuilder;
+ attribute [Conditional=LEGACY_WEBKIT_BLOB_BUILDER] WebKitBlobBuilderConstructor WebKitBlobBuilder;
attribute BlobConstructor Blob;
attribute FileReaderConstructor FileReader;
attribute FileReaderSyncConstructor FileReaderSync;
Modified: trunk/Source/WebKit/chromium/ChangeLog (115665 => 115666)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-04-30 21:10:21 UTC (rev 115665)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-04-30 21:11:45 UTC (rev 115666)
@@ -1,3 +1,13 @@
+2012-04-29 Sam Weinig <[email protected]>
+
+ Remove BlobBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=84036
+
+ Reviewed by Anders Carlsson.
+
+ * features.gypi:
+ Keep WebKitBlobBuilder enabled for Chromium, since it has shipped it.
+
2012-04-30 Min Qin <[email protected]>
Expose a flag so that fullscreen video on android can work with FULLSCREEN_API
Modified: trunk/Source/WebKit/chromium/features.gypi (115665 => 115666)
--- trunk/Source/WebKit/chromium/features.gypi 2012-04-30 21:10:21 UTC (rev 115665)
+++ trunk/Source/WebKit/chromium/features.gypi 2012-04-30 21:11:45 UTC (rev 115666)
@@ -67,6 +67,7 @@
'ENABLE_JAVASCRIPT_I18N_API=1',
'ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0',
'ENABLE_LEGACY_NOTIFICATIONS=1',
+ 'ENABLE_LEGACY_WEBKIT_BLOB_BUILDER=1',
'ENABLE_LINK_PREFETCH=1',
'ENABLE_LINK_PRERENDER=1',
'ENABLE_MEDIA_SOURCE=1',
Modified: trunk/Source/cmake/OptionsBlackBerry.cmake (115665 => 115666)
--- trunk/Source/cmake/OptionsBlackBerry.cmake 2012-04-30 21:10:21 UTC (rev 115665)
+++ trunk/Source/cmake/OptionsBlackBerry.cmake 2012-04-30 21:11:45 UTC (rev 115666)
@@ -143,6 +143,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_IMAGE_DECODER_DOWN_SAMPLING ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_NOTIFICATIONS ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_WEBKIT_BLOB_BUILDER ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ORIENTATION_EVENTS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PAGE_VISIBILITY_API ON)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (115665 => 115666)
--- trunk/Source/cmake/WebKitFeatures.cmake 2012-04-30 21:10:21 UTC (rev 115665)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2012-04-30 21:11:45 UTC (rev 115666)
@@ -52,6 +52,7 @@
WEBKIT_OPTION_DEFINE(ENABLE_JAVASCRIPT_DEBUGGER "Toggle _javascript_ Debugger/Profiler support" ON)
WEBKIT_OPTION_DEFINE(ENABLE_JIT "Enable JustInTime _javascript_ support" ON)
WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_NOTIFICATIONS "Toggle Legacy Desktop Notifications Support" OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_WEBKIT_BLOB_BUILDER "Toggle Legacy WebKit Blob Builder Support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_LINK_PREFETCH "Toggle pre fetching support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_MATHML "Toggle MathML support" ON)
WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_SOURCE "Toggle Media Source support" OFF)
Modified: trunk/Tools/ChangeLog (115665 => 115666)
--- trunk/Tools/ChangeLog 2012-04-30 21:10:21 UTC (rev 115665)
+++ trunk/Tools/ChangeLog 2012-04-30 21:11:45 UTC (rev 115666)
@@ -1,3 +1,16 @@
+2012-04-29 Sam Weinig <[email protected]>
+
+ Remove BlobBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=84036
+
+ Reviewed by Anders Carlsson.
+
+ * Scripts/build-webkit:
+ * qmake/mkspecs/features/features.prf:
+ Make exposing the WebKitBlobBuilder JS object conditional on a new
+ ENABLE_LEGACY_WEBKIT_BLOB_BUILDER flag. Don't enable this for the Mac,
+ but do for everyone else.
+
2012-04-30 Amruth Raj Padmanabhuni <[email protected]>
[GTK] Add glib as a dependency to build glib-networking
Modified: trunk/Tools/Scripts/build-webkit (115665 => 115666)
--- trunk/Tools/Scripts/build-webkit 2012-04-30 21:10:21 UTC (rev 115665)
+++ trunk/Tools/Scripts/build-webkit 2012-04-30 21:11:45 UTC (rev 115666)
@@ -105,6 +105,7 @@
$inputTypeWeekSupport,
$_javascript_DebuggerSupport,
$legacyNotificationsSupport,
+ $legacyWebKitBlobBuilderSupport,
$linkPrefetchSupport,
$linkPrerenderSupport,
$mathmlSupport,
@@ -266,6 +267,9 @@
{ option => "legacy-notifications", desc => "Toggle Legacy Desktop Notifications Support",
define => "ENABLE_LEGACY_NOTIFICATIONS", default => isBlackBerry(), value => \$legacyNotificationsSupport },
+ { option => "legacy-webkit-blob-builder", desc => "Toggle Legacy WebKitBlobBuilder Support",
+ define => "ENABLE_LEGACY_WEBKIT_BLOB_BUILDER", default => (isGtk() || isChromium() || isBlackBerry()), value => \$legacyWebKitBlobBuilderSupport },
+
{ option => "link-prefetch", desc => "Toggle pre fetching support",
define => "ENABLE_LINK_PREFETCH", default => 0, value => \$linkPrefetchSupport },
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (115665 => 115666)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-04-30 21:10:21 UTC (rev 115665)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-04-30 21:11:45 UTC (rev 115666)
@@ -96,6 +96,7 @@
!contains(DEFINES, ENABLE_MICRODATA=.): DEFINES += ENABLE_MICRODATA=0
!contains(DEFINES, ENABLE_PROGRESS_TAG=.): DEFINES += ENABLE_PROGRESS_TAG=1
!contains(DEFINES, ENABLE_BLOB=.): DEFINES += ENABLE_BLOB=1
+!contains(DEFINES, ENABLE_LEGACY_WEBKIT_BLOB_BUILDER=.): DEFINES += ENABLE_LEGACY_WEBKIT_BLOB_BUILDER=1
!contains(DEFINES, ENABLE_LEGACY_NOTIFICATIONS=.): DEFINES += ENABLE_LEGACY_NOTIFICATIONS=1
!contains(DEFINES, ENABLE_NOTIFICATIONS=.): DEFINES += ENABLE_NOTIFICATIONS=1
!contains(DEFINES, ENABLE_INPUT_TYPE_COLOR=.): DEFINES += ENABLE_INPUT_TYPE_COLOR=0
@@ -282,6 +283,7 @@
contains(DEFINES, ENABLE_PROGRESS_TAG=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_PROGRESS_TAG=1
contains(DEFINES, ENABLE_GEOLOCATION=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_GEOLOCATION=1
contains(DEFINES, ENABLE_BLOB=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_BLOB=1
+contains(DEFINES, ENABLE_LEGACY_WEBKIT_BLOB_BUILDER=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_LEGACY_WEBKIT_BLOB_BUILDER=1
contains(DEFINES, ENABLE_MEDIA_SOURCE=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_MEDIA_SOURCE=1
contains(DEFINES, ENABLE_MEDIA_STATISTICS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_MEDIA_STATISTICS=1
contains(DEFINES, ENABLE_MEDIA_STREAM=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_MEDIA_STREAM=1
Modified: trunk/configure.ac (115665 => 115666)
--- trunk/configure.ac 2012-04-30 21:10:21 UTC (rev 115665)
+++ trunk/configure.ac 2012-04-30 21:11:45 UTC (rev 115666)
@@ -939,6 +939,14 @@
[],[enable_blob="yes"])
AC_MSG_RESULT([$enable_blob])
+# check whether to enable Legacy WebKitBlobBuilder support
+AC_MSG_CHECKING([whether to enable Legacy WebKitBlobBuilder support])
+AC_ARG_ENABLE(legacy_webkit_blob_builder,
+ AC_HELP_STRING([--enable-legacy-webkit-blob-builder],
+ [enable support for Legacy WebKitBlobBuilder [default=yes]]),
+ [],[enable_legacy_webkit_blob_builder="yes"])
+AC_MSG_RESULT([$legacy_webkit_blob_builder])
+
# check whether to enable Fast Mobile Scrolling support
AC_MSG_CHECKING([whether to enable Fast Mobile Scrolling])
AC_ARG_ENABLE(fast_mobile_scrolling,
@@ -1320,6 +1328,7 @@
AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug_features" = "yes"])
AM_CONDITIONAL([ENABLE_WEBGL],[test "$enable_webgl" = "yes"])
AM_CONDITIONAL([ENABLE_BLOB],[test "$enable_blob" = "yes"])
+AM_CONDITIONAL([ENABLE_LEGACY_WEBKIT_BLOB_BUILDER],[test "$enable_legacy_webkit_blob_builder" = "yes"])
AM_CONDITIONAL([ENABLE_METER_TAG],[test "$enable_meter_tag" = "yes"])
AM_CONDITIONAL([ENABLE_MICRODATA],[test "$enable_microdata" = "yes"])
AM_CONDITIONAL([ENABLE_PAGE_VISIBILITY_API],[test "$enable_page_visibility_api" = "yes"])
@@ -1428,6 +1437,7 @@
Features:
WebGL : $enable_webgl
Blob support : $enable_blob
+ Legacy WebKitBlobBuilder support : $enable_legacy_webkit_blob_builder
DOM mutation observer support : $enable_mutation_observers
DeviceOrientation support : $enable_device_orientation
Directory upload : $enable_directory_upload
