webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 5 insertions, 17 deletions

diff --git a/Source/WebCore/page/CaptionUserPreferences.h b/Source/WebCore/page/CaptionUserPreferences.h
index 8b08bbb41..3e5a3b9c4 100644
--- a/Source/WebCore/page/CaptionUserPreferences.h
+++ b/Source/WebCore/page/CaptionUserPreferences.h
@@ -28,18 +28,17 @@
 
 #if ENABLE(VIDEO_TRACK)
 
-#include "AudioTrack.h"
 #include "Language.h"
 #include "LocalizedStrings.h"
 #include "TextTrack.h"
 #include "Timer.h"
+#include <wtf/PassOwnPtr.h>
 #include <wtf/text/AtomicString.h>
 
 namespace WebCore {
 
 class HTMLMediaElement;
 class PageGroup;
-class AudioTrackList;
 class TextTrackList;
 
 class CaptionUserPreferences {
@@ -50,8 +49,7 @@ public:
     enum CaptionDisplayMode {
         Automatic,
         ForcedOnly,
-        AlwaysOn,
-        Manual,
+        AlwaysOn
     };
     virtual CaptionDisplayMode captionDisplayMode() const;
     virtual void setCaptionDisplayMode(CaptionDisplayMode);
@@ -80,15 +78,9 @@ public:
     virtual void setPreferredLanguage(const String&);
     virtual Vector<String> preferredLanguages() const;
 
-    virtual void setPreferredAudioCharacteristic(const String&);
-    virtual Vector<String> preferredAudioCharacteristics() const;
-
     virtual String displayNameForTrack(TextTrack*) const;
     virtual Vector<RefPtr<TextTrack>> sortedTrackListForMenu(TextTrackList*);
 
-    virtual String displayNameForTrack(AudioTrack*) const;
-    virtual Vector<RefPtr<AudioTrack>> sortedTrackListForMenu(AudioTrackList*);
-
     void setPrimaryAudioTrackLanguageOverride(const String& language) { m_primaryAudioTrackLanguageOverride = language;  }
     String primaryAudioTrackLanguageOverride() const;
 
@@ -99,21 +91,17 @@ public:
 
 protected:
     void updateCaptionStyleSheetOveride();
-    void beginBlockingNotifications();
-    void endBlockingNotifications();
 
 private:
-    void timerFired();
+    void timerFired(Timer<CaptionUserPreferences>&);
     void notify();
 
     PageGroup& m_pageGroup;
-    mutable CaptionDisplayMode m_displayMode;
-    Timer m_timer;
+    CaptionDisplayMode m_displayMode;
+    Timer<CaptionUserPreferences> m_timer;
     String m_userPreferredLanguage;
-    String m_userPreferredAudioCharacteristic;
     String m_captionsStyleSheetOverride;
     String m_primaryAudioTrackLanguageOverride;
-    unsigned m_blockNotificationsCounter { 0 };
     bool m_testingMode;
     bool m_havePreferences;
 };