Title: [147917] trunk/Source/WebCore
- Revision
- 147917
- Author
- [email protected]
- Date
- 2013-04-08 09:13:47 -0700 (Mon, 08 Apr 2013)
Log Message
[Qt] Enable text tracks from track elements
https://bugs.webkit.org/show_bug.cgi?id=113522
Patch by Brendan Long <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (147916 => 147917)
--- trunk/Source/WebCore/ChangeLog 2013-04-08 16:05:52 UTC (rev 147916)
+++ trunk/Source/WebCore/ChangeLog 2013-04-08 16:13:47 UTC (rev 147917)
@@ -1,3 +1,21 @@
+2013-04-08 Brendan Long <[email protected]>
+
+ [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 <[email protected]>
[GTK] Toggle OverWrite mode when pressing the Insert key
Modified: trunk/Source/WebCore/Target.pri (147916 => 147917)
--- trunk/Source/WebCore/Target.pri 2013-04-08 16:05:52 UTC (rev 147916)
+++ trunk/Source/WebCore/Target.pri 2013-04-08 16:13:47 UTC (rev 147917)
@@ -1050,7 +1050,6 @@
platform/graphics/surfaces/qt/GraphicsSurfaceQt.cpp \
platform/graphics/SurrogatePairAwareTextIterator.cpp \
platform/graphics/TextRun.cpp \
- platform/graphics/TextTrackRepresentation.cpp \
platform/graphics/TiledBackingStore.cpp \
platform/graphics/transforms/AffineTransform.cpp \
platform/graphics/transforms/TransformationMatrix.cpp \
@@ -1260,7 +1259,6 @@
rendering/RenderTextControlMultiLine.cpp \
rendering/RenderTextControlSingleLine.cpp \
rendering/RenderTextFragment.cpp \
- rendering/RenderTextTrackCue.cpp \
rendering/RenderTheme.cpp \
rendering/RenderTreeAsText.cpp \
rendering/RenderView.cpp \
@@ -1914,7 +1912,6 @@
html/HTMLTextAreaElement.h \
html/HTMLTextFormControlElement.h \
html/HTMLTitleElement.h \
- html/HTMLTrackElement.h \
html/HTMLUListElement.h \
html/HTMLVideoElement.h \
html/HTMLViewSourceDocument.h \
@@ -1967,18 +1964,6 @@
html/shadow/MediaControls.h \
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 \
inspector/ConsoleMessage.h \
@@ -2094,7 +2079,6 @@
loader/SubresourceLoader.h \
loader/SubstituteData.h \
loader/TextResourceDecoder.h \
- loader/TextTrackLoader.h \
loader/ThreadableLoader.h \
loader/WorkerThreadableLoader.h \
mathml/MathMLElement.h \
@@ -2265,8 +2249,6 @@
platform/graphics/Image.h \
platform/graphics/ImageOrientation.h \
platform/graphics/ImageSource.h \
- platform/graphics/InbandTextTrackPrivate.h \
- platform/graphics/InbandTextTrackPrivateClient.h \
platform/graphics/IntPoint.h \
platform/graphics/IntPointHash.h \
platform/graphics/IntRect.h \
@@ -3983,14 +3965,49 @@
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
}
enable?(WEB_SOCKETS) {
Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp (147916 => 147917)
--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp 2013-04-08 16:05:52 UTC (rev 147916)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp 2013-04-08 16:13:47 UTC (rev 147917)
@@ -178,7 +178,7 @@
#endif
#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
bool RuntimeEnabledFeatures::isVideoTrackEnabled = false;
Modified: trunk/Source/WebCore/platform/qt/LocalizedStringsQt.cpp (147916 => 147917)
--- trunk/Source/WebCore/platform/qt/LocalizedStringsQt.cpp 2013-04-08 16:05:52 UTC (rev 147916)
+++ trunk/Source/WebCore/platform/qt/LocalizedStringsQt.cpp 2013-04-08 16:13:47 UTC (rev 147917)
@@ -729,6 +729,26 @@
return validationMessageTypeMismatchText();
}
+#if ENABLE(VIDEO_TRACK)
+String textTrackSubtitlesText()
+{
+ notImplemented();
+ return String();
+}
+
+String textTrackOffText()
+{
+ notImplemented();
+ return String();
+}
+
+String textTrackNoLabelText()
+{
+ notImplemented();
+ return String();
+}
+#endif
+
String snapshottedPlugInLabelTitle()
{
notImplemented();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
