Title: [144367] trunk/Source/WebCore
- Revision
- 144367
- Author
- [email protected]
- Date
- 2013-02-28 14:02:09 -0800 (Thu, 28 Feb 2013)
Log Message
Revert an erroneous change in r144336.
Rubber-stamped by Eric Carlson.
* page/PageGroup.cpp:
(WebCore::PageGroup::captionPreferences):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (144366 => 144367)
--- trunk/Source/WebCore/ChangeLog 2013-02-28 22:01:27 UTC (rev 144366)
+++ trunk/Source/WebCore/ChangeLog 2013-02-28 22:02:09 UTC (rev 144367)
@@ -1,3 +1,12 @@
+2013-02-28 Ryosuke Niwa <[email protected]>
+
+ Revert an erroneous change in r144336.
+
+ Rubber-stamped by Eric Carlson.
+
+ * page/PageGroup.cpp:
+ (WebCore::PageGroup::captionPreferences):
+
2013-02-28 David Hyatt <[email protected]>
Unreviewed build fix for Windows. Make sure the new bits are unsigned and not bools.
Modified: trunk/Source/WebCore/page/PageGroup.cpp (144366 => 144367)
--- trunk/Source/WebCore/page/PageGroup.cpp 2013-02-28 22:01:27 UTC (rev 144366)
+++ trunk/Source/WebCore/page/PageGroup.cpp 2013-02-28 22:02:09 UTC (rev 144367)
@@ -39,7 +39,7 @@
#include "StorageNamespace.h"
#if ENABLE(VIDEO_TRACK)
-#if HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
+#if PLATFORM(MAC) && !PLATFORM(IOS)
#include "CaptionUserPreferencesMac.h"
#else
#include "CaptionUserPreferences.h"
@@ -420,7 +420,7 @@
CaptionUserPreferences* PageGroup::captionPreferences()
{
if (!m_captionPreferences)
-#if HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
+#if PLATFORM(MAC) && !PLATFORM(IOS)
m_captionPreferences = CaptionUserPreferencesMac::create(this);
#else
m_captionPreferences = CaptionUserPreferences::create(this);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes