Changeset 84646 in webkit

Timestamp:

Apr 22, 2011 10:51:00 AM (13 years ago)

Author:

jer.noble@apple.com

Message:

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

Reviewed by Maciej Stachowiak.

Disable MediaPlayerPrivateAVFoundation when using old full screen mode.
​https://bugs.webkit.org/show_bug.cgi?id=59147

Add a new isAVFoundationEnabled setting and check it before adding
MediaPlayerPrivateAVFoundationObjC to the media engine registry.

• WebCore.exp.in:
• page/Settings.cpp:
• page/Settings.h: (WebCore::Settings::setAVFoundationEnabled): Added. (WebCore::Settings::isAVFoundationEnabled): Added.
• platform/graphics/MediaPlayer.cpp: (WebCore::installedMediaEngines): Check the settings added above.

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

Reviewed by Maciej Stachowiak.

Disable MediaPlayerPrivateAVFoundation when using old full screen mode.
​https://bugs.webkit.org/show_bug.cgi?id=59147

Add a new user default preference, and plumb that preference down to WebCore
Settings. Allow the fullScreenEnabled preference to override the new
isAVFoundationEnabled preference, so that clients of the legacy full screen
mode will continue to use that mode normally.

• WebView/WebPreferenceKeysPrivate.h: Add new preference key.
• WebView/WebPreferences.mm: (+[WebPreferences initialize]): Set the default value of new

preference.

(-[WebPreferences setAVFoundationEnabled:]): Added.
(-[WebPreferences isAVFoundationEnabled]): Added.

• WebView/WebPreferencesPrivate.h:
• WebView/WebView.mm: (-[WebView _preferencesChanged:]): Update the WebCore settings with the

new values from WebPreferences.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/page/Settings.cpp (modified) (1 diff)
• WebCore/page/Settings.h (modified) (2 diffs)
• WebCore/platform/graphics/MediaPlayer.cpp (modified) (2 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebPreferenceKeysPrivate.h (modified) (1 diff)
• WebKit/mac/WebView/WebPreferences.mm (modified) (2 diffs)
• WebKit/mac/WebView/WebPreferencesPrivate.h (modified) (1 diff)
• WebKit/mac/WebView/WebView.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-22  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        Disable MediaPlayerPrivateAVFoundation when using old full screen mode.
+        https://bugs.webkit.org/show_bug.cgi?id=59147
+
+        Add a new isAVFoundationEnabled setting and check it before adding 
+        MediaPlayerPrivateAVFoundationObjC to the media engine registry.
+
+        * WebCore.exp.in:
+        * page/Settings.cpp:
+        * page/Settings.h:
+        (WebCore::Settings::setAVFoundationEnabled): Added.
+        (WebCore::Settings::isAVFoundationEnabled): Added.
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::installedMediaEngines): Check the settings added above.
+
 2011-04-22  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -1868 +1868 @@
 __ZN7WebCore14ResourceHandle29privateBrowsingStorageSessionEv
 #endif
+
+#if USE(AVFOUNDATION)
+__ZN7WebCore8Settings20gAVFoundationEnabledE
+#endif

trunk/Source/WebCore/page/Settings.cpp

@@ -54 +54 @@
 #if USE(SAFARI_THEME)
 bool Settings::gShouldPaintNativeControls = true;
+#endif
+
+#if USE(AVFOUNDATION)
+bool Settings::gAVFoundationEnabled(false);
 #endif
 

trunk/Source/WebCore/page/Settings.h

@@ -354 +354 @@
         void setFullScreenEnabled(bool flag) { m_fullScreenAPIEnabled = flag; }
         bool fullScreenEnabled() const  { return m_fullScreenAPIEnabled; }
+#endif
+
+#if USE(AVFOUNDATION)
+        static void setAVFoundationEnabled(bool flag) { gAVFoundationEnabled = flag; }
+        static bool isAVFoundationEnabled() { return gAVFoundationEnabled; }
 #endif
 
@@ -499 +504 @@
         bool m_shouldInjectUserScriptsInInitialEmptyDocument : 1;
 
+#if USE(AVFOUNDATION)
+        static bool gAVFoundationEnabled;
+#endif
+
 #if USE(SAFARI_THEME)
         static bool gShouldPaintNativeControls;

trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp

@@ -36 +36 @@
 #include "MIMETypeRegistry.h"
 #include "MediaPlayerPrivate.h"
+#include "Settings.h"
 #include "TimeRanges.h"
 
@@ -191 +192 @@
 
 #if USE(AVFOUNDATION) && PLATFORM(MAC)
-        MediaPlayerPrivateAVFoundationObjC::registerMediaEngine(addMediaEngine);
+        if (Settings::isAVFoundationEnabled())
+            MediaPlayerPrivateAVFoundationObjC::registerMediaEngine(addMediaEngine);
 #endif
 

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-04-22  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        Disable MediaPlayerPrivateAVFoundation when using old full screen mode.
+        https://bugs.webkit.org/show_bug.cgi?id=59147
+
+        Add a new user default preference, and plumb that preference down to WebCore
+        Settings. Allow the fullScreenEnabled preference to override the new 
+        isAVFoundationEnabled preference, so that clients of the legacy full screen
+        mode will continue to use that mode normally.
+
+        * WebView/WebPreferenceKeysPrivate.h: Add new preference key.
+        * WebView/WebPreferences.mm:
+        (+[WebPreferences initialize]): Set the default value of new
+            preference.
+        (-[WebPreferences setAVFoundationEnabled:]): Added.
+        (-[WebPreferences isAVFoundationEnabled]): Added.
+        * WebView/WebPreferencesPrivate.h:
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChanged:]): Update the WebCore settings with the
+            new values from WebPreferences.
+
 2011-04-22  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h

@@ -108 +108 @@
 #define WebKitHyperlinkAuditingEnabledPreferenceKey @"WebKitHyperlinkAuditingEnabled"
 #define WebKitUseQuickLookResourceCachingQuirksPreferenceKey @"WebKitUseQuickLookResourceCachingQuirks"
+#define WebKitAVFoundationEnabledKey @"WebKitAVFoundationEnabled"
 
 // These are private both because callers should be using the cover methods and because the

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

@@ -392 +392 @@
         [NSNumber numberWithBool:YES],  WebKitHyperlinkAuditingEnabledPreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitUsePreHTML5ParserQuirksKey,
+        [NSNumber numberWithBool:YES],  WebKitAVFoundationEnabledKey,
         [NSNumber numberWithBool:useQuickLookQuirks()], WebKitUseQuickLookResourceCachingQuirksPreferenceKey,
         [NSNumber numberWithLongLong:WebCore::ApplicationCacheStorage::noQuota()], WebKitApplicationCacheTotalQuota,
@@ -1485 +1486 @@
 }
 
+- (void)setAVFoundationEnabled:(BOOL)flag
+{
+    [self _setBoolValue:flag forKey:WebKitAVFoundationEnabledKey];
+}
+
+- (BOOL)isAVFoundationEnabled
+{
+    return [self _boolValueForKey:WebKitAVFoundationEnabledKey];
+}
 @end
 

trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h

@@ -244 +244 @@
 - (BOOL)loadsSiteIconsIgnoringImageLoadingPreference;
 
+// AVFoundation support is dependent on WebCore/WebKit being
+// compiled with USE_AVFOUNDATION.
+- (void)setAVFoundationEnabled:(BOOL)flag;
+- (BOOL)isAVFoundationEnabled;
+
 @end

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

@@ -1558 +1558 @@
     settings->setInteractiveFormValidationEnabled([self interactiveFormValidationEnabled]);
     settings->setValidationMessageTimerMagnification([self validationMessageTimerMagnification]);
+#if USE(AVFOUNDATION)
+#if ENABLE(FULLSCREEN_API)
+    settings->setAVFoundationEnabled([preferences isAVFoundationEnabled] && [preferences fullScreenEnabled]);
+#else
+    settings->setAVFoundationEnabled(false);
+#endif
+#endif
 
     // Application Cache Preferences are stored on the global cache storage manager, not in Settings.