Title: [102154] trunk/Source/WebCore
- Revision
- 102154
- Author
- [email protected]
- Date
- 2011-12-06 11:01:22 -0800 (Tue, 06 Dec 2011)
Log Message
Revert WebCore track Settings changes made in r101977
https://bugs.webkit.org/show_bug.cgi?id=73879
Reviewed by Sam Weinig.
No new tests yet, still nothing to test.
* page/Settings.cpp: Move the preference setters back into the .h file.
* page/Settings.h:
(WebCore::Settings::setShouldDisplaySubtitles):
(WebCore::Settings::setShouldDisplayCaptions):
(WebCore::Settings::setShouldDisplayTextDescriptions):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (102153 => 102154)
--- trunk/Source/WebCore/ChangeLog 2011-12-06 18:37:47 UTC (rev 102153)
+++ trunk/Source/WebCore/ChangeLog 2011-12-06 19:01:22 UTC (rev 102154)
@@ -1,3 +1,18 @@
+2011-12-06 Eric Carlson <[email protected]>
+
+ Revert WebCore track Settings changes made in r101977
+ https://bugs.webkit.org/show_bug.cgi?id=73879
+
+ Reviewed by Sam Weinig.
+
+ No new tests yet, still nothing to test.
+
+ * page/Settings.cpp: Move the preference setters back into the .h file.
+ * page/Settings.h:
+ (WebCore::Settings::setShouldDisplaySubtitles):
+ (WebCore::Settings::setShouldDisplayCaptions):
+ (WebCore::Settings::setShouldDisplayTextDescriptions):
+
2011-12-06 Andreas Kling <[email protected]>
MediaList: Remove constructor that takes a CSSImportRule*.
Modified: trunk/Source/WebCore/page/Settings.cpp (102153 => 102154)
--- trunk/Source/WebCore/page/Settings.cpp 2011-12-06 18:37:47 UTC (rev 102153)
+++ trunk/Source/WebCore/page/Settings.cpp 2011-12-06 19:01:22 UTC (rev 102154)
@@ -837,21 +837,4 @@
return gMockScrollbarsEnabled;
}
-#if ENABLE(VIDEO_TRACK)
-void Settings::setShouldDisplaySubtitles(bool flag)
-{
- m_shouldDisplaySubtitles = flag;
-}
-
-void Settings::setShouldDisplayCaptions(bool flag)
-{
- m_shouldDisplayCaptions = flag;
-}
-
-void Settings::setShouldDisplayTextDescriptions(bool flag)
-{
- m_shouldDisplayTextDescriptions = flag;
-}
-#endif
-
} // namespace WebCore
Modified: trunk/Source/WebCore/page/Settings.h (102153 => 102154)
--- trunk/Source/WebCore/page/Settings.h 2011-12-06 18:37:47 UTC (rev 102153)
+++ trunk/Source/WebCore/page/Settings.h 2011-12-06 19:01:22 UTC (rev 102154)
@@ -490,13 +490,13 @@
bool visualWordMovementEnabled() const { return m_visualWordMovementEnabled; }
#if ENABLE(VIDEO_TRACK)
- void setShouldDisplaySubtitles(bool);
+ void setShouldDisplaySubtitles(bool flag) { m_shouldDisplaySubtitles = flag; }
bool shouldDisplaySubtitles() const { return m_shouldDisplaySubtitles; }
- void setShouldDisplayCaptions(bool);
+ void setShouldDisplayCaptions(bool flag) { m_shouldDisplayCaptions = flag; }
bool shouldDisplayCaptions() const { return m_shouldDisplayCaptions; }
- void setShouldDisplayTextDescriptions(bool);
+ void setShouldDisplayTextDescriptions(bool flag) { m_shouldDisplayTextDescriptions = flag; }
bool shouldDisplayTextDescriptions() const { return m_shouldDisplayTextDescriptions; }
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
