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

Unified Diff: content/renderer/media/media_stream_impl.cc

Issue 11066101: Tentatively turn on WebMediaPlayerMS by default. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: use static function to check if url is media stream Created 8 years, 2 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
« no previous file with comments | « content/renderer/media/media_stream_impl.h ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/media_stream_impl.cc
===================================================================
--- content/renderer/media/media_stream_impl.cc (revision 161195)
+++ content/renderer/media/media_stream_impl.cc (working copy)
@@ -146,9 +146,14 @@
}
bool MediaStreamImpl::IsMediaStream(const GURL& url) {
- DCHECK(CalledOnValidThread());
- WebKit::WebMediaStreamDescriptor descriptor(GetMediaStream(url));
+ return CheckMediaStream(url);
+}
+// static
+bool MediaStreamImpl::CheckMediaStream(const GURL& url) {
+ WebKit::WebMediaStreamDescriptor descriptor(
+ WebKit::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url));
+
if (descriptor.isNull() || !descriptor.extraData())
return false; // This is not a valid stream.
« no previous file with comments | « content/renderer/media/media_stream_impl.h ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698