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

Unified Diff: Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp

Issue 10834324: Revert 124780 - Create a MediaSource object. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/
Patch Set: Created 8 years, 4 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/WebCore/Modules/mediasource/MediaSourceRegistry.cpp
===================================================================
--- Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp (revision 125645)
+++ Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp (working copy)
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2012 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER OR 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 "MediaSourceRegistry.h"
-
-#if ENABLE(MEDIA_SOURCE)
-
-#include "KURL.h"
-#include "MediaSource.h"
-#include <wtf/MainThread.h>
-
-namespace WebCore {
-
-MediaSourceRegistry& MediaSourceRegistry::registry()
-{
- // Since WebWorkers cannot obtain MediaSource objects, we should be on the main thread.
- ASSERT(isMainThread());
- DEFINE_STATIC_LOCAL(MediaSourceRegistry, instance, ());
- return instance;
-}
-
-void MediaSourceRegistry::registerMediaSourceURL(const KURL& url, PassRefPtr<MediaSource> source)
-{
- ASSERT(isMainThread());
- m_mediaSources.set(url.string(), source);
-}
-
-void MediaSourceRegistry::unregisterMediaSourceURL(const KURL& url)
-{
- ASSERT(isMainThread());
- m_mediaSources.remove(url.string());
-}
-
-MediaSource* MediaSourceRegistry::lookupMediaSource(const String& url)
-{
- ASSERT(isMainThread());
- return m_mediaSources.get(url).get();
-}
-
-} // namespace WebCore
-
-#endif
« no previous file with comments | « Source/WebCore/Modules/mediasource/MediaSourceRegistry.h ('k') | Source/WebCore/Modules/mediasource/SourceBuffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698