iOS does not use CaptionUserPreferencesMac
authoreric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Feb 2013 17:23:48 +0000 (17:23 +0000)
committereric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Feb 2013 17:23:48 +0000 (17:23 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@143469 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/page/CaptionUserPreferencesMac.h
Source/WebCore/page/CaptionUserPreferencesMac.mm
Source/WebCore/page/PageGroup.cpp

index f97406b..ca9ec54 100644 (file)
@@ -1,3 +1,16 @@
+2013-02-20  Eric Carlson  <eric.carlson@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  <hyatt@apple.com>
 
         [New Multicolumn] Make layers paint properly in columns.
index 1e1048f..6e71d13 100644 (file)
@@ -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"
index d959ec1..38d875d 100644 (file)
@@ -25,7 +25,7 @@
 
 #import "config.h"
 
-#if ENABLE(VIDEO_TRACK)
+#if ENABLE(VIDEO_TRACK) && !PLATFORM(IOS)
 
 #import "CaptionUserPreferencesMac.h"
 
@@ -517,4 +517,4 @@ String CaptionUserPreferencesMac::displayNameForTrack(TextTrack* track) const
 
 }
 
-#endif // ENABLE(VIDEO_TRACK)
+#endif // ENABLE(VIDEO_TRACK) && !PLATFORM(IOS)
index 502655f..f2e2563 100644 (file)
@@ -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 @@ void PageGroup::invalidatedInjectedStyleSheetCacheInAllFrames()
 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);