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

Unified Diff: Source/modules/mediastream/MediaStreamRegistry.cpp

Issue 650063002: Move MediaStream and MediaStreamTrack implementation from modules/mediastream to core/mediastream. Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased. Created 6 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 | « Source/modules/mediastream/MediaStreamRegistry.h ('k') | Source/modules/mediastream/MediaStreamTrack.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/mediastream/MediaStreamRegistry.cpp
diff --git a/Source/modules/mediastream/MediaStreamRegistry.cpp b/Source/modules/mediastream/MediaStreamRegistry.cpp
deleted file mode 100644
index e01af348d505dca0b3a431fd507aac22db78abac..0000000000000000000000000000000000000000
--- a/Source/modules/mediastream/MediaStreamRegistry.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "modules/mediastream/MediaStreamRegistry.h"
-
-#include "core/html/HTMLMediaElement.h"
-#include "modules/mediastream/MediaStream.h"
-#include "platform/weborigin/KURL.h"
-#include "wtf/MainThread.h"
-
-namespace blink {
-
-MediaStreamRegistry& MediaStreamRegistry::registry()
-{
- // Since WebWorkers cannot obtain MediaStream objects, we should be on the main thread.
- ASSERT(isMainThread());
- DEFINE_STATIC_LOCAL(MediaStreamRegistry, instance, ());
- return instance;
-}
-
-void MediaStreamRegistry::registerURL(SecurityOrigin*, const KURL& url, URLRegistrable* stream)
-{
- ASSERT(&stream->registry() == this);
- ASSERT(isMainThread());
- m_streamDescriptors.set(url.string(), static_cast<MediaStream*>(stream)->descriptor());
-}
-
-void MediaStreamRegistry::unregisterURL(const KURL& url)
-{
- ASSERT(isMainThread());
- m_streamDescriptors.remove(url.string());
-}
-
-bool MediaStreamRegistry::contains(const String& url)
-{
- ASSERT(isMainThread());
- return m_streamDescriptors.contains(url);
-}
-
-MediaStreamDescriptor* MediaStreamRegistry::lookupMediaStreamDescriptor(const String& url)
-{
- ASSERT(isMainThread());
- return m_streamDescriptors.get(url);
-}
-
-MediaStreamRegistry::MediaStreamRegistry()
-{
- HTMLMediaElement::setMediaStreamRegistry(this);
-}
-
-} // namespace blink
« no previous file with comments | « Source/modules/mediastream/MediaStreamRegistry.h ('k') | Source/modules/mediastream/MediaStreamTrack.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698