Changeset 95678 in webkit

Timestamp:

Sep 21, 2011 4:06:42 PM (13 years ago)

Author:

jer.noble@apple.com

Message:

Add settings to control the availability of the Web Audio API to WebKit and WebKit2.
​https://bugs.webkit.org/show_bug.cgi?id=68382

Source/WebCore:

Reviewed by Darin Adler.

Only create a AudioContext object if the Web Audio feature is runtime-enabled in Settings.

No new tests, as this feature is not yet enabled by default.

• bindings/js/JSDOMWindowCustom.cpp:

(WebCore::JSDOMWindow::webkitAudioContext):

Source/WebKit/mac:

Reviewed by Darin Adler.

Initialize the webAudioEnabled preference to NO by default.

• WebView/WebPreferences.mm:

(+[WebPreferences initialize]):

Source/WebKit2:

Add support for the webAudioEnabled preference in WebKit2.

Reviewed by Darin Adler.

• Shared/WebPreferencesStore.h: Add WebAudioEnabled getter and setter macro.
• UIProcess/API/C/WKPreferences.cpp:

(WKPreferencesSetWebAudioEnabled): Added.
(WKPreferencesGetWebAudioEnabled): Added.

• UIProcess/API/C/WKPreferences.h:
• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::updatePreferences): Update the webAudioEnabled preference.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/JSDOMWindowCustom.cpp (modified) (2 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebPreferences.mm (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/WebPreferencesStore.h (modified) (1 diff)
• WebKit2/UIProcess/API/C/WKPreferences.cpp (modified) (1 diff)
• WebKit2/UIProcess/API/C/WKPreferences.h (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-19  Jer Noble  <jer.noble@apple.com>
+
+        Add settings to control the availability of the Web Audio API to WebKit and WebKit2.
+        https://bugs.webkit.org/show_bug.cgi?id=68382
+
+        Reviewed by Darin Adler.
+
+        Only create a AudioContext object if the Web Audio feature is runtime-enabled in Settings.
+
+        No new tests, as this feature is not yet enabled by default.
+
+        * bindings/js/JSDOMWindowCustom.cpp:
+        (WebCore::JSDOMWindow::webkitAudioContext):
+
 2011-09-21  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp

@@ -602 +602 @@
 #endif
 
+#if ENABLE(WEB_AUDIO) || ENABLE(WEB_SOCKETS)
+static Settings* settingsForWindow(const JSDOMWindow* window)
+{
+    ASSERT(window);
+    if (Frame* frame = window->impl()->frame())
+        return frame->settings();
+    return 0;
+}
+#endif
+
 #if ENABLE(WEB_AUDIO)
 JSValue JSDOMWindow::webkitAudioContext(ExecState* exec) const
 {
-    return getDOMConstructor<JSAudioContextConstructor>(exec, this);
+    Settings* settings = settingsForWindow(this);
+    if (settings && settings->webAudioEnabled())
+        return getDOMConstructor<JSAudioContextConstructor>(exec, this);
+    return jsUndefined();
 }
 #endif
@@ -612 +625 @@
 JSValue JSDOMWindow::webSocket(ExecState* exec) const
 {
-    Frame* frame = impl()->frame();
-    if (!frame)
-        return jsUndefined();
-    Settings* settings = frame->settings();
-    if (!settings)
+    if (!settingsForWindow(this))
         return jsUndefined();
     return getDOMConstructor<JSWebSocketConstructor>(exec, this);

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-09-19  Jer Noble  <jer.noble@apple.com>
+
+        Add settings to control the availability of the Web Audio API to WebKit and WebKit2.
+        https://bugs.webkit.org/show_bug.cgi?id=68382
+
+        Reviewed by Darin Adler.
+
+        Initialize the webAudioEnabled preference to NO by default.
+
+        * WebView/WebPreferences.mm:
+        (+[WebPreferences initialize]):
+
 2011-09-21  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebPreferences.mm

@@ -385 +385 @@
         [NSNumber numberWithBool:NO],   WebKitMediaPlaybackRequiresUserGesturePreferenceKey,
         [NSNumber numberWithBool:YES],  WebKitMediaPlaybackAllowsInlinePreferenceKey,
+        [NSNumber numberWithBool:NO],   WebKitWebAudioEnabledPreferenceKey,
 
         [NSNumber numberWithLongLong:ApplicationCacheStorage::noQuota()], WebKitApplicationCacheTotalQuota,

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-09-19  Jer Noble  <jer.noble@apple.com>
+
+        Add settings to control the availability of the Web Audio API to WebKit and WebKit2.
+        https://bugs.webkit.org/show_bug.cgi?id=68382
+
+        Add support for the webAudioEnabled preference in WebKit2.
+
+        Reviewed by Darin Adler.
+
+        * Shared/WebPreferencesStore.h: Add WebAudioEnabled getter and setter macro.
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesSetWebAudioEnabled): Added.
+        (WKPreferencesGetWebAudioEnabled): Added.
+        * UIProcess/API/C/WKPreferences.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences): Update the webAudioEnabled preference.
+
 2011-09-21  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/Shared/WebPreferencesStore.h

@@ -94 +94 @@
     macro(ShowsToolTipOverTruncatedText, showsToolTipOverTruncatedText, Bool, bool, false) \
     macro(MockScrollbarsEnabled, mockScrollbarsEnabled, Bool, bool, false) \
+    macro(WebAudioEnabled, webAudioEnabled, Bool, bool, false) \
     \
 

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

@@ -622 +622 @@
     return toImpl(preferencesRef)->mockScrollbarsEnabled();
 }
+
+void WKPreferencesSetWebAudioEnabled(WKPreferencesRef preferencesRef, bool enabled)
+{
+    toImpl(preferencesRef)->setWebAudioEnabled(enabled);
+}
+
+bool WKPreferencesGetWebAudioEnabled(WKPreferencesRef preferencesRef)
+{
+    return toImpl(preferencesRef)->webAudioEnabled();
+}

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

@@ -166 +166 @@
 WK_EXPORT bool WKPreferencesGetAVFoundationEnabled(WKPreferencesRef preferencesRef);
 
+// Defaults to false
+WK_EXPORT void WKPreferencesSetWebAudioEnabled(WKPreferencesRef preferencesRef, bool enabled);
+WK_EXPORT bool WKPreferencesGetWebAudioEnabled(WKPreferencesRef preferencesRef);
+
 #ifdef __cplusplus
 }

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

@@ -1625 +1625 @@
 #endif
 
+#if ENABLE(WEB_AUDIO)
+    settings->setWebAudioEnabled(store.getBoolValueForKey(WebPreferencesKey::webAudioEnabledKey()));
+#endif
+
     platformPreferencesDidChange(store);
 }