Title: [145326] trunk/Source/WebCore
- Revision
- 145326
- Author
- eric.carl...@apple.com
- Date
- 2013-03-10 09:09:00 -0700 (Sun, 10 Mar 2013)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (145325 => 145326)
--- trunk/Source/WebCore/ChangeLog 2013-03-10 15:46:22 UTC (rev 145325)
+++ trunk/Source/WebCore/ChangeLog 2013-03-10 16:09:00 UTC (rev 145326)
@@ -1,3 +1,14 @@
+2013-03-10 Eric Carlson <eric.carl...@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.carl...@apple.com>
Enable platform code to implement text track menu
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp (145325 => 145326)
--- trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2013-03-10 15:46:22 UTC (rev 145325)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2013-03-10 16:09:00 UTC (rev 145326)
@@ -25,7 +25,7 @@
#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"
@@ -365,6 +365,9 @@
resetCueValues();
}
+ if (!attributedStrings)
+ return;
+
CFIndex count = CFArrayGetCount(attributedStrings);
if (!count)
return;
@@ -415,4 +418,4 @@
} // namespace WebCore
-#endif // ENABLE(VIDEO) && USE(AVFOUNDATION) && HAVE(AVFOUNDATION_TEXT_TRACK_SUPPORT)
+#endif // ENABLE(VIDEO) && ((USE(AVFOUNDATION) && HAVE(AVFOUNDATION_TEXT_TRACK_SUPPORT)) || PLATFORM(IOS))
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h (145325 => 145326)
--- trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h 2013-03-10 15:46:22 UTC (rev 145325)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h 2013-03-10 16:09:00 UTC (rev 145326)
@@ -26,7 +26,7 @@
#ifndef InbandTextTrackPrivateAVF_h
#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"
#include <wtf/text/StringBuilder.h>
@@ -78,6 +78,6 @@
} // 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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
