Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(441)

Unified Diff: Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp

Issue 15796004: [MediaStream API] Adding MediaStreamTrack::getSourceInfos (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed review comments and merge Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp
diff --git a/Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp b/Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp
index 988cdfe4be965627be3c43cfe9c69f7e6278c6f2..8dc3b085b344c386bf5134c53f89795af861d55f 100644
--- a/Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp
+++ b/Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp
@@ -39,8 +39,8 @@
#include "public/platform/WebMediaStreamCenter.h"
#include "public/platform/WebMediaStreamSourcesRequest.h"
#include "public/platform/WebMediaStreamTrack.h"
-#include <wtf/MainThread.h>
-#include <wtf/PassOwnPtr.h>
+#include "wtf/MainThread.h"
+#include "wtf/PassOwnPtr.h"
namespace WebCore {
@@ -70,6 +70,11 @@ void MediaStreamCenterChromium::queryMediaStreamSources(PassRefPtr<MediaStreamSo
}
}
+bool MediaStreamCenterChromium::getSourceInfos(const String& url, WebKit::WebVector<WebKit::WebSourceInfo>& sourceInfos)
+{
+ return m_private && m_private->getSourceInfos(url, sourceInfos);
+}
+
void MediaStreamCenterChromium::didSetMediaStreamTrackEnabled(MediaStreamDescriptor* stream, MediaStreamComponent* component)
{
if (m_private) {
@@ -82,12 +87,12 @@ void MediaStreamCenterChromium::didSetMediaStreamTrackEnabled(MediaStreamDescrip
bool MediaStreamCenterChromium::didAddMediaStreamTrack(MediaStreamDescriptor* stream, MediaStreamComponent* component)
{
- return m_private ? m_private->didAddMediaStreamTrack(stream, component) : false;
+ return m_private && m_private->didAddMediaStreamTrack(stream, component);
}
bool MediaStreamCenterChromium::didRemoveMediaStreamTrack(MediaStreamDescriptor* stream, MediaStreamComponent* component)
{
- return m_private ? m_private->didRemoveMediaStreamTrack(stream, component) : false;
+ return m_private && m_private->didRemoveMediaStreamTrack(stream, component);
}
void MediaStreamCenterChromium::didStopLocalMediaStream(MediaStreamDescriptor* stream)
« no previous file with comments | « Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.h ('k') | Source/modules/mediastream/MediaStreamTrack.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698