Title: [89693] trunk/Source
- Revision
- 89693
- Author
- [email protected]
- Date
- 2011-06-24 12:20:42 -0700 (Fri, 24 Jun 2011)
Log Message
2011-06-24 Chris Rogers <[email protected]>
Reviewed by Kenneth Russell.
Enable Web Audio for Chromium Win
https://bugs.webkit.org/show_bug.cgi?id=63338
* features.gypi:
Modified Paths
Diff
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (89692 => 89693)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-06-24 19:16:48 UTC (rev 89692)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-06-24 19:20:42 UTC (rev 89693)
@@ -1226,6 +1226,9 @@
'dependencies': [
'<(chromium_src_dir)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
],
+ 'export_dependent_settings': [
+ '<(chromium_src_dir)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ ],
}],
['"ENABLE_LEVELDB=1" in feature_defines', {
'dependencies': [
Modified: trunk/Source/WebKit/chromium/ChangeLog (89692 => 89693)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-06-24 19:16:48 UTC (rev 89692)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-06-24 19:20:42 UTC (rev 89693)
@@ -1,3 +1,12 @@
+2011-06-24 Chris Rogers <[email protected]>
+
+ Reviewed by Kenneth Russell.
+
+ Enable Web Audio for Chromium Win
+ https://bugs.webkit.org/show_bug.cgi?id=63338
+
+ * features.gypi:
+
2011-06-24 Dominic Cooney <[email protected]>
Reviewed by Dimitri Glazkov.
Modified: trunk/Source/WebKit/chromium/features.gypi (89692 => 89693)
--- trunk/Source/WebKit/chromium/features.gypi 2011-06-24 19:16:48 UTC (rev 89692)
+++ trunk/Source/WebKit/chromium/features.gypi 2011-06-24 19:20:42 UTC (rev 89693)
@@ -83,6 +83,7 @@
'ENABLE_TOUCH_ICON_LOADING=<(enable_touch_icon_loading)',
'ENABLE_V8_SCRIPT_DEBUG_SERVER=1',
'ENABLE_VIDEO=1',
+ 'ENABLE_WEB_AUDIO=1',
'ENABLE_WEB_SOCKETS=1',
'ENABLE_WEB_TIMING=1',
'ENABLE_WEBGL=1',
@@ -134,14 +135,6 @@
['touchui==1', {
'enable_touch_icon_loading': 1,
}],
- # TODO(crogers): For the moment Windows is only enabled for
- # Google-branded build, since the FFmpeg DLLs need to be re-built
- # for chromium.
- ['OS=="mac" or OS=="linux" or (OS=="win" and branding=="Chrome")', {
- 'feature_defines': [
- 'ENABLE_WEB_AUDIO=1',
- ],
- }],
# Mac OS X uses Accelerate.framework FFT by default instead of FFmpeg.
['OS!="mac"', {
'feature_defines': [
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
