Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (157053 => 157054)
--- trunk/Source/WebCore/CMakeLists.txt 2013-10-07 18:58:51 UTC (rev 157053)
+++ trunk/Source/WebCore/CMakeLists.txt 2013-10-07 19:12:14 UTC (rev 157054)
@@ -178,10 +178,10 @@
Modules/indexeddb/IDBVersionChangeEvent.idl
Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl
+ Modules/mediasource/DOMURLMediaSource.idl
Modules/mediasource/MediaSource.idl
Modules/mediasource/SourceBuffer.idl
Modules/mediasource/SourceBufferList.idl
- Modules/mediasource/URLMediaSource.idl
Modules/mediasource/WebKitMediaSource.idl
Modules/mediasource/WebKitSourceBuffer.idl
Modules/mediasource/WebKitSourceBufferList.idl
Modified: trunk/Source/WebCore/ChangeLog (157053 => 157054)
--- trunk/Source/WebCore/ChangeLog 2013-10-07 18:58:51 UTC (rev 157053)
+++ trunk/Source/WebCore/ChangeLog 2013-10-07 19:12:14 UTC (rev 157054)
@@ -1,3 +1,29 @@
+2013-10-07 Jer Noble <jer.no...@apple.com>
+
+ URLMediaSource.idl and URLMediaStream.idl are wrong
+ https://bugs.webkit.org/show_bug.cgi?id=122301
+
+ Reviewed by Philippe Normand.
+
+ Rename URLMediaSource and URLMediaStream to DOMURLMediaSource and DOMURLMediaStream,
+ respectively.
+
+ Update the build files:
+ * CMakeLists.txt: Rename URL -> DOMURL.
+ * DerivedSources.make: Ditto.
+ * GNUmakefile.list.am: Ditto.
+ * WebCore.xcodeproj/project.pbxproj: Ditto.
+
+ Rename the .idl and implementation files:
+ * Modules/mediasource/DOMURLMediaSource.cpp: Renamed from Source/WebCore/Modules/mediasource/URLMediaSource.cpp.
+ (WebCore::DOMURLMediaSource::createObjectURL):
+ * Modules/mediasource/DOMURLMediaSource.h: Renamed from Source/WebCore/Modules/mediasource/URLMediaSource.h.
+ * Modules/mediasource/DOMURLMediaSource.idl: Renamed from Source/WebCore/Modules/mediasource/URLMediaSource.idl.
+ * Modules/mediastream/DOMURLMediaStream.cpp: Renamed from Source/WebCore/Modules/mediastream/URLMediaStream.cpp.
+ (WebCore::DOMURLMediaStream::createObjectURL):
+ * Modules/mediastream/DOMURLMediaStream.h: Renamed from Source/WebCore/Modules/mediastream/URLMediaStream.h.
+ * Modules/mediastream/DOMURLMediaStream.idl: Renamed from Source/WebCore/Modules/mediastream/URLMediaStream.idl.
+
2013-10-07 Philippe Normand <pnorm...@igalia.com>
Conditional support in bindings code generator for overloaded functions
Modified: trunk/Source/WebCore/DerivedSources.make (157053 => 157054)
--- trunk/Source/WebCore/DerivedSources.make 2013-10-07 18:58:51 UTC (rev 157053)
+++ trunk/Source/WebCore/DerivedSources.make 2013-10-07 19:12:14 UTC (rev 157054)
@@ -92,10 +92,10 @@
$(WebCore)/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl \
$(WebCore)/Modules/indieui/UIRequestEvent.idl \
$(WebCore)/Modules/mediacontrols/MediaControlsHost.idl \
+ $(WebCore)/Modules/mediasource/DOMURLMediaSource.idl \
$(WebCore)/Modules/mediasource/MediaSource.idl \
$(WebCore)/Modules/mediasource/SourceBuffer.idl \
$(WebCore)/Modules/mediasource/SourceBufferList.idl \
- $(WebCore)/Modules/mediasource/URLMediaSource.idl \
$(WebCore)/Modules/mediasource/WebKitMediaSource.idl \
$(WebCore)/Modules/mediasource/WebKitSourceBuffer.idl \
$(WebCore)/Modules/mediasource/WebKitSourceBufferList.idl \
Modified: trunk/Source/WebCore/GNUmakefile.list.am (157053 => 157054)
--- trunk/Source/WebCore/GNUmakefile.list.am 2013-10-07 18:58:51 UTC (rev 157053)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-10-07 19:12:14 UTC (rev 157054)
@@ -1179,10 +1179,10 @@
$(WebCore)/Modules/indexeddb/IDBTransaction.idl \
$(WebCore)/Modules/indexeddb/IDBVersionChangeEvent.idl \
$(WebCore)/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl \
+ $(WebCore)/Modules/mediasource/DOMURLMediaSource.idl \
$(WebCore)/Modules/mediasource/MediaSource.idl \
$(WebCore)/Modules/mediasource/SourceBuffer.idl \
$(WebCore)/Modules/mediasource/SourceBufferList.idl \
- $(WebCore)/Modules/mediasource/URLMediaSource.idl \
$(WebCore)/Modules/mediasource/WebKitMediaSource.idl \
$(WebCore)/Modules/mediasource/WebKitSourceBuffer.idl \
$(WebCore)/Modules/mediasource/WebKitSourceBufferList.idl \
@@ -1837,8 +1837,8 @@
Source/WebCore/Modules/mediasource/SourceBuffer.h \
Source/WebCore/Modules/mediasource/SourceBufferList.cpp \
Source/WebCore/Modules/mediasource/SourceBufferList.h \
- Source/WebCore/Modules/mediasource/URLMediaSource.cpp \
- Source/WebCore/Modules/mediasource/URLMediaSource.h \
+ Source/WebCore/Modules/mediasource/DOMURLMediaSource.cpp \
+ Source/WebCore/Modules/mediasource/DOMURLMediaSource.h \
Source/WebCore/Modules/mediasource/WebKitMediaSource.cpp \
Source/WebCore/Modules/mediasource/WebKitMediaSource.h \
Source/WebCore/Modules/mediasource/WebKitSourceBuffer.cpp \
Copied: trunk/Source/WebCore/Modules/mediasource/DOMURLMediaSource.cpp (from rev 157048, trunk/Source/WebCore/Modules/mediasource/URLMediaSource.cpp) (0 => 157054)
--- trunk/Source/WebCore/Modules/mediasource/DOMURLMediaSource.cpp (rev 0)
+++ trunk/Source/WebCore/Modules/mediasource/DOMURLMediaSource.cpp 2013-10-07 19:12:14 UTC (rev 157054)
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2013 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 "DOMURLMediaSource.h"
+
+#if ENABLE(MEDIA_SOURCE)
+
+#include "DOMURL.h"
+#include "MediaSourceBase.h"
+#include <wtf/MainThread.h>
+
+namespace WebCore {
+
+String DOMURLMediaSource::createObjectURL(ScriptExecutionContext* scriptExecutionContext, MediaSourceBase* source)
+{
+ // Since WebWorkers cannot obtain MediaSource objects, we should be on the main thread.
+ ASSERT(isMainThread());
+
+ if (!scriptExecutionContext || !source)
+ return String();
+ return DOMURL::createPublicURL(scriptExecutionContext, source);
+}
+
+} // namespace WebCore
+
+#endif
Copied: trunk/Source/WebCore/Modules/mediasource/DOMURLMediaSource.h (from rev 157048, trunk/Source/WebCore/Modules/mediasource/URLMediaSource.h) (0 => 157054)
--- trunk/Source/WebCore/Modules/mediasource/DOMURLMediaSource.h (rev 0)
+++ trunk/Source/WebCore/Modules/mediasource/DOMURLMediaSource.h 2013-10-07 19:12:14 UTC (rev 157054)
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2013 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.
+ */
+
+#ifndef DOMURLMediaSource_h
+#define DOMURLMediaSource_h
+
+#if ENABLE(MEDIA_SOURCE)
+
+#include <wtf/Forward.h>
+
+namespace WebCore {
+
+class MediaSourceBase;
+class ScriptExecutionContext;
+
+class DOMURLMediaSource {
+public:
+ static String createObjectURL(ScriptExecutionContext*, MediaSourceBase*);
+};
+
+} // namespace WebCore
+
+#endif
+
+#endif
Copied: trunk/Source/WebCore/Modules/mediasource/DOMURLMediaSource.idl (from rev 157048, trunk/Source/WebCore/Modules/mediasource/URLMediaSource.idl) (0 => 157054)
--- trunk/Source/WebCore/Modules/mediasource/DOMURLMediaSource.idl (rev 0)
+++ trunk/Source/WebCore/Modules/mediasource/DOMURLMediaSource.idl 2013-10-07 19:12:14 UTC (rev 157054)
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2013 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.
+ */
+[
+ Conditional=MEDIA_SOURCE
+]
+partial interface DOMURL {
+ [CallWith=ScriptExecutionContext,TreatReturnedNullStringAs=Null] static DOMString createObjectURL(MediaSource? source);
+ [CallWith=ScriptExecutionContext,TreatReturnedNullStringAs=Null] static DOMString createObjectURL(WebKitMediaSource? source);
+};
Deleted: trunk/Source/WebCore/Modules/mediasource/URLMediaSource.cpp (157053 => 157054)
--- trunk/Source/WebCore/Modules/mediasource/URLMediaSource.cpp 2013-10-07 18:58:51 UTC (rev 157053)
+++ trunk/Source/WebCore/Modules/mediasource/URLMediaSource.cpp 2013-10-07 19:12:14 UTC (rev 157054)
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2013 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 "URLMediaSource.h"
-
-#if ENABLE(MEDIA_SOURCE)
-
-#include "DOMURL.h"
-#include "MediaSourceBase.h"
-#include <wtf/MainThread.h>
-
-namespace WebCore {
-
-String URLMediaSource::createObjectURL(ScriptExecutionContext* scriptExecutionContext, MediaSourceBase* source)
-{
- // Since WebWorkers cannot obtain MediaSource objects, we should be on the main thread.
- ASSERT(isMainThread());
-
- if (!scriptExecutionContext || !source)
- return String();
- return DOMURL::createPublicURL(scriptExecutionContext, source);
-}
-
-} // namespace WebCore
-
-#endif
Deleted: trunk/Source/WebCore/Modules/mediasource/URLMediaSource.h (157053 => 157054)
--- trunk/Source/WebCore/Modules/mediasource/URLMediaSource.h 2013-10-07 18:58:51 UTC (rev 157053)
+++ trunk/Source/WebCore/Modules/mediasource/URLMediaSource.h 2013-10-07 19:12:14 UTC (rev 157054)
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- */
-
-#ifndef URLMediaSource_h
-#define URLMediaSource_h
-
-#if ENABLE(MEDIA_SOURCE)
-
-#include <wtf/Forward.h>
-
-namespace WebCore {
-
-class MediaSourceBase;
-class ScriptExecutionContext;
-
-class URLMediaSource {
-public:
- static String createObjectURL(ScriptExecutionContext*, MediaSourceBase*);
-};
-
-} // namespace WebCore
-
-#endif
-
-#endif
Deleted: trunk/Source/WebCore/Modules/mediasource/URLMediaSource.idl (157053 => 157054)
--- trunk/Source/WebCore/Modules/mediasource/URLMediaSource.idl 2013-10-07 18:58:51 UTC (rev 157053)
+++ trunk/Source/WebCore/Modules/mediasource/URLMediaSource.idl 2013-10-07 19:12:14 UTC (rev 157054)
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- */
-[
- Conditional=MEDIA_SOURCE
-]
-partial interface URL {
- [CallWith=ScriptExecutionContext,TreatReturnedNullStringAs=Null] static DOMString createObjectURL(MediaSource? source);
- [CallWith=ScriptExecutionContext,TreatReturnedNullStringAs=Null] static DOMString createObjectURL(WebKitMediaSource? source);
-};
Copied: trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.cpp (from rev 157048, trunk/Source/WebCore/Modules/mediastream/URLMediaStream.cpp) (0 => 157054)
--- trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.cpp (rev 0)
+++ trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.cpp 2013-10-07 19:12:14 UTC (rev 157054)
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2013 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"
+
+#if ENABLE(MEDIA_STREAM)
+
+#include "DOMURLMediaStream.h"
+
+#include "DOMURL.h"
+#include "MediaStream.h"
+#include <wtf/MainThread.h>
+
+namespace WebCore {
+
+String DOMURLMediaStream::createObjectURL(ScriptExecutionContext* scriptExecutionContext, MediaStream* stream)
+{
+ // Since WebWorkers cannot obtain Stream objects, we should be on the main thread.
+ ASSERT(isMainThread());
+
+ if (!scriptExecutionContext || !stream)
+ return String();
+ return DOMURL::createPublicURL(scriptExecutionContext, stream);
+}
+
+
+} // namespace WebCore
+
+#endif // ENABLE(MEDIA_STREAM)
Copied: trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.h (from rev 157048, trunk/Source/WebCore/Modules/mediastream/URLMediaStream.h) (0 => 157054)
--- trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.h (rev 0)
+++ trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.h 2013-10-07 19:12:14 UTC (rev 157054)
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2013 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.
+ */
+
+#ifndef DOMURLMediaStream_h
+#define DOMURLMediaStream_h
+
+#if ENABLE(MEDIA_STREAM)
+
+#include <wtf/Forward.h>
+
+namespace WebCore {
+
+class MediaStream;
+class ScriptExecutionContext;
+
+class DOMURLMediaStream {
+public:
+ static String createObjectURL(ScriptExecutionContext*, MediaStream*);
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(MEDIA_STREAM)
+
+#endif // URLMediaStream_h
Copied: trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.idl (from rev 157048, trunk/Source/WebCore/Modules/mediastream/URLMediaStream.idl) (0 => 157054)
--- trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.idl (rev 0)
+++ trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.idl 2013-10-07 19:12:14 UTC (rev 157054)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2013 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.
+ */
+[
+ Conditional=MEDIA_STREAM
+]
+partial interface DOMURL {
+ [CallWith=ScriptExecutionContext,TreatReturnedNullStringAs=Null] static DOMString createObjectURL(MediaStream? stream);
+};
Deleted: trunk/Source/WebCore/Modules/mediastream/URLMediaStream.cpp (157053 => 157054)
--- trunk/Source/WebCore/Modules/mediastream/URLMediaStream.cpp 2013-10-07 18:58:51 UTC (rev 157053)
+++ trunk/Source/WebCore/Modules/mediastream/URLMediaStream.cpp 2013-10-07 19:12:14 UTC (rev 157054)
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2013 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"
-
-#if ENABLE(MEDIA_STREAM)
-
-#include "URLMediaStream.h"
-
-#include "DOMURL.h"
-#include "MediaStream.h"
-#include <wtf/MainThread.h>
-
-namespace WebCore {
-
-String URLMediaStream::createObjectURL(ScriptExecutionContext* scriptExecutionContext, MediaStream* stream)
-{
- // Since WebWorkers cannot obtain Stream objects, we should be on the main thread.
- ASSERT(isMainThread());
-
- if (!scriptExecutionContext || !stream)
- return String();
- return DOMURL::createPublicURL(scriptExecutionContext, stream);
-}
-
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
Deleted: trunk/Source/WebCore/Modules/mediastream/URLMediaStream.h (157053 => 157054)
--- trunk/Source/WebCore/Modules/mediastream/URLMediaStream.h 2013-10-07 18:58:51 UTC (rev 157053)
+++ trunk/Source/WebCore/Modules/mediastream/URLMediaStream.h 2013-10-07 19:12:14 UTC (rev 157054)
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- */
-
-#ifndef URLMediaStream_h
-#define URLMediaStream_h
-
-#if ENABLE(MEDIA_STREAM)
-
-#include <wtf/Forward.h>
-
-namespace WebCore {
-
-class MediaStream;
-class ScriptExecutionContext;
-
-class URLMediaStream {
-public:
- static String createObjectURL(ScriptExecutionContext*, MediaStream*);
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
-
-#endif // URLMediaStream_h
Deleted: trunk/Source/WebCore/Modules/mediastream/URLMediaStream.idl (157053 => 157054)
--- trunk/Source/WebCore/Modules/mediastream/URLMediaStream.idl 2013-10-07 18:58:51 UTC (rev 157053)
+++ trunk/Source/WebCore/Modules/mediastream/URLMediaStream.idl 2013-10-07 19:12:14 UTC (rev 157054)
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- */
-partial interface URL {
- [CallWith=ScriptExecutionContext,TreatReturnedNullStringAs=Null] static DOMString createObjectURL(MediaStream? stream);
-};
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (157053 => 157054)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-10-07 18:58:51 UTC (rev 157053)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-10-07 19:12:14 UTC (rev 157054)
@@ -5289,8 +5289,8 @@
CD9DE17B17AAC75B00EA386D /* JSSourceBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = CD9DE17717AAC75B00EA386D /* JSSourceBuffer.h */; };
CD9DE17C17AAC75B00EA386D /* JSSourceBufferList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD9DE17817AAC75B00EA386D /* JSSourceBufferList.cpp */; };
CD9DE17D17AAC75B00EA386D /* JSSourceBufferList.h in Headers */ = {isa = PBXBuildFile; fileRef = CD9DE17917AAC75B00EA386D /* JSSourceBufferList.h */; };
- CD9DE18117AAD6A400EA386D /* URLMediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD9DE17E17AAD64E00EA386D /* URLMediaSource.cpp */; };
- CD9DE18217AAD6A400EA386D /* URLMediaSource.h in Headers */ = {isa = PBXBuildFile; fileRef = CD9DE17F17AAD64E00EA386D /* URLMediaSource.h */; };
+ CD9DE18117AAD6A400EA386D /* DOMURLMediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD9DE17E17AAD64E00EA386D /* DOMURLMediaSource.cpp */; };
+ CD9DE18217AAD6A400EA386D /* DOMURLMediaSource.h in Headers */ = {isa = PBXBuildFile; fileRef = CD9DE17F17AAD64E00EA386D /* DOMURLMediaSource.h */; };
CD9DE18517AB0CF300EA386D /* HTMLMediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD9DE18317AB0CF300EA386D /* HTMLMediaSource.cpp */; };
CD9DE18617AB0CF300EA386D /* HTMLMediaSource.h in Headers */ = {isa = PBXBuildFile; fileRef = CD9DE18417AB0CF300EA386D /* HTMLMediaSource.h */; };
CDA79824170A258300D45C55 /* AudioSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA79823170A258300D45C55 /* AudioSession.cpp */; };
@@ -12161,9 +12161,9 @@
CD9DE17717AAC75B00EA386D /* JSSourceBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSourceBuffer.h; sourceTree = "<group>"; };
CD9DE17817AAC75B00EA386D /* JSSourceBufferList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSourceBufferList.cpp; sourceTree = "<group>"; };
CD9DE17917AAC75B00EA386D /* JSSourceBufferList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSourceBufferList.h; sourceTree = "<group>"; };
- CD9DE17E17AAD64E00EA386D /* URLMediaSource.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = URLMediaSource.cpp; sourceTree = "<group>"; };
- CD9DE17F17AAD64E00EA386D /* URLMediaSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = URLMediaSource.h; sourceTree = "<group>"; };
- CD9DE18017AAD64E00EA386D /* URLMediaSource.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = URLMediaSource.idl; sourceTree = "<group>"; };
+ CD9DE17E17AAD64E00EA386D /* DOMURLMediaSource.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DOMURLMediaSource.cpp; sourceTree = "<group>"; };
+ CD9DE17F17AAD64E00EA386D /* DOMURLMediaSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DOMURLMediaSource.h; sourceTree = "<group>"; };
+ CD9DE18017AAD64E00EA386D /* DOMURLMediaSource.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = DOMURLMediaSource.idl; sourceTree = "<group>"; };
CD9DE18317AB0CF300EA386D /* HTMLMediaSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLMediaSource.cpp; sourceTree = "<group>"; };
CD9DE18417AB0CF300EA386D /* HTMLMediaSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLMediaSource.h; sourceTree = "<group>"; };
CDA79821170A22DC00D45C55 /* AudioSession.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AudioSession.h; sourceTree = "<group>"; };
@@ -17999,6 +17999,9 @@
B1A942DD15B5CE2200D525D1 /* mediasource */ = {
isa = PBXGroup;
children = (
+ CD9DE17E17AAD64E00EA386D /* DOMURLMediaSource.cpp */,
+ CD9DE17F17AAD64E00EA386D /* DOMURLMediaSource.h */,
+ CD9DE18017AAD64E00EA386D /* DOMURLMediaSource.idl */,
CD3A495517A9D01B00274E42 /* MediaSource.cpp */,
CD3A495617A9D01B00274E42 /* MediaSource.h */,
CD3A495717A9D01B00274E42 /* MediaSource.idl */,
@@ -18012,9 +18015,6 @@
CD3A495B17A9D01B00274E42 /* SourceBufferList.cpp */,
CD3A495C17A9D01B00274E42 /* SourceBufferList.h */,
CD3A495D17A9D01B00274E42 /* SourceBufferList.idl */,
- CD9DE17E17AAD64E00EA386D /* URLMediaSource.cpp */,
- CD9DE17F17AAD64E00EA386D /* URLMediaSource.h */,
- CD9DE18017AAD64E00EA386D /* URLMediaSource.idl */,
B1A942DE15B5CE2200D525D1 /* WebKitMediaSource.cpp */,
B1A942DF15B5CE2200D525D1 /* WebKitMediaSource.h */,
B1A942E015B5CE2200D525D1 /* WebKitMediaSource.idl */,
@@ -21982,7 +21982,7 @@
85BA4D150AA688680088052D /* DOMHTMLOListElement.h in Headers */,
85E711BE0AC5D5350053270F /* DOMHTMLOListElementInternal.h in Headers */,
85F32AEE0AA63B8700FF3184 /* DOMHTMLOptGroupElement.h in Headers */,
- CD9DE18217AAD6A400EA386D /* URLMediaSource.h in Headers */,
+ CD9DE18217AAD6A400EA386D /* DOMURLMediaSource.h in Headers */,
85E711BF0AC5D5350053270F /* DOMHTMLOptGroupElementInternal.h in Headers */,
8540756B0AD6CBF900620C57 /* DOMHTMLOptionElement.h in Headers */,
8540756D0AD6CBF900620C57 /* DOMHTMLOptionElementInternal.h in Headers */,
@@ -27303,7 +27303,7 @@
93F19A9D08245E59001E9ABC /* TextResourceDecoder.cpp in Sources */,
376DCCE113B4F966002EBEFC /* TextRun.cpp in Sources */,
B2C3DA4A0D006C1D00EF6F26 /* TextStream.cpp in Sources */,
- CD9DE18117AAD6A400EA386D /* URLMediaSource.cpp in Sources */,
+ CD9DE18117AAD6A400EA386D /* DOMURLMediaSource.cpp in Sources */,
9759E93F14EF1CF80026A2DD /* TextTrack.cpp in Sources */,
9759E94214EF1CF80026A2DD /* TextTrackCue.cpp in Sources */,
071A9EC2168FBC43002629F9 /* TextTrackCueGeneric.cpp in Sources */,
