Changeset 149544 in webkit

Timestamp:

May 3, 2013 4:44:41 PM (11 years ago)

Author:

commit-queue@webkit.org

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 <​b.long@cablelabs.com> 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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-03  Brendan Long  <b.long@cablelabs.com>
+
+        [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  <calvaris@igalia.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -3208 +3208 @@
 
         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) {