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

Unified Diff: Source/core/platform/mediastream/MediaStreamCenter.cpp

Issue 16753003: Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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/MediaStreamCenter.cpp
diff --git a/Source/core/platform/mediastream/MediaStreamCenter.cpp b/Source/core/platform/mediastream/MediaStreamCenter.cpp
index f73f8db7acb67471d523b56e9d5550bd33d4baf8..a3476e17bca02c88b7181981728db06ca77fc797 100644
--- a/Source/core/platform/mediastream/MediaStreamCenter.cpp
+++ b/Source/core/platform/mediastream/MediaStreamCenter.cpp
@@ -30,10 +30,10 @@
*/
#include "config.h"
+
#include "core/platform/mediastream/MediaStreamCenter.h"
-#include "core/platform/chromium/support/WebMediaStreamClient.h"
-#include "public/platform/WebMediaStream.h"
+#include "core/platform/mediastream/MediaStreamDescriptor.h"
namespace WebCore {
@@ -45,13 +45,13 @@ MediaStreamCenter::~MediaStreamCenter()
{
}
-void MediaStreamCenter::endLocalMediaStream(WebKit::WebMediaStream webStream)
+void MediaStreamCenter::endLocalMediaStream(MediaStreamDescriptor* streamDescriptor)
{
- WebKit::WebMediaStreamClient* client = webStream.client();
+ MediaStreamDescriptorClient* client = streamDescriptor->client();
if (client)
client->streamEnded();
else
- webStream.setEnded();
+ streamDescriptor->setEnded();
}
} // namespace WebCore
« no previous file with comments | « Source/core/platform/mediastream/MediaStreamCenter.h ('k') | Source/core/platform/mediastream/MediaStreamComponent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698