Title: [149544] trunk/Source/WebCore
- Revision
- 149544
- Author
- [email protected]
- Date
- 2013-05-03 16:44:41 -0700 (Fri, 03 May 2013)
Log Message
[Qt] Build with --video-track fails because String(AtomicString) is ambiguous
https://bugs.webkit.org/show_bug.cgi?id=115551
Patch by Brendan Long <[email protected]> on 2013-05-03
Reviewed by Benjamin Poulain.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::configureTextTrackGroup):
Change String(textTrack->kind()) to textTrack->kind().string(), and same thing with language.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149543 => 149544)
--- trunk/Source/WebCore/ChangeLog 2013-05-03 23:12:05 UTC (rev 149543)
+++ trunk/Source/WebCore/ChangeLog 2013-05-03 23:44:41 UTC (rev 149544)
@@ -1,3 +1,14 @@
+2013-05-03 Brendan Long <[email protected]>
+
+ [Qt] Build with --video-track fails because String(AtomicString) is ambiguous
+ https://bugs.webkit.org/show_bug.cgi?id=115551
+
+ Reviewed by Benjamin Poulain.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::configureTextTrackGroup):
+ Change String(textTrack->kind()) to textTrack->kind().string(), and same thing with language.
+
2013-05-03 Xabier Rodriguez Calvar <[email protected]>
[GStreamer] GStreamer log crashes in MediaPlayerPrivateGStreamerBase because of uninitialized category
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (149543 => 149544)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-05-03 23:12:05 UTC (rev 149543)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-05-03 23:44:41 UTC (rev 149544)
@@ -3207,7 +3207,7 @@
currentlyEnabledTracks.append(textTrack);
int trackScore = captionPreferences ? captionPreferences->textTrackSelectionScore(textTrack.get(), this) : 0;
- LOG(Media, "HTMLMediaElement::configureTextTrackGroup - '%s' track with language '%s' has score %i", String(textTrack->kind()).utf8().data(), String(textTrack->language()).utf8().data(), trackScore);
+ LOG(Media, "HTMLMediaElement::configureTextTrackGroup - '%s' track with language '%s' has score %i", textTrack->kind().string().utf8().data(), textTrack->language().string().utf8().data(), trackScore);
if (trackScore) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
