Modified: trunk/Source/WebKit2/ChangeLog (92344 => 92345)
--- trunk/Source/WebKit2/ChangeLog 2011-08-04 03:02:54 UTC (rev 92344)
+++ trunk/Source/WebKit2/ChangeLog 2011-08-04 03:54:57 UTC (rev 92345)
@@ -1,3 +1,12 @@
+2011-08-03 Jeff Miller <[email protected]>
+
+ Use of AVFoundation should default to off on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=65660
+
+ Reviewed by Darin Adler.
+
+ * Shared/WebPreferencesStore.h: Change default value for AVFoundationEnabled to false on Windows, it's still true on other platforms.
+
2011-08-03 Mark Rowe <[email protected]>
Bring some order to FeatureDefines.xcconfig to make it easier to follow.
Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (92344 => 92345)
--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2011-08-04 03:02:54 UTC (rev 92344)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2011-08-04 03:54:57 UTC (rev 92345)
@@ -36,6 +36,12 @@
// macro(KeyUpper, KeyLower, TypeNameUpper, TypeName, DefaultValue)
+#if PLATFORM(WIN)
+#define DEFAULT_WEBKIT_AVFOUNDATION_ENABLED false
+#else
+#define DEFAULT_WEBKIT_AVFOUNDATION_ENABLED true
+#endif
+
#define FOR_EACH_WEBKIT_BOOL_PREFERENCE(macro) \
macro(_javascript_Enabled, _javascript_Enabled, Bool, bool, true) \
macro(LoadsImagesAutomatically, loadsImagesAutomatically, Bool, bool, true) \
@@ -74,7 +80,7 @@
macro(WebSecurityEnabled, webSecurityEnabled, Bool, bool, true) \
macro(AllowUniversalAccessFromFileURLs, allowUniversalAccessFromFileURLs, Bool, bool, false) \
macro(AllowFileAccessFromFileURLs, allowFileAccessFromFileURLs, Bool, bool, false) \
- macro(AVFoundationEnabled, isAVFoundationEnabled, Bool, bool, true) \
+ macro(AVFoundationEnabled, isAVFoundationEnabled, Bool, bool, DEFAULT_WEBKIT_AVFOUNDATION_ENABLED) \
macro(Hixie76WebSocketProtocolEnabled, hixie76WebSocketProtocolEnabled, Bool, bool, true) \
macro(MediaPlaybackRequiresUserGesture, mediaPlaybackRequiresUserGesture, Bool, bool, false) \
macro(MediaPlaybackAllowsInline, mediaPlaybackAllowsInline, Bool, bool, true) \
