Diff
Modified: trunk/ChangeLog (89226 => 89227)
--- trunk/ChangeLog 2011-06-20 02:57:36 UTC (rev 89226)
+++ trunk/ChangeLog 2011-06-20 03:05:50 UTC (rev 89227)
@@ -1,3 +1,12 @@
+2011-06-19 Adam Bergkvist <[email protected]>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] Enable Media Stream feature and make it default on
+ https://bugs.webkit.org/show_bug.cgi?id=60394
+
+ * configure.ac:
+
2011-06-17 Joone Hur <[email protected]>
Reviewed by Martin Robinson.
Modified: trunk/LayoutTests/ChangeLog (89226 => 89227)
--- trunk/LayoutTests/ChangeLog 2011-06-20 02:57:36 UTC (rev 89226)
+++ trunk/LayoutTests/ChangeLog 2011-06-20 03:05:50 UTC (rev 89227)
@@ -1,3 +1,14 @@
+2011-06-19 Adam Bergkvist <[email protected]>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] Enable Media Stream feature and make it default on
+ https://bugs.webkit.org/show_bug.cgi?id=60394
+
+ Unskipped the Media Stream tests.
+
+ * platform/gtk/Skipped:
+
2011-06-19 Dirk Schulze <[email protected]>
Uneviewed.
Modified: trunk/LayoutTests/platform/gtk/Skipped (89226 => 89227)
--- trunk/LayoutTests/platform/gtk/Skipped 2011-06-20 02:57:36 UTC (rev 89226)
+++ trunk/LayoutTests/platform/gtk/Skipped 2011-06-20 03:05:50 UTC (rev 89227)
@@ -355,9 +355,6 @@
# Speech input is not yet enabled.
fast/speech
-# Media Stream API is not yet enabled.
-fast/dom/MediaStream
-
# Web Timing is not enabled.
# https://bugs.webkit.org/show_bug.cgi?id=42432
fast/dom/Window/window-properties-performance.html
Modified: trunk/Source/WebCore/ChangeLog (89226 => 89227)
--- trunk/Source/WebCore/ChangeLog 2011-06-20 02:57:36 UTC (rev 89226)
+++ trunk/Source/WebCore/ChangeLog 2011-06-20 03:05:50 UTC (rev 89227)
@@ -1,3 +1,12 @@
+2011-06-19 Adam Bergkvist <[email protected]>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] Enable Media Stream feature and make it default on
+ https://bugs.webkit.org/show_bug.cgi?id=60394
+
+ * GNUmakefile.am:
+
2011-06-19 Una Sabovic <[email protected]>
Reviewed by Darin Adler.
Modified: trunk/Source/WebCore/GNUmakefile.am (89226 => 89227)
--- trunk/Source/WebCore/GNUmakefile.am 2011-06-20 02:57:36 UTC (rev 89226)
+++ trunk/Source/WebCore/GNUmakefile.am 2011-06-20 03:05:50 UTC (rev 89227)
@@ -360,6 +360,16 @@
endif # END ENABLE_VIDEO_TRACK
# ----
+# Media Stream Support
+# ----
+if ENABLE_MEDIA_STREAM
+FEATURE_DEFINES += ENABLE_MEDIA_STREAM=1
+webcore_cppflags += -DENABLE_MEDIA_STREAM=1
+else
+webcore_cppflags += -DENABLE_MEDIA_STREAM=0
+endif # END ENABLE_MEDIA_STREAM
+
+# ----
# XHTML-MP Support
# ----
if ENABLE_XHTMLMP
Modified: trunk/Tools/ChangeLog (89226 => 89227)
--- trunk/Tools/ChangeLog 2011-06-20 02:57:36 UTC (rev 89226)
+++ trunk/Tools/ChangeLog 2011-06-20 03:05:50 UTC (rev 89227)
@@ -1,3 +1,12 @@
+2011-06-19 Adam Bergkvist <[email protected]>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] Enable Media Stream feature and make it default on
+ https://bugs.webkit.org/show_bug.cgi?id=60394
+
+ * Scripts/build-webkit:
+
2011-06-19 Sheriff Bot <[email protected]>
Unreviewed, rolling out r89198.
Modified: trunk/Tools/Scripts/build-webkit (89226 => 89227)
--- trunk/Tools/Scripts/build-webkit 2011-06-20 02:57:36 UTC (rev 89226)
+++ trunk/Tools/Scripts/build-webkit 2011-06-20 03:05:50 UTC (rev 89227)
@@ -228,8 +228,8 @@
{ option => "media-statistics", desc => "Toggle Media Statistics support",
define => "ENABLE_MEDIA_STATISTICS", default => 0, value => \$mediaStatisticsSupport },
- { option => "media-stream", desc => "Toggle Media Stream API support (implies Blob support, currently Chromium only)",
- define => "ENABLE_MEDIA_STREAM", default => isChromium(), value => \$mediaStreamSupport },
+ { option => "media-stream", desc => "Toggle Media Stream API support (implies Blob support, currently Chromium and GTK only)",
+ define => "ENABLE_MEDIA_STREAM", default => (isChromium() || isGtk()), value => \$mediaStreamSupport },
{ option => "meter-tag", desc => "Meter Tag support",
define => "ENABLE_METER_TAG", default => !isAppleWinWebKit(), value => \$meterTagSupport },
Modified: trunk/configure.ac (89226 => 89227)
--- trunk/configure.ac 2011-06-20 02:57:36 UTC (rev 89226)
+++ trunk/configure.ac 2011-06-20 03:05:50 UTC (rev 89227)
@@ -574,6 +574,14 @@
[],[enable_fullscreen_api="yes"])
AC_MSG_RESULT([$enable_fullscreen_api])
+# check whether to enable media stream support
+AC_MSG_CHECKING([whether to enable media stream support])
+AC_ARG_ENABLE(media_stream,
+ AC_HELP_STRING([--enable-media-stream],
+ [enable media stream support (incomplete) [default=no]]),
+ [],[enable_media_stream="no"])
+AC_MSG_RESULT([$enable_media_stream])
+
# check whether to enable XHTML-MP support
AC_MSG_CHECKING([whether to enable XHTML-MP support])
AC_ARG_ENABLE(xhtmlmp,
@@ -1143,6 +1151,7 @@
AM_CONDITIONAL([ENABLE_MEDIA_STATISTICS],[test "$enable_media_statistics" = "yes"])
AM_CONDITIONAL([ENABLE_VIDEO_TRACK],[test "$enable_video_track" = "yes"])
AM_CONDITIONAL([ENABLE_FULLSCREEN_API],[test "$enable_fullscreen_api" = "yes"])
+AM_CONDITIONAL([ENABLE_MEDIA_STREAM],[test "$enable_media_stream" = "yes"])
AM_CONDITIONAL([ENABLE_NOTIFICATIONS],[test "$enable_notifications" = "yes"])
AM_CONDITIONAL([ENABLE_ORIENTATION_EVENTS],[test "$enable_orientation_events" = "yes"])
AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"])
@@ -1241,6 +1250,7 @@
HTML5 video element support : $enable_video
HTML5 track element support : $enable_video_track
Fullscreen API support : $enable_fullscreen_api
+ Media stream support : $enable_media_stream
Icon database support : $enable_icon_database
Image resizer support : $enable_image_resizer
Link prefetch support : $enable_link_prefetch
