Changeset 142383 in webkit

Timestamp:

Feb 9, 2013 4:50:59 PM (11 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac] Do not assume MediaAccessibility framework is installed
​https://bugs.webkit.org/show_bug.cgi?id=109365

Reviewed by Sam Weinig.

• page/CaptionUserPreferencesMac.h:
• page/CaptionUserPreferencesMac.mm:

(WebCore::CaptionUserPreferencesMac::userPrefersCaptions): Call the base class if the framework

is not available.

(WebCore::CaptionUserPreferencesMac::setUserPrefersCaptions): Ditto.
(WebCore::CaptionUserPreferencesMac::userHasCaptionPreferences): Ditto.
(WebCore::CaptionUserPreferencesMac::registerForCaptionPreferencesChangedCallbacks): Ditto.
(WebCore::CaptionUserPreferencesMac::unregisterForCaptionPreferencesChangedCallbacks): Ditto.
(WebCore::CaptionUserPreferencesMac::captionsStyleSheetOverride): Ditto.
(WebCore::CaptionUserPreferencesMac::captionFontSizeScale): Ditto.
(WebCore::CaptionUserPreferencesMac::setPreferredLanguage): Ditto.
(WebCore::CaptionUserPreferencesMac::preferredLanguages): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/CaptionUserPreferencesMac.h (modified) (1 diff)
• page/CaptionUserPreferencesMac.mm (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-09  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] Do not assume MediaAccessibility framework is installed
+        https://bugs.webkit.org/show_bug.cgi?id=109365
+
+        Reviewed by Sam Weinig.
+
+        * page/CaptionUserPreferencesMac.h:
+        * page/CaptionUserPreferencesMac.mm:
+        (WebCore::CaptionUserPreferencesMac::userPrefersCaptions): Call the base class if the framework
+            is not available.
+        (WebCore::CaptionUserPreferencesMac::setUserPrefersCaptions): Ditto.
+        (WebCore::CaptionUserPreferencesMac::userHasCaptionPreferences): Ditto.
+        (WebCore::CaptionUserPreferencesMac::registerForCaptionPreferencesChangedCallbacks): Ditto.
+        (WebCore::CaptionUserPreferencesMac::unregisterForCaptionPreferencesChangedCallbacks): Ditto.
+        (WebCore::CaptionUserPreferencesMac::captionsStyleSheetOverride): Ditto.
+        (WebCore::CaptionUserPreferencesMac::captionFontSizeScale): Ditto.
+        (WebCore::CaptionUserPreferencesMac::setPreferredLanguage): Ditto.
+        (WebCore::CaptionUserPreferencesMac::preferredLanguages): Ditto.
+
 2013-02-09  Dominic Mazzoni  <dmazzoni@google.com>
 

trunk/Source/WebCore/page/CaptionUserPreferencesMac.h

@@ -44 +44 @@
     virtual bool userPrefersCaptions() const OVERRIDE;
     virtual void setUserPrefersCaptions(bool) OVERRIDE;
-    virtual bool userHasCaptionPreferences() const OVERRIDE { return true; }
+    virtual bool userHasCaptionPreferences() const OVERRIDE;
     virtual float captionFontSizeScale(bool&) const OVERRIDE;
     virtual String captionsStyleSheetOverride() const OVERRIDE;

trunk/Source/WebCore/page/CaptionUserPreferencesMac.mm

@@ -103 +103 @@
 bool CaptionUserPreferencesMac::userPrefersCaptions() const
 {
+    if (!MediaAccessibilityLibrary())
+        return CaptionUserPreferences::userPrefersCaptions();
+
     return MACaptionAppearanceGetShowCaptions(kMACaptionAppearanceDomainUser);
 }
@@ -108 +111 @@
 void CaptionUserPreferencesMac::setUserPrefersCaptions(bool preference)
 {
+    if (!MediaAccessibilityLibrary()) {
+        CaptionUserPreferences::setUserPrefersCaptions(preference);
+        return;
+    }
+
     MACaptionAppearanceSetShowCaptions(kMACaptionAppearanceDomainUser, preference);
 }
 
+bool CaptionUserPreferencesMac::userHasCaptionPreferences() const
+{
+    if (!MediaAccessibilityLibrary())
+        return CaptionUserPreferences::userHasCaptionPreferences();
+
+    return !MediaAccessibilityLibrary();
+}
+
 void CaptionUserPreferencesMac::registerForCaptionPreferencesChangedCallbacks(CaptionPreferencesChangedListener* listener)
 {
+    if (!MediaAccessibilityLibrary()) {
+        CaptionUserPreferences::registerForCaptionPreferencesChangedCallbacks(listener);
+        return;
+    }
+
     ASSERT(!m_captionPreferenceChangeListeners.contains(listener));
 
@@ -129 +150 @@
 void CaptionUserPreferencesMac::unregisterForCaptionPreferencesChangedCallbacks(CaptionPreferencesChangedListener* listener)
 {
+    if (!MediaAccessibilityLibrary()) {
+        CaptionUserPreferences::unregisterForCaptionPreferencesChangedCallbacks(listener);
+        return;
+    }
+
     if (kMAXCaptionAppearanceSettingsChangedNotification)
         m_captionPreferenceChangeListeners.remove(listener);
@@ -333 +359 @@
 String CaptionUserPreferencesMac::captionsStyleSheetOverride() const
 {
+    if (!MediaAccessibilityLibrary())
+        return CaptionUserPreferences::captionsStyleSheetOverride();
+
     StringBuilder captionsOverrideStyleSheet;
 
@@ -375 +404 @@
 float CaptionUserPreferencesMac::captionFontSizeScale(bool& important) const
 {
+    if (!MediaAccessibilityLibrary())
+        return CaptionUserPreferences::captionFontSizeScale(important);
+
     MACaptionAppearanceBehavior behavior;
     CGFloat characterScale = CaptionUserPreferences::captionFontSizeScale(important);
@@ -418 +450 @@
 void CaptionUserPreferencesMac::setPreferredLanguage(String language) const
 {
+    if (!MediaAccessibilityLibrary()) {
+        CaptionUserPreferences::setPreferredLanguage(language);
+        return;
+    }
+
     MACaptionAppearanceAddSelectedLanguage(kMACaptionAppearanceDomainUser, language.createCFString().get());
 }
@@ -426 +463 @@
     if (!override.isEmpty())
         return override;
+
+    if (!MediaAccessibilityLibrary())
+        return CaptionUserPreferences::preferredLanguages();
 
     RetainPtr<CFArrayRef> languages(AdoptCF, MACaptionAppearanceCopySelectedLanguages(kMACaptionAppearanceDomainUser));