| Index: Source/WebCore/html/DOMURL.cpp
|
| diff --git a/Source/WebCore/html/DOMURL.cpp b/Source/WebCore/html/DOMURL.cpp
|
| index 47d823ec4bc4c02ac5da60040743f4ba886df1fb..2adafdfb03fcdb941e9516b562fa57d692f18ae0 100644
|
| --- a/Source/WebCore/html/DOMURL.cpp
|
| +++ b/Source/WebCore/html/DOMURL.cpp
|
| @@ -34,6 +34,8 @@
|
| #include "Blob.h"
|
| #include "BlobURL.h"
|
| #include "KURL.h"
|
| +#include "MediaSource.h"
|
| +#include "MediaSourceRegistry.h"
|
| #include "MemoryCache.h"
|
| #include "PublicURLManager.h"
|
| #include "ResourceRequest.h"
|
| @@ -43,11 +45,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"
|
| @@ -55,7 +52,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.
|
| @@ -73,7 +69,6 @@ String DOMURL::createObjectURL(ScriptExecutionContext* scriptExecutionContext, M
|
|
|
| return publicURL.string();
|
| }
|
| -#endif
|
|
|
| #if ENABLE(MEDIA_STREAM)
|
| String DOMURL::createObjectURL(ScriptExecutionContext* scriptExecutionContext, MediaStream* stream)
|
| @@ -128,13 +123,11 @@ void DOMURL::revokeObjectURL(ScriptExecutionContext* scriptExecutionContext, con
|
| blobURLs.remove(url.string());
|
| }
|
|
|
| -#if ENABLE(MEDIA_SOURCE)
|
| HashSet<String>& sourceURLs = scriptExecutionContext->publicURLManager().sourceURLs();
|
| if (sourceURLs.contains(url.string())) {
|
| MediaSourceRegistry::registry().unregisterMediaSourceURL(url);
|
| sourceURLs.remove(url.string());
|
| }
|
| -#endif
|
| #if ENABLE(MEDIA_STREAM)
|
| HashSet<String>& streamURLs = scriptExecutionContext->publicURLManager().streamURLs();
|
| if (streamURLs.contains(url.string())) {
|
|
|