From 0ecf15a518d4d85de741bae7a7ac76b3f32b5e29 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Sat, 28 Jul 2012 06:00:39 +0000 Subject: [PATCH] Early merge - [EFL] Support for HTML media capture Add HTML media capture feature, and enable that on the Efl port. [Title] [EFL] Support for HTML media capture [Issue#] N/A [Problem] Support for HTML media capture [Cause] N/A [Solution] N/A Change-Id: I390f369568e42be5099a76c5299c9e0f8deebedd --- LayoutTests/platform/efl/Skipped | 4 +--- Source/cmake/OptionsEfl.cmake | 1 + Source/cmake/WebKitFeatures.cmake | 1 + Source/cmakeconfig.h.cmake | 1 + Tools/Scripts/webkitperl/FeatureList.pm | 4 ++++ 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/LayoutTests/platform/efl/Skipped b/LayoutTests/platform/efl/Skipped index 89fc2a5..6059101 100644 --- a/LayoutTests/platform/efl/Skipped +++ b/LayoutTests/platform/efl/Skipped @@ -847,13 +847,11 @@ svg/as-image/image-respects-deviceScaleFactor.html # Skipped until new WebSocket protocol is implemented. http://webkit.org/b/50099 http/tests/websocket/tests/hybi/ -<<<<<<< HEAD # Web Intents is not yet enabled. webintents/ -======= + # Microdata DOM API is not yet enabled. fast/dom/MicroData ->>>>>>> 18e7d3f8b5a193b8304f1bae0f5ad6c29740aa1f # Pointer Lock is not implemented. pointer-lock/ diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake index 2de09bd..e684708 100644 --- a/Source/cmake/OptionsEfl.cmake +++ b/Source/cmake/OptionsEfl.cmake @@ -76,6 +76,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GLIB_SUPPORT ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR ON) +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_INFO ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PAGE_VISIBILITY_API ON) diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake index 635f4ec..e1778cf 100644 --- a/Source/cmake/WebKitFeatures.cmake +++ b/Source/cmake/WebKitFeatures.cmake @@ -58,6 +58,7 @@ MACRO (WEBKIT_OPTION_BEGIN) 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_CAPTURE "Toggle Media Capture support" OFF) WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_SOURCE "Toggle Media Source support" OFF) WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_STATISTICS "Toggle Media Statistics support" OFF) WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_STREAM "Toggle Media Stream API support" OFF) diff --git a/Source/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake index 4fbee21..b0a2bf6 100644 --- a/Source/cmakeconfig.h.cmake +++ b/Source/cmakeconfig.h.cmake @@ -49,6 +49,7 @@ #cmakedefine01 ENABLE_LEGACY_WEBKIT_BLOB_BUILDER #cmakedefine01 ENABLE_MATHML #cmakedefine01 ENABLE_METER_TAG +#cmakedefine01 ENABLE_MEDIA_CAPTURE #cmakedefine01 ENABLE_MICRODATA #cmakedefine01 ENABLE_MUTATION_OBSERVERS #cmakedefine01 ENABLE_NETSCAPE_PLUGIN_API diff --git a/Tools/Scripts/webkitperl/FeatureList.pm b/Tools/Scripts/webkitperl/FeatureList.pm index e96851f..c9023dd 100644 --- a/Tools/Scripts/webkitperl/FeatureList.pm +++ b/Tools/Scripts/webkitperl/FeatureList.pm @@ -88,6 +88,7 @@ my ( $linkPrefetchSupport, $linkPrerenderSupport, $mathmlSupport, + $mediaCaptureSupport, $mediaSourceSupport, $mediaStatisticsSupport, $mediaStreamSupport, @@ -263,6 +264,9 @@ my @features = ( { option => "mathml", desc => "Toggle MathML support", define => "ENABLE_MATHML", default => 1, value => \$mathmlSupport }, + { option => "media-capture", desc => "Toggle Media Capture support", + define => "ENABLE_MEDIA_CAPTURE", default => isEfl(), value => \$mediaCaptureSupport }, + { option => "media-source", desc => "Toggle Media Source support", define => "ENABLE_MEDIA_SOURCE", default => 0, value => \$mediaSourceSupport }, -- 2.7.4