Changeset 124798 in webkit

Timestamp:

Aug 6, 2012 1:41:20 PM (12 years ago)

Author:

annacc@chromium.org

Message:

MediaSource should use it's own list of source URLs
​https://bugs.webkit.org/show_bug.cgi?id=93285

Reviewed by Eric Carlson.

r124780 added MediaSource objects to PublicURLManager's streamURLs list,
piggy-backing on MEDIA_STREAM. This patch creates a sourceURLs list so
that MediaSource can stand on its own.

Test: builds on Andriod even when MEDIA_STREAM is disabled.

• html/DOMURL.cpp:

(WebCore::DOMURL::createObjectURL):

• html/PublicURLManager.h:

(WebCore::PublicURLManager::contextDestroyed):
(PublicURLManager):
(WebCore::PublicURLManager::sourceURLs):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/DOMURL.cpp (modified) (1 diff)
• html/PublicURLManager.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-06  Anna Cavender  <annacc@chromium.org>
+
+        MediaSource should use it's own list of source URLs
+        https://bugs.webkit.org/show_bug.cgi?id=93285
+
+        Reviewed by Eric Carlson.
+
+        r124780 added MediaSource objects to PublicURLManager's streamURLs list,
+        piggy-backing on MEDIA_STREAM.  This patch creates a sourceURLs list so
+        that MediaSource can stand on its own.
+
+        Test: builds on Andriod even when MEDIA_STREAM is disabled.
+
+        * html/DOMURL.cpp:
+        (WebCore::DOMURL::createObjectURL):
+        * html/PublicURLManager.h:
+        (WebCore::PublicURLManager::contextDestroyed):
+        (PublicURLManager):
+        (WebCore::PublicURLManager::sourceURLs):
+
 2012-08-06  Nico Weber  <thakis@chromium.org>
 

trunk/Source/WebCore/html/DOMURL.cpp

@@ -69 +69 @@
 
     MediaSourceRegistry::registry().registerMediaSourceURL(publicURL, source);
-    scriptExecutionContext->publicURLManager().streamURLs().add(publicURL.string());
+    scriptExecutionContext->publicURLManager().sourceURLs().add(publicURL.string());
 
     return publicURL.string();

trunk/Source/WebCore/html/PublicURLManager.h

@@ -38 +38 @@
 #endif
 
+#if ENABLE(MEDIA_SOURCE)
+#include "MediaSource.h"
+#include "MediaSourceRegistry.h"
+#endif
+
 namespace WebCore {
 
@@ -57 +62 @@
             MediaStreamRegistry::registry().unregisterMediaStreamURL(KURL(ParsedURLString, *iter));
 #endif
+#if ENABLE(MEDIA_SOURCE)
+        HashSet<String>::iterator sourceURLsEnd = m_sourceURLs.end();
+        for (HashSet<String>::iterator iter = m_sourceURLs.begin(); iter != sourceURLsEnd; ++iter)
+            MediaSourceRegistry::registry().unregisterMediaSourceURL(KURL(ParsedURLString, *iter));
+#endif
     }
 
@@ -62 +72 @@
 #if ENABLE(MEDIA_STREAM)
     HashSet<String>& streamURLs() { return m_streamURLs; }
+#endif
+#if ENABLE(MEDIA_SOURCE)
+    HashSet<String>& sourceURLs() { return m_sourceURLs; }
 #endif
 
@@ -69 +82 @@
     HashSet<String> m_streamURLs;
 #endif
+#if ENABLE(MEDIA_SOURCE)
+    HashSet<String> m_sourceURLs;
+#endif
 };