Title: [124853] trunk/Source/WebCore
- Revision
- 124853
- Author
- commit-qu...@webkit.org
- Date
- 2012-08-06 22:58:49 -0700 (Mon, 06 Aug 2012)
Log Message
Unreviewed, rolling out r124798.
http://trac.webkit.org/changeset/124798
https://bugs.webkit.org/show_bug.cgi?id=93337
We don't want an incomplete feature set for the chromium
branch cut. (Requested by annacc on #webkit).
Patch by Sheriff Bot <webkit.review....@gmail.com> on 2012-08-06
* html/DOMURL.cpp:
(WebCore::DOMURL::createObjectURL):
* html/PublicURLManager.h:
(WebCore::PublicURLManager::contextDestroyed):
(PublicURLManager):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (124852 => 124853)
--- trunk/Source/WebCore/ChangeLog 2012-08-07 05:54:42 UTC (rev 124852)
+++ trunk/Source/WebCore/ChangeLog 2012-08-07 05:58:49 UTC (rev 124853)
@@ -1,5 +1,20 @@
2012-08-06 Sheriff Bot <webkit.review....@gmail.com>
+ Unreviewed, rolling out r124798.
+ http://trac.webkit.org/changeset/124798
+ https://bugs.webkit.org/show_bug.cgi?id=93337
+
+ We don't want an incomplete feature set for the chromium
+ branch cut. (Requested by annacc on #webkit).
+
+ * html/DOMURL.cpp:
+ (WebCore::DOMURL::createObjectURL):
+ * html/PublicURLManager.h:
+ (WebCore::PublicURLManager::contextDestroyed):
+ (PublicURLManager):
+
+2012-08-06 Sheriff Bot <webkit.review....@gmail.com>
+
Unreviewed, rolling out r124848.
http://trac.webkit.org/changeset/124848
https://bugs.webkit.org/show_bug.cgi?id=93336
Modified: trunk/Source/WebCore/html/DOMURL.cpp (124852 => 124853)
--- trunk/Source/WebCore/html/DOMURL.cpp 2012-08-07 05:54:42 UTC (rev 124852)
+++ trunk/Source/WebCore/html/DOMURL.cpp 2012-08-07 05:58:49 UTC (rev 124853)
@@ -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: trunk/Source/WebCore/html/PublicURLManager.h (124852 => 124853)
--- trunk/Source/WebCore/html/PublicURLManager.h 2012-08-07 05:54:42 UTC (rev 124852)
+++ trunk/Source/WebCore/html/PublicURLManager.h 2012-08-07 05:58:49 UTC (rev 124853)
@@ -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
