Changeset 84648 in webkit

Timestamp:

Apr 22, 2011 11:03:04 AM (13 years ago)

Author:

jer.noble@apple.com

Message:

2011-04-22 Jer Noble <​jer.noble@apple.com>

Reviewed by Maciej Stachowiak.

Allow MediaPlayerPrivateAVFoundation to be disabled via a preference.
​https://bugs.webkit.org/show_bug.cgi?id=59179

Add API to allow the WebCore Settings preference to be called from the UIProcess.

• Shared/WebPreferencesStore.h: Added new preference definition macro.
• UIProcess/API/C/WKPreferences.cpp: (WKPreferencesSetAVFoundationEnabled): Added. (WKPreferencesGetAVFoundationEnabled): Added.
• UIProcess/API/C/WKPreferences.h:
• WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::updatePreferences): Pass new preference along to WebCore

Settings.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebPreferencesStore.h (modified) (1 diff)
• UIProcess/API/C/WKPreferences.cpp (modified) (1 diff)
• UIProcess/API/C/WKPreferences.h (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-22  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        Allow MediaPlayerPrivateAVFoundation to be disabled via a preference.
+        https://bugs.webkit.org/show_bug.cgi?id=59179
+
+        Add API to allow the WebCore Settings preference to be called from the UIProcess.
+
+        * Shared/WebPreferencesStore.h: Added new preference definition macro.
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesSetAVFoundationEnabled): Added.
+        (WKPreferencesGetAVFoundationEnabled): Added.
+        * UIProcess/API/C/WKPreferences.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences): Pass new preference along to WebCore
+            Settings.
+
 2011-04-22  Brian Weinstein  <bweinstein@apple.com>
 

trunk/Source/WebKit2/Shared/WebPreferencesStore.h

@@ -75 +75 @@
     macro(AllowUniversalAccessFromFileURLs, allowUniversalAccessFromFileURLs, Bool, bool, false) \
     macro(AllowFileAccessFromFileURLs, allowFileAccessFromFileURLs, Bool, bool, false) \
+    macro(AVFoundationEnabled, isAVFoundationEnabled, Bool, bool, true) \
     \
 

trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp

@@ -523 +523 @@
 }
 
+void WKPreferencesSetAVFoundationEnabled(WKPreferencesRef preferencesRef, bool enabled)
+{
+    toImpl(preferencesRef)->setAVFoundationEnabled(enabled);
+}
+
+bool WKPreferencesGetAVFoundationEnabled(WKPreferencesRef preferencesRef)
+{
+    return toImpl(preferencesRef)->isAVFoundationEnabled();
+}
+
 void WKPreferencesSetWebSecurityEnabled(WKPreferencesRef preferencesRef, bool enabled)
 {

trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.h

@@ -159 +159 @@
 WK_EXPORT bool WKPreferencesGetFullScreenEnabled(WKPreferencesRef preferencesRef);
 
+// Defaults to true.
+WK_EXPORT void WKPreferencesSetAVFoundationEnabled(WKPreferencesRef preferencesRef, bool enabled);
+WK_EXPORT bool WKPreferencesGetAVFoundationEnabled(WKPreferencesRef preferencesRef);
 
 #ifdef __cplusplus

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -1468 +1468 @@
 #endif
 
+#if USE(AVFOUNDATION)
+    settings->setAVFoundationEnabled(store.getBoolValueForKey(WebPreferencesKey::isAVFoundationEnabledKey()));
+#endif
+
     platformPreferencesDidChange(store);
 }