Modified: branches/safari-534.51-branch/Source/WebKit2/ChangeLog (92508 => 92509)
--- branches/safari-534.51-branch/Source/WebKit2/ChangeLog 2011-08-05 20:47:14 UTC (rev 92508)
+++ branches/safari-534.51-branch/Source/WebKit2/ChangeLog 2011-08-05 20:49:40 UTC (rev 92509)
@@ -1,5 +1,18 @@
2011-08-03 Lucas Forschler <[email protected]>
+ Merged 92345.
+
+ 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 Lucas Forschler <[email protected]>
+
Merged 91435.
2011-07-20 Tim Horton <[email protected]>
Modified: branches/safari-534.51-branch/Source/WebKit2/Shared/WebPreferencesStore.h (92508 => 92509)
--- branches/safari-534.51-branch/Source/WebKit2/Shared/WebPreferencesStore.h 2011-08-05 20:47:14 UTC (rev 92508)
+++ branches/safari-534.51-branch/Source/WebKit2/Shared/WebPreferencesStore.h 2011-08-05 20:49:40 UTC (rev 92509)
@@ -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) \
\
#define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
