Changeset 115800 in webkit
- Timestamp:
- May 2, 2012, 12:58:30 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 13 edited
-
ChangeLog (modified) (1 diff)
-
LayoutTests/ChangeLog (modified) (1 diff)
-
LayoutTests/platform/efl/Skipped (modified) (1 diff)
-
Source/WebCore/CMakeLists.txt (modified) (3 diffs)
-
Source/WebCore/ChangeLog (modified) (1 diff)
-
Source/WebCore/PlatformEfl.cmake (modified) (4 diffs)
-
Source/WebCore/UseJSC.cmake (modified) (1 diff)
-
Source/WebCore/platform/audio/HRTFElevation.cpp (modified) (1 diff)
-
Source/WebCore/platform/audio/efl (added)
-
Source/WebCore/platform/audio/efl/AudioBusEfl.cpp (added)
-
Source/WebKit/efl/ChangeLog (modified) (1 diff)
-
Source/WebKit/efl/ewk/ewk_view.cpp (modified) (4 diffs)
-
Source/WebKit/efl/ewk/ewk_view.h (modified) (2 diffs)
-
Source/cmake/FindGStreamer-Audio.cmake (added)
-
Source/cmake/FindGStreamer-FFT.cmake (added)
-
Source/cmake/OptionsEfl.cmake (modified) (2 diffs)
-
Source/cmakeconfig.h.cmake (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r115737 r115800 1 2012-05-02 Dongwoo Im <dw.im@samsung.com> 2 3 [EFL] Implement the Web Audio API feature. 4 https://bugs.webkit.org/show_bug.cgi?id=78688 5 6 Reviewed by Philippe Normand. 7 8 Implement the Web Audio API feature on the EFL port. 9 https://dvcs.w3.org/hg/audio/raw-file/tip/webaudio/specification.html 10 11 * Source/cmake/FindGStreamer-Audio.cmake: Added. Find the pkgconfig of the GStreamer-audio. 12 * Source/cmake/FindGStreamer-FFT.cmake: Added. Find the pkgconfig of the GStreamer-fft. 13 * Source/cmake/OptionsEfl.cmake: Add the ENABLE_WEB_AUDIO option. 14 * Source/cmakeconfig.h.cmake: Add the ENABLE_WEB_AUDIO option. 15 1 16 2012-05-01 Landry Breuil <landry@openbsd.org> 2 17 -
trunk/LayoutTests/ChangeLog
r115799 r115800 1 2012-05-02 Dongwoo Im <dw.im@samsung.com> 2 3 [EFL] Implement the Web Audio API feature. 4 https://bugs.webkit.org/show_bug.cgi?id=78688 5 6 Reviewed by Philippe Normand. 7 8 Implement the Web Audio API feature on the EFL port. 9 https://dvcs.w3.org/hg/audio/raw-file/tip/webaudio/specification.html 10 11 * platform/efl/Skipped: Change the comment of webaudio. 12 1 13 2012-05-01 Andrew Scherkus <scherkus@chromium.org> 2 14 -
trunk/LayoutTests/platform/efl/Skipped
r115758 r115800 711 711 webarchive 712 712 713 # The EFL port has no support for webaudio713 # For now, Web Audio API is disabled 714 714 webaudio 715 715 -
trunk/Source/WebCore/CMakeLists.txt
r115581 r115800 124 124 125 125 Modules/webaudio/AudioBuffer.idl 126 Modules/webaudio/AudioBufferCallback.idl 126 127 Modules/webaudio/AudioBufferSourceNode.idl 127 128 Modules/webaudio/AudioChannelSplitter.idl … … 137 138 Modules/webaudio/AudioProcessingEvent.idl 138 139 Modules/webaudio/AudioSourceNode.idl 140 Modules/webaudio/BiquadFilterNode.idl 139 141 Modules/webaudio/ConvolverNode.idl 140 142 Modules/webaudio/DOMWindowWebAudio.idl 141 143 Modules/webaudio/DelayNode.idl 144 Modules/webaudio/DynamicsCompressorNode.idl 142 145 Modules/webaudio/JavaScriptAudioNode.idl 146 Modules/webaudio/MediaElementAudioSourceNode.idl 147 Modules/webaudio/OfflineAudioCompletionEvent.idl 148 Modules/webaudio/Oscillator.idl 143 149 Modules/webaudio/RealtimeAnalyserNode.idl 150 Modules/webaudio/WaveShaperNode.idl 151 Modules/webaudio/WaveTable.idl 144 152 145 153 Modules/websockets/CloseEvent.idl … … 2420 2428 ENDIF () 2421 2429 2430 IF (ENABLE_WEB_AUDIO) 2431 LIST(APPEND WebCore_SOURCES 2432 Modules/webaudio/AsyncAudioDecoder.cpp 2433 Modules/webaudio/AudioBasicProcessorNode.cpp 2434 Modules/webaudio/AudioBuffer.cpp 2435 Modules/webaudio/AudioBufferSourceNode.cpp 2436 Modules/webaudio/AudioChannelMerger.cpp 2437 Modules/webaudio/AudioChannelSplitter.cpp 2438 Modules/webaudio/AudioContext.cpp 2439 Modules/webaudio/AudioDestinationNode.cpp 2440 Modules/webaudio/AudioGainNode.cpp 2441 Modules/webaudio/AudioListener.cpp 2442 Modules/webaudio/AudioNode.cpp 2443 Modules/webaudio/AudioNodeInput.cpp 2444 Modules/webaudio/AudioNodeOutput.cpp 2445 Modules/webaudio/AudioPannerNode.cpp 2446 Modules/webaudio/AudioParam.cpp 2447 Modules/webaudio/AudioParamTimeline.cpp 2448 Modules/webaudio/AudioProcessingEvent.cpp 2449 Modules/webaudio/BiquadDSPKernel.cpp 2450 Modules/webaudio/BiquadFilterNode.cpp 2451 Modules/webaudio/BiquadProcessor.cpp 2452 Modules/webaudio/ConvolverNode.cpp 2453 Modules/webaudio/DefaultAudioDestinationNode.cpp 2454 Modules/webaudio/DelayDSPKernel.cpp 2455 Modules/webaudio/DelayNode.cpp 2456 Modules/webaudio/DelayProcessor.cpp 2457 Modules/webaudio/DynamicsCompressorNode.cpp 2458 Modules/webaudio/JavaScriptAudioNode.cpp 2459 Modules/webaudio/MediaElementAudioSourceNode.cpp 2460 Modules/webaudio/OfflineAudioCompletionEvent.cpp 2461 Modules/webaudio/OfflineAudioDestinationNode.cpp 2462 Modules/webaudio/Oscillator.cpp 2463 Modules/webaudio/RealtimeAnalyser.cpp 2464 Modules/webaudio/RealtimeAnalyserNode.cpp 2465 Modules/webaudio/WaveShaperDSPKernel.cpp 2466 Modules/webaudio/WaveShaperNode.cpp 2467 Modules/webaudio/WaveShaperProcessor.cpp 2468 Modules/webaudio/WaveTable.cpp 2469 2470 platform/audio/AudioBus.cpp 2471 platform/audio/AudioChannel.cpp 2472 platform/audio/AudioDSPKernelProcessor.cpp 2473 platform/audio/AudioResampler.cpp 2474 platform/audio/AudioResamplerKernel.cpp 2475 platform/audio/AudioUtilities.cpp 2476 platform/audio/Biquad.cpp 2477 platform/audio/Cone.cpp 2478 platform/audio/DirectConvolver.cpp 2479 platform/audio/Distance.cpp 2480 platform/audio/DynamicsCompressor.cpp 2481 platform/audio/DynamicsCompressorKernel.cpp 2482 platform/audio/EqualPowerPanner.cpp 2483 platform/audio/FFTConvolver.cpp 2484 platform/audio/FFTFrame.cpp 2485 platform/audio/FFTFrameStub.cpp 2486 platform/audio/HRTFDatabase.cpp 2487 platform/audio/HRTFDatabaseLoader.cpp 2488 platform/audio/HRTFElevation.cpp 2489 platform/audio/HRTFKernel.cpp 2490 platform/audio/HRTFPanner.cpp 2491 platform/audio/MultiChannelResampler.cpp 2492 platform/audio/Panner.cpp 2493 platform/audio/ReverbAccumulationBuffer.cpp 2494 platform/audio/ReverbConvolver.cpp 2495 platform/audio/ReverbConvolverStage.cpp 2496 platform/audio/Reverb.cpp 2497 platform/audio/ReverbInputBuffer.cpp 2498 platform/audio/SincResampler.cpp 2499 platform/audio/VectorMath.cpp 2500 platform/audio/ZeroPole.cpp 2501 ) 2502 ENDIF () 2503 2422 2504 # Modules that the bindings generator scripts may use 2423 2505 SET(SCRIPTS_RESOLVE_SUPPLEMENTAL -
trunk/Source/WebCore/ChangeLog
r115797 r115800 1 2012-05-02 Dongwoo Im <dw.im@samsung.com> 2 3 [EFL] Implement the Web Audio API feature. 4 https://bugs.webkit.org/show_bug.cgi?id=78688 5 6 Reviewed by Philippe Normand. 7 8 Implement the Web Audio API feature on the EFL port. 9 https://dvcs.w3.org/hg/audio/raw-file/tip/webaudio/specification.html 10 11 * CMakeLists.txt: Add the list of the files which are needed for the Web Audio APi. 12 * PlatformEfl.cmake: Add the list of the files which are needed for the Web Audio APi. 13 * UseJSC.cmake: Add the list of the files which are needed for the Web Audio APi. 14 * platform/audio/HRTFElevation.cpp: Enable the USE_CONCATENATED_IMPULSE_RESPONSES macro. 15 (WebCore): 16 * platform/audio/efl/AudioBusEfl.cpp: Added. 17 (WebCore): 18 (WebCore::AudioBus::loadPlatformResource): Create the absolute path of the audio resource. 19 1 20 2012-05-01 Kentaro Hara <haraken@chromium.org> 2 21 -
trunk/Source/WebCore/PlatformEfl.cmake
r115385 r115800 184 184 ENDIF () 185 185 186 IF (ENABLE_VIDEO)187 LIST(APPEND WebCore_INCLUDE_DIRECTORIES188 "${WEBCORE_DIR}/platform/graphics/gstreamer"189 )190 LIST(APPEND WebCore_SOURCES191 platform/graphics/gstreamer/GRefPtrGStreamer.cpp192 platform/graphics/gstreamer/GStreamerGWorld.cpp193 platform/graphics/gstreamer/GStreamerUtilities.cpp194 platform/graphics/gstreamer/GStreamerVersioning.cpp195 platform/graphics/gstreamer/ImageGStreamerCairo.cpp196 platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp197 platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp198 platform/graphics/gstreamer/VideoSinkGStreamer.cpp199 platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp200 )201 ENDIF ()202 203 186 LIST(APPEND WebCore_LIBRARIES 204 187 ${Cairo_LIBRARIES} … … 218 201 ) 219 202 220 IF (ENABLE_VIDEO)221 LIST(APPEND WebCore_LIBRARIES222 ${GStreamer-App_LIBRARIES}223 ${GStreamer-Interfaces_LIBRARIES}224 ${GStreamer-Pbutils_LIBRARIES}225 ${GStreamer-Video_LIBRARIES}226 )227 ENDIF ()228 229 203 LIST(APPEND WebCore_INCLUDE_DIRECTORIES 230 204 ${Cairo_INCLUDE_DIRS} … … 242 216 ) 243 217 244 IF (ENABLE_VIDEO) 245 LIST(APPEND WebCore_INCLUDE_DIRECTORIES 218 IF (ENABLE_VIDEO OR ENABLE_WEB_AUDIO) 219 LIST(APPEND WebCore_INCLUDE_DIRECTORIES 220 "${WEBCORE_DIR}/platform/graphics/gstreamer" 221 246 222 ${GStreamer-App_INCLUDE_DIRS} 247 223 ${GStreamer-Interfaces_INCLUDE_DIRS} 248 224 ${GStreamer-Pbutils_INCLUDE_DIRS} 225 ) 226 LIST(APPEND WebCore_SOURCES 227 platform/graphics/gstreamer/GRefPtrGStreamer.cpp 228 platform/graphics/gstreamer/GStreamerUtilities.cpp 229 platform/graphics/gstreamer/GStreamerVersioning.cpp 230 ) 231 LIST(APPEND WebCore_LIBRARIES 232 ${GStreamer-App_LIBRARIES} 233 ${GStreamer-Interfaces_LIBRARIES} 234 ${GStreamer-Pbutils_LIBRARIES} 235 ) 236 ENDIF () 237 238 IF (ENABLE_VIDEO) 239 LIST(APPEND WebCore_INCLUDE_DIRECTORIES 249 240 ${GStreamer-Video_INCLUDE_DIRS} 241 ) 242 LIST(APPEND WebCore_SOURCES 243 platform/graphics/gstreamer/GStreamerGWorld.cpp 244 platform/graphics/gstreamer/ImageGStreamerCairo.cpp 245 platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 246 platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp 247 platform/graphics/gstreamer/VideoSinkGStreamer.cpp 248 platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 249 ) 250 LIST(APPEND WebCore_LIBRARIES 251 ${GStreamer-Video_LIBRARIES} 250 252 ) 251 253 ENDIF () … … 274 276 ADD_DEFINITIONS(-DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 275 277 -DDATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}") 278 279 IF (ENABLE_WEB_AUDIO) 280 LIST(APPEND WebCore_INCLUDE_DIRECTORIES 281 "${WEBCORE_DIR}/platform/audio/gstreamer" 282 283 ${GStreamer-Audio_INCLUDE_DIRS} 284 ${GStreamer-FFT_INCLUDE_DIRS} 285 ) 286 LIST(APPEND WebCore_SOURCES 287 platform/audio/efl/AudioBusEfl.cpp 288 platform/audio/gstreamer/AudioDestinationGStreamer.cpp 289 platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 290 platform/audio/gstreamer/FFTFrameGStreamer.cpp 291 platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp 292 ) 293 LIST(APPEND WebCore_LIBRARIES 294 ${GStreamer-Audio_LIBRARIES} 295 ${GStreamer-FFT_LIBRARIES} 296 ) 297 SET(WEB_AUDIO_DIR ${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/webaudio/resources) 298 FILE(GLOB WEB_AUDIO_DATA "${WEBCORE_DIR}/platform/audio/resources/*.wav") 299 INSTALL(FILES ${WEB_AUDIO_DATA} DESTINATION ${WEB_AUDIO_DIR}) 300 ADD_DEFINITIONS(-DUNINSTALLED_AUDIO_RESOURCES_DIR="${WEBCORE_DIR}/platform/audio/resources") 301 ENDIF () 302 -
trunk/Source/WebCore/UseJSC.cmake
r115341 r115800 276 276 ENDIF () 277 277 278 IF (ENABLE_WEB_AUDIO) 279 LIST(APPEND WebCore_SOURCES 280 bindings/js/JSAudioBufferSourceNodeCustom.cpp 281 bindings/js/JSAudioContextCustom.cpp 282 bindings/js/JSConvolverNodeCustom.cpp 283 bindings/js/JSJavaScriptAudioNodeCustom.cpp 284 bindings/js/JSWaveShaperNodeCustom.cpp 285 ) 286 ENDIF () 287 278 288 LIST(APPEND SCRIPTS_BINDINGS 279 289 ${WEBCORE_DIR}/bindings/scripts/CodeGenerator.pm -
trunk/Source/WebCore/platform/audio/HRTFElevation.cpp
r104859 r115800 61 61 const float ResponseSampleRate = 44100; 62 62 63 #if PLATFORM(GTK) || PLATFORM(MAC) 63 #if PLATFORM(GTK) || PLATFORM(MAC) || PLATFORM(EFL) 64 64 #define USE_CONCATENATED_IMPULSE_RESPONSES 65 65 #endif -
trunk/Source/WebKit/efl/ChangeLog
r115451 r115800 1 2012-05-02 Dongwoo Im <dw.im@samsung.com> 2 3 [EFL] Implement the Web Audio API feature. 4 https://bugs.webkit.org/show_bug.cgi?id=78688 5 6 Reviewed by Philippe Normand. 7 8 Implement the Web Audio API feature on the EFL port. 9 https://dvcs.w3.org/hg/audio/raw-file/tip/webaudio/specification.html 10 11 * ewk/ewk_view.cpp: Add the setter/getter of the webaudio feature. 12 (_Ewk_View_Private_Data): 13 (_ewk_view_priv_new): 14 (ewk_view_setting_web_audio_get): Enable/disable the Web Audio API feature. 15 (ewk_view_setting_web_audio_set): Query if the Web Audio API feature is enabled. 16 * ewk/ewk_view.h: Add the prototypes. 17 1 18 2012-04-27 Christophe Dumez <christophe.dumez@intel.com> 2 19 -
trunk/Source/WebKit/efl/ewk/ewk_view.cpp
r115449 r115800 225 225 bool pageCache : 1; 226 226 bool enableXSSAuditor : 1; 227 #if ENABLE(WEB_AUDIO) 228 bool webAudio : 0; 229 #endif 227 230 bool webGLEnabled : 1; 228 231 bool tabsToLinks : 1; … … 684 687 priv->pageSettings->setUsesPageCache(true); 685 688 priv->pageSettings->setUsesEncodingDetector(false); 689 #if ENABLE(WEB_AUDIO) 690 priv->pageSettings->setWebAudioEnabled(false); 691 #endif 686 692 priv->pageSettings->setWebGLEnabled(true); 687 693 priv->pageSettings->setXSSAuditorEnabled(true); … … 742 748 743 749 priv->settings.userAgent = ewk_settings_default_user_agent_get(); 750 #if ENABLE(WEB_AUDIO) 751 priv->settings.webAudio = priv->pageSettings->webAudioEnabled(); 752 #endif 744 753 745 754 // Since there's no scale separated from zooming in webkit-efl, this functionality of … … 4204 4213 #endif 4205 4214 4215 Eina_Bool ewk_view_setting_web_audio_get(const Evas_Object* ewkView) 4216 { 4217 #if ENABLE(WEB_AUDIO) 4218 EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false); 4219 EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false); 4220 return priv->settings.webAudio; 4221 #else 4222 return false; 4223 #endif 4224 } 4225 4226 Eina_Bool ewk_view_setting_web_audio_set(Evas_Object* ewkView, Eina_Bool enable) 4227 { 4228 #if ENABLE(WEB_AUDIO) 4229 EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false); 4230 EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false); 4231 if (priv->settings.webAudio != enable) { 4232 priv->pageSettings->setWebAudioEnabled(enable); 4233 priv->settings.webAudio = enable; 4234 } 4235 return true; 4236 #else 4237 return false; 4238 #endif 4239 } 4240 4206 4241 namespace EWKPrivate { 4207 4242 -
trunk/Source/WebKit/efl/ewk/ewk_view.h
r115449 r115800 1 1 /* 2 2 Copyright (C) 2009-2010 ProFUSION embedded systems 3 Copyright (C) 2009-201 0Samsung Electronics3 Copyright (C) 2009-2012 Samsung Electronics 4 4 Copyright (C) 2012 Intel Corporation 5 5 … … 2561 2561 EAPI void ewk_view_setting_should_display_text_descriptions_set(Evas_Object *o, Eina_Bool enable); 2562 2562 2563 /** 2564 * Queries if the web audio feature of HTML5 is enabled. 2565 * 2566 * @param o view object to query if the web audio feature is enabled 2567 * 2568 * @return @c EINA_TRUE if web audio is enabled, 2569 * @c EINA_FALSE if not or on failure 2570 */ 2571 EAPI Eina_Bool ewk_view_setting_web_audio_get(const Evas_Object *o); 2572 2573 /** 2574 * Enables/disables the web audio feature of HTML5. 2575 * 2576 * @param o view object to set the web audio 2577 * @param enable @c EINA_TRUE to enable the web audio feature, 2578 * @c EINA_FALSE to disable 2579 * 2580 * @return @c EINA_TRUE on success or @c EINA_FALSE on failure 2581 */ 2582 EAPI Eina_Bool ewk_view_setting_web_audio_set(Evas_Object *o, Eina_Bool enable); 2583 2563 2584 #ifdef __cplusplus 2564 2585 } -
trunk/Source/cmake/OptionsEfl.cmake
r115348 r115800 80 80 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO ON) 81 81 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK ON) 82 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO ON) 82 83 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING ON) 83 84 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WORKERS ON) … … 108 109 ENDIF () 109 110 110 IF (ENABLE_VIDEO )111 IF (ENABLE_VIDEO OR ENABLE_WEB_AUDIO) 111 112 FIND_PACKAGE(GStreamer REQUIRED) 112 113 FIND_PACKAGE(GStreamer-App REQUIRED) 113 114 FIND_PACKAGE(GStreamer-Base REQUIRED) 115 FIND_PACKAGE(GStreamer-Interfaces REQUIRED) 114 116 FIND_PACKAGE(GStreamer-Pbutils REQUIRED) 115 FIND_PACKAGE(GStreamer-Interfaces REQUIRED)116 117 FIND_PACKAGE(GStreamer-Plugins-Base REQUIRED) 117 FIND_PACKAGE(GStreamer-Video REQUIRED)118 118 SET(WTF_USE_GSTREAMER 1) 119 119 ADD_DEFINITIONS(-DWTF_USE_GSTREAMER=1) 120 ENDIF () 121 122 IF (ENABLE_VIDEO) 123 FIND_PACKAGE(GStreamer-Video REQUIRED) 120 124 ENDIF() 125 126 IF (ENABLE_WEB_AUDIO) 127 FIND_PACKAGE(GStreamer-Audio REQUIRED) 128 FIND_PACKAGE(GStreamer-FFT REQUIRED) 129 ADD_DEFINITIONS(-DWTF_USE_WEBAUDIO_GSTREAMER=1) 130 ENDIF () 121 131 122 132 IF (ENABLE_WEBGL) -
trunk/Source/cmakeconfig.h.cmake
r115348 r115800 68 68 #cmakedefine01 ENABLE_VIEWPORT_REFLOW 69 69 #cmakedefine01 ENABLE_WEBGL 70 #cmakedefine01 ENABLE_WEB_AUDIO 70 71 #cmakedefine01 ENABLE_WEB_SOCKETS 71 72 #cmakedefine01 ENABLE_WEB_TIMING
Note:
See TracChangeset
for help on using the changeset viewer.