Title: [143469] trunk/Source/WebCore
- Revision
- 143469
- Author
- eric.carl...@apple.com
- Date
- 2013-02-20 09:23:48 -0800 (Wed, 20 Feb 2013)
Log Message
iOS does not use CaptionUserPreferencesMac
https://bugs.webkit.org/show_bug.cgi?id=110259
Reviewed by Dean Jackson.
* page/CaptionUserPreferencesMac.h: Add PLATFORM(IOS) guard
* page/CaptionUserPreferencesMac.mm: Ditto.
* page/PageGroup.cpp:
(WebCore::PageGroup::captionPreferences): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (143468 => 143469)
--- trunk/Source/WebCore/ChangeLog 2013-02-20 17:15:15 UTC (rev 143468)
+++ trunk/Source/WebCore/ChangeLog 2013-02-20 17:23:48 UTC (rev 143469)
@@ -1,3 +1,16 @@
+2013-02-20 Eric Carlson <eric.carl...@apple.com>
+
+ iOS does not use CaptionUserPreferencesMac
+ https://bugs.webkit.org/show_bug.cgi?id=110259
+
+ Reviewed by Dean Jackson.
+
+ * page/CaptionUserPreferencesMac.h: Add PLATFORM(IOS) guard
+ * page/CaptionUserPreferencesMac.mm: Ditto.
+
+ * page/PageGroup.cpp:
+ (WebCore::PageGroup::captionPreferences): Ditto.
+
2013-02-19 David Hyatt <hy...@apple.com>
[New Multicolumn] Make layers paint properly in columns.
Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMac.h (143468 => 143469)
--- trunk/Source/WebCore/page/CaptionUserPreferencesMac.h 2013-02-20 17:15:15 UTC (rev 143468)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMac.h 2013-02-20 17:23:48 UTC (rev 143469)
@@ -26,7 +26,7 @@
#ifndef CaptionUserPreferencesMac_h
#define CaptionUserPreferencesMac_h
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO_TRACK) && !PLATFORM(IOS)
#include "CSSPropertyNames.h"
#include "CaptionUserPreferences.h"
Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMac.mm (143468 => 143469)
--- trunk/Source/WebCore/page/CaptionUserPreferencesMac.mm 2013-02-20 17:15:15 UTC (rev 143468)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMac.mm 2013-02-20 17:23:48 UTC (rev 143469)
@@ -25,7 +25,7 @@
#import "config.h"
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO_TRACK) && !PLATFORM(IOS)
#import "CaptionUserPreferencesMac.h"
@@ -517,4 +517,4 @@
}
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO_TRACK) && !PLATFORM(IOS)
Modified: trunk/Source/WebCore/page/PageGroup.cpp (143468 => 143469)
--- trunk/Source/WebCore/page/PageGroup.cpp 2013-02-20 17:15:15 UTC (rev 143468)
+++ trunk/Source/WebCore/page/PageGroup.cpp 2013-02-20 17:23:48 UTC (rev 143469)
@@ -39,7 +39,7 @@
#include "StorageNamespace.h"
#if ENABLE(VIDEO_TRACK)
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && !PLATFORM(IOS)
#include "CaptionUserPreferencesMac.h"
#else
#include "CaptionUserPreferences.h"
@@ -420,7 +420,7 @@
CaptionUserPreferences* PageGroup::captionPreferences()
{
if (!m_captionPreferences)
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && !PLATFORM(IOS)
m_captionPreferences = CaptionUserPreferencesMac::create(this);
#else
m_captionPreferences = CaptionUserPreferences::create(this);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
