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

Unified Diff: Source/WebCore/html/DOMURL.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
« no previous file with comments | « Source/WebCore/html/DOMURL.h ('k') | Source/WebCore/html/DOMURL.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/html/DOMURL.cpp
===================================================================
--- Source/WebCore/html/DOMURL.cpp (revision 125645)
+++ Source/WebCore/html/DOMURL.cpp (working copy)
@@ -42,11 +42,6 @@
#include <wtf/PassOwnPtr.h>
#include <wtf/MainThread.h>
-#if ENABLE(MEDIA_SOURCE)
-#include "MediaSource.h"
-#include "MediaSourceRegistry.h"
-#endif
-
#if ENABLE(MEDIA_STREAM)
#include "MediaStream.h"
#include "MediaStreamRegistry.h"
@@ -54,26 +49,6 @@
namespace WebCore {
-#if ENABLE(MEDIA_SOURCE)
-String DOMURL::createObjectURL(ScriptExecutionContext* scriptExecutionContext, MediaSource* source)
-{
- // Since WebWorkers cannot obtain MediaSource objects, we should be on the main thread.
- ASSERT(isMainThread());
-
- if (!scriptExecutionContext || !source)
- return String();
-
- KURL publicURL = BlobURL::createPublicURL(scriptExecutionContext->securityOrigin());
- if (publicURL.isEmpty())
- return String();
-
- MediaSourceRegistry::registry().registerMediaSourceURL(publicURL, source);
- scriptExecutionContext->publicURLManager().streamURLs().add(publicURL.string());
-
- return publicURL.string();
-}
-#endif
-
#if ENABLE(MEDIA_STREAM)
String DOMURL::createObjectURL(ScriptExecutionContext* scriptExecutionContext, MediaStream* stream)
{
« no previous file with comments | « Source/WebCore/html/DOMURL.h ('k') | Source/WebCore/html/DOMURL.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698