Title: [125645] branches/chromium/1229/Source/WebCore/html
- Revision
- 125645
- Author
- ann...@chromium.org
- Date
- 2012-08-14 21:22:23 -0700 (Tue, 14 Aug 2012)
Log Message
Revert 124798 - 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):
TBR=ann...@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10836255
Modified Paths
Diff
Modified: branches/chromium/1229/Source/WebCore/html/DOMURL.cpp (125644 => 125645)
--- branches/chromium/1229/Source/WebCore/html/DOMURL.cpp 2012-08-15 04:02:17 UTC (rev 125644)
+++ branches/chromium/1229/Source/WebCore/html/DOMURL.cpp 2012-08-15 04:22:23 UTC (rev 125645)
@@ -68,7 +68,7 @@
return String();
MediaSourceRegistry::registry().registerMediaSourceURL(publicURL, source);
- scriptExecutionContext->publicURLManager().sourceURLs().add(publicURL.string());
+ scriptExecutionContext->publicURLManager().streamURLs().add(publicURL.string());
return publicURL.string();
}
Modified: branches/chromium/1229/Source/WebCore/html/PublicURLManager.h (125644 => 125645)
--- branches/chromium/1229/Source/WebCore/html/PublicURLManager.h 2012-08-15 04:02:17 UTC (rev 125644)
+++ branches/chromium/1229/Source/WebCore/html/PublicURLManager.h 2012-08-15 04:22:23 UTC (rev 125645)
@@ -37,11 +37,6 @@
#include "MediaStreamRegistry.h"
#endif
-#if ENABLE(MEDIA_SOURCE)
-#include "MediaSource.h"
-#include "MediaSourceRegistry.h"
-#endif
-
namespace WebCore {
class ScriptExecutionContext;
@@ -61,29 +56,18 @@
for (HashSet<String>::iterator iter = m_streamURLs.begin(); iter != streamURLsEnd; ++iter)
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
}
HashSet<String>& blobURLs() { return m_blobURLs; }
#if ENABLE(MEDIA_STREAM)
HashSet<String>& streamURLs() { return m_streamURLs; }
#endif
-#if ENABLE(MEDIA_SOURCE)
- HashSet<String>& sourceURLs() { return m_sourceURLs; }
-#endif
private:
HashSet<String> m_blobURLs;
#if ENABLE(MEDIA_STREAM)
HashSet<String> m_streamURLs;
#endif
-#if ENABLE(MEDIA_SOURCE)
- HashSet<String> m_sourceURLs;
-#endif
};
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
