[BlackBerry] MediaPlayerPrivate: fix call to MediaStreamDescriptor::label()
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 12 Mar 2013 15:21:16 +0000 (15:21 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 12 Mar 2013 15:21:16 +0000 (15:21 +0000)
https://bugs.webkit.org/show_bug.cgi?id=112140

Patch by Alberto Garcia <agarcia@igalia.com> on 2013-03-12
Reviewed by Rob Buis.

MediaStreamDescriptor::id() was renamed to MediaStreamDescriptor::label() in r139352.

* platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp:
(WebCore::toWebMediaStreamDescriptor):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@145549 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp

index 7e85f0c..05d9d59 100644 (file)
@@ -1,3 +1,15 @@
+2013-03-12  Alberto Garcia  <agarcia@igalia.com>
+
+        [BlackBerry] MediaPlayerPrivate: fix call to MediaStreamDescriptor::label()
+        https://bugs.webkit.org/show_bug.cgi?id=112140
+
+        Reviewed by Rob Buis.
+
+        MediaStreamDescriptor::id() was renamed to MediaStreamDescriptor::label() in r139352.
+
+        * platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp:
+        (WebCore::toWebMediaStreamDescriptor):
+
 2013-03-12  Eugene Klyuchnikov  <eustas@chromium.org>
 
         Web Inspector: [REGRESSION] StepInto (F11) and StepOut (Shift-F11) shortcuts toggle Inspector window full-screen state
index 7f6a078..2cc1bb6 100644 (file)
@@ -798,7 +798,7 @@ static WebMediaStreamDescriptor toWebMediaStreamDescriptor(MediaStreamDescriptor
     for (size_t i = 0; i < d->numberOfVideoComponents(); i++)
         videoSources.push_back(toWebMediaStreamSource(d->videoComponent(i)->source()));
 
-    return WebMediaStreamDescriptor(d->label().utf8().data(), audioSources, videoSources);
+    return WebMediaStreamDescriptor(d->id().utf8().data(), audioSources, videoSources);
 }
 
 WebMediaStreamDescriptor MediaPlayerPrivate::lookupMediaStream(const BlackBerry::Platform::String& url)