Changeset 145326 in webkit

Timestamp:

Mar 10, 2013, 9:09:00 AM (12 years ago)

Author:

eric.carlson@apple.com

Message:

Allow iOS port to use InbandTextTrackPrivateAVF
​https://bugs.webkit.org/show_bug.cgi?id=111933

Reviewed by Dean Jackson.

• platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:

(WebCore::InbandTextTrackPrivateAVF::processCue): Drive-by cleanup.

• platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp (modified) (3 diffs)
• platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-10  Eric Carlson  <eric.carlson@apple.com>
+
+        Allow iOS port to use InbandTextTrackPrivateAVF
+        https://bugs.webkit.org/show_bug.cgi?id=111933
+
+        Reviewed by Dean Jackson.
+
+        * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
+        (WebCore::InbandTextTrackPrivateAVF::processCue): Drive-by cleanup.
+        * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h:
+
 2013-03-09  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp

@@ -26 +26 @@
 #include "config.h"
 
-#if ENABLE(VIDEO) && USE(AVFOUNDATION) && HAVE(AVFOUNDATION_TEXT_TRACK_SUPPORT)
+#if ENABLE(VIDEO) && ((USE(AVFOUNDATION) && HAVE(AVFOUNDATION_TEXT_TRACK_SUPPORT)) || PLATFORM(IOS))
 
 #include "InbandTextTrackPrivateAVF.h"
@@ -366 +366 @@
     }
 
+    if (!attributedStrings)
+        return;
+
     CFIndex count = CFArrayGetCount(attributedStrings);
     if (!count)
@@ -416 +419 @@
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO) && USE(AVFOUNDATION) && HAVE(AVFOUNDATION_TEXT_TRACK_SUPPORT)
+#endif // ENABLE(VIDEO) && ((USE(AVFOUNDATION) && HAVE(AVFOUNDATION_TEXT_TRACK_SUPPORT)) || PLATFORM(IOS))

trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h

@@ -27 +27 @@
 #define InbandTextTrackPrivateAVF_h
 
-#if ENABLE(VIDEO) && USE(AVFOUNDATION) && HAVE(AVFOUNDATION_TEXT_TRACK_SUPPORT)
+#if ENABLE(VIDEO) && ((USE(AVFOUNDATION) && HAVE(AVFOUNDATION_TEXT_TRACK_SUPPORT)) || PLATFORM(IOS))
 
 #include "InbandTextTrackPrivate.h"
@@ -79 +79 @@
 } // namespace WebCore
 
-#endif // ENABLE(VIDEO) && USE(AVFOUNDATION) && HAVE(AVFOUNDATION_TEXT_TRACK_SUPPORT)
+#endif //  ENABLE(VIDEO) && ((USE(AVFOUNDATION) && HAVE(AVFOUNDATION_TEXT_TRACK_SUPPORT)) || PLATFORM(IOS))
 
 #endif // InbandTextTrackPrivateAVF_h