Title: [101674] trunk/Source/WebCore
- Revision
- 101674
- Author
- eric.carl...@apple.com
- Date
- 2011-12-01 08:53:14 -0800 (Thu, 01 Dec 2011)
Log Message
Add Settings for text track types
https://bugs.webkit.org/show_bug.cgi?id=73383
Reviewed by Darin Adler.
No new tests, settings are not used yet.
* page/Settings.cpp:
(WebCore::Settings::Settings): Initialize new settings.
* page/Settings.h:
(WebCore::Settings::setShouldDisplaySubtitles): New.
(WebCore::Settings::shouldDisplaySubtitles): Ditto.
(WebCore::Settings::setShouldDisplayCaptions): Ditto.
(WebCore::Settings::shouldDisplayCaptions): Ditto.
(WebCore::Settings::setShouldDisplayTextDescriptions): Ditto.
(WebCore::Settings::shouldDisplayTextDescriptions): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (101673 => 101674)
--- trunk/Source/WebCore/ChangeLog 2011-12-01 16:42:49 UTC (rev 101673)
+++ trunk/Source/WebCore/ChangeLog 2011-12-01 16:53:14 UTC (rev 101674)
@@ -1,5 +1,24 @@
2011-12-01 Eric Carlson <eric.carl...@apple.com>
+ Add Settings for text track types
+ https://bugs.webkit.org/show_bug.cgi?id=73383
+
+ Reviewed by Darin Adler.
+
+ No new tests, settings are not used yet.
+
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings): Initialize new settings.
+ * page/Settings.h:
+ (WebCore::Settings::setShouldDisplaySubtitles): New.
+ (WebCore::Settings::shouldDisplaySubtitles): Ditto.
+ (WebCore::Settings::setShouldDisplayCaptions): Ditto.
+ (WebCore::Settings::shouldDisplayCaptions): Ditto.
+ (WebCore::Settings::setShouldDisplayTextDescriptions): Ditto.
+ (WebCore::Settings::shouldDisplayTextDescriptions): Ditto.
+
+2011-12-01 Eric Carlson <eric.carl...@apple.com>
+
HTMLTrackElement.readyState should return TextTrack "readiness state".
https://bugs.webkit.org/show_bug.cgi?id=73466
Modified: trunk/Source/WebCore/page/Settings.cpp (101673 => 101674)
--- trunk/Source/WebCore/page/Settings.cpp 2011-12-01 16:42:49 UTC (rev 101673)
+++ trunk/Source/WebCore/page/Settings.cpp 2011-12-01 16:53:14 UTC (rev 101674)
@@ -229,6 +229,11 @@
, m_suppressIncrementalRendering(false)
, m_backspaceKeyNavigationEnabled(true)
, m_visualWordMovementEnabled(false)
+#if ENABLE(VIDEO_TRACK)
+ , m_shouldDisplaySubtitles(false)
+ , m_shouldDisplayCaptions(false)
+ , m_shouldDisplayTextDescriptions(false)
+#endif
, m_loadsImagesAutomaticallyTimer(this, &Settings::loadsImagesAutomaticallyTimerFired)
{
// A Frame may not have been created yet, so we initialize the AtomicString
Modified: trunk/Source/WebCore/page/Settings.h (101673 => 101674)
--- trunk/Source/WebCore/page/Settings.h 2011-12-01 16:42:49 UTC (rev 101673)
+++ trunk/Source/WebCore/page/Settings.h 2011-12-01 16:53:14 UTC (rev 101674)
@@ -486,6 +486,17 @@
void setVisualWordMovementEnabled(bool enabled) { m_visualWordMovementEnabled = enabled; }
bool visualWordMovementEnabled() const { return m_visualWordMovementEnabled; }
+#if ENABLE(VIDEO_TRACK)
+ void setShouldDisplaySubtitles(bool flag) { m_shouldDisplaySubtitles = flag; }
+ bool shouldDisplaySubtitles() const { return m_shouldDisplaySubtitles; }
+
+ void setShouldDisplayCaptions(bool flag) { m_shouldDisplayCaptions = flag; }
+ bool shouldDisplayCaptions() const { return m_shouldDisplayCaptions; }
+
+ void setShouldDisplayTextDescriptions(bool flag) { m_shouldDisplayTextDescriptions = flag; }
+ bool shouldDisplayTextDescriptions() const { return m_shouldDisplayTextDescriptions; }
+#endif
+
private:
Page* m_page;
@@ -612,6 +623,12 @@
bool m_backspaceKeyNavigationEnabled : 1;
bool m_visualWordMovementEnabled : 1;
+#if ENABLE(VIDEO_TRACK)
+ bool m_shouldDisplaySubtitles : 1;
+ bool m_shouldDisplayCaptions : 1;
+ bool m_shouldDisplayTextDescriptions : 1;
+#endif
+
Timer<Settings> m_loadsImagesAutomaticallyTimer;
void loadsImagesAutomaticallyTimerFired(Timer<Settings>*);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
