Changeset 147917 in webkit

Timestamp:

Apr 8, 2013 9:13:47 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Enable text tracks from track elements
​https://bugs.webkit.org/show_bug.cgi?id=113522

Patch by Brendan Long <​b.long@cablelabs.com> on 2013-04-08
Reviewed by Jocelyn Turcotte.

No new tests because they're already there. This just enables the feature.

• Target.pri:
• bindings/generic/RuntimeEnabledFeatures.cpp:

(WebCore):

• platform/qt/LocalizedStringsQt.cpp:

(WebCore):
(WebCore::textTrackSubtitlesText):
(WebCore::textTrackOffText):
(WebCore::textTrackNoLabelText):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Target.pri (modified) (7 diffs)
• bindings/generic/RuntimeEnabledFeatures.cpp (modified) (1 diff)
• platform/qt/LocalizedStringsQt.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-08  Brendan Long  <b.long@cablelabs.com>
+
+        [Qt] Enable text tracks from track elements
+        https://bugs.webkit.org/show_bug.cgi?id=113522
+
+        Reviewed by Jocelyn Turcotte.
+
+        No new tests because they're already there. This just enables the feature.
+
+        * Target.pri:
+        * bindings/generic/RuntimeEnabledFeatures.cpp:
+        (WebCore):
+        * platform/qt/LocalizedStringsQt.cpp:
+        (WebCore):
+        (WebCore::textTrackSubtitlesText):
+        (WebCore::textTrackOffText):
+        (WebCore::textTrackNoLabelText):
+
 2013-04-08  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/Target.pri

@@ -1051 +1051 @@
     platform/graphics/SurrogatePairAwareTextIterator.cpp \
     platform/graphics/TextRun.cpp \
-    platform/graphics/TextTrackRepresentation.cpp \
     platform/graphics/TiledBackingStore.cpp \
     platform/graphics/transforms/AffineTransform.cpp \
@@ -1261 +1260 @@
     rendering/RenderTextControlSingleLine.cpp \
     rendering/RenderTextFragment.cpp \
-    rendering/RenderTextTrackCue.cpp \
     rendering/RenderTheme.cpp \
     rendering/RenderTreeAsText.cpp \
@@ -1915 +1913 @@
     html/HTMLTextFormControlElement.h \
     html/HTMLTitleElement.h \
-    html/HTMLTrackElement.h \
     html/HTMLUListElement.h \
     html/HTMLVideoElement.h \
@@ -1968 +1965 @@
     html/shadow/MediaControlsApple.h \
     html/shadow/DetailsMarkerControl.h \
-    html/track/InbandTextTrack.h \
-    html/track/LoadableTextTrack.h \
-    html/track/TextTrack.h \
-    html/track/TextTrackCue.h \
-    html/track/TextTrackCueGeneric.h \
-    html/track/TextTrackCueList.h \
-    html/track/TextTrackList.h \
-    html/track/TrackBase.h \
-    html/track/TrackEvent.h \
-    html/track/WebVTTParser.h \
-    html/track/WebVTTToken.h \
-    html/track/WebVTTTokenizer.h \
     inspector/BindingVisitors.h \
     inspector/ConsoleAPITypes.h \
@@ -2095 +2080 @@
     loader/SubstituteData.h \
     loader/TextResourceDecoder.h \
-    loader/TextTrackLoader.h \
     loader/ThreadableLoader.h \
     loader/WorkerThreadableLoader.h \
@@ -2266 +2250 @@
     platform/graphics/ImageOrientation.h \
     platform/graphics/ImageSource.h \
-    platform/graphics/InbandTextTrackPrivate.h \
-    platform/graphics/InbandTextTrackPrivateClient.h \
     platform/graphics/IntPoint.h \
     platform/graphics/IntPointHash.h \
@@ -3984 +3966 @@
 
 enable?(VIDEO_TRACK) {
+    HEADERS += \
+        bindings/js/JSTextTrackCustom.h \
+        bindings/js/JSTrackCustom.h \
+        html/HTMLTrackElement.h \
+        html/track/InbandTextTrack.h \
+        html/track/LoadableTextTrack.h \
+        html/track/TextTrack.h \
+        html/track/TextTrackCue.h \
+        html/track/TextTrackCueGeneric.h \
+        html/track/TextTrackCueList.h \
+        html/track/TextTrackList.h \
+        html/track/TrackBase.h \
+        html/track/TrackEvent.h \
+        html/track/WebVTTParser.h \
+        html/track/WebVTTToken.h \
+        html/track/WebVTTTokenizer.h \
+        loader/TextTrackLoader.h \
+        platform/graphics/InbandTextTrackPrivate.h \
+        platform/graphics/InbandTextTrackPrivateClient.h
+
     SOURCES += \
         bindings/js/JSTextTrackCueCustom.cpp \
         bindings/js/JSTextTrackCustom.cpp \
-        bindings/js/JSTextTrackCustom.h \
         bindings/js/JSTrackCustom.cpp \
-        bindings/js/JSTrackCustom.h \
         bindings/js/JSTrackEventCustom.cpp \
-        bindings/js/JSTextTrackListCustom.cpp
+        bindings/js/JSTextTrackListCustom.cpp \
+        html/HTMLTrackElement.cpp \
+        html/track/InbandTextTrack.cpp \
+        html/track/LoadableTextTrack.cpp \
+        html/track/TextTrack.cpp \
+        html/track/TextTrackCue.cpp \
+        html/track/TextTrackCueGeneric.cpp \
+        html/track/TextTrackCueList.cpp \
+        html/track/TextTrackList.cpp \
+        html/track/TrackBase.cpp \
+        html/track/TrackEvent.cpp \
+        html/track/WebVTTElement.cpp \
+        html/track/WebVTTParser.cpp \
+        html/track/WebVTTTokenizer.cpp \
+        loader/cache/CachedTextTrack.cpp \
+        loader/TextTrackLoader.cpp \
+        platform/graphics/TextTrackRepresentation.cpp \
+        rendering/RenderTextTrackCue.cpp
 }
 

trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp

@@ -179 +179 @@
 
 #if ENABLE(VIDEO_TRACK)
-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN)
+#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN) || PLATFORM(QT)
     bool RuntimeEnabledFeatures::isVideoTrackEnabled = true;
 #else

trunk/Source/WebCore/platform/qt/LocalizedStringsQt.cpp

@@ -730 +730 @@
 }
 
+#if ENABLE(VIDEO_TRACK)
+String textTrackSubtitlesText()
+{
+    notImplemented();
+    return String();
+}
+
+String textTrackOffText()
+{
+    notImplemented();
+    return String();
+}
+
+String textTrackNoLabelText()
+{
+    notImplemented();
+    return String();
+}
+#endif
+
 String snapshottedPlugInLabelTitle()
 {