<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[159767] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/159767">159767</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-11-25 14:55:39 -0800 (Mon, 25 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>MediaStreamRegistry should store MediaStreams instead of MediaStreamPrivates
https://bugs.webkit.org/show_bug.cgi?id=124860

Patch by Nick Diego Yamane &lt;nick.yamane@openbossa.org&gt; on 2013-11-25
Reviewed by Eric Carlson.

MediaStreamRegistry::lookup() should return a MediaStream instead of MediaStreamPrivate.

No new tests needed. No behavior changes.

* Modules/mediastream/MediaStreamRegistry.cpp:
(WebCore::MediaStreamRegistry::registerURL): m_privateStreams -&gt; m_mediaStreams
(WebCore::MediaStreamRegistry::unregisterURL): Ditto.
(WebCore::MediaStreamRegistry::lookup): Override URLRegistry::lookup() instead of add a
new method MediaStream::lookupMediaStreamPrivate().
* Modules/mediastream/MediaStreamRegistry.h:
* html/HTMLMediaElement.cpp:
(HTMLMediaElement::loadResource): call lookup() instead of lookupMediaStreamPrivate()</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamRegistrycpp">trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamRegistryh">trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (159766 => 159767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-11-25 22:08:33 UTC (rev 159766)
+++ trunk/Source/WebCore/ChangeLog        2013-11-25 22:55:39 UTC (rev 159767)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2013-11-25  Nick Diego Yamane  &lt;nick.yamane@openbossa.org&gt;
+
+        MediaStreamRegistry should store MediaStreams instead of MediaStreamPrivates
+        https://bugs.webkit.org/show_bug.cgi?id=124860
+
+        Reviewed by Eric Carlson.
+
+        MediaStreamRegistry::lookup() should return a MediaStream instead of MediaStreamPrivate.
+
+        No new tests needed. No behavior changes.
+
+        * Modules/mediastream/MediaStreamRegistry.cpp:
+        (WebCore::MediaStreamRegistry::registerURL): m_privateStreams -&gt; m_mediaStreams
+        (WebCore::MediaStreamRegistry::unregisterURL): Ditto.
+        (WebCore::MediaStreamRegistry::lookup): Override URLRegistry::lookup() instead of add a
+        new method MediaStream::lookupMediaStreamPrivate().
+        * Modules/mediastream/MediaStreamRegistry.h:
+        * html/HTMLMediaElement.cpp:
+        (HTMLMediaElement::loadResource): call lookup() instead of lookupMediaStreamPrivate()
+
</ins><span class="cx"> 2013-11-25  peavo@outlook.com  &lt;peavo@outlook.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [WinCairo] Compile fails when GSTREAMER is not used.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.cpp (159766 => 159767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.cpp        2013-11-25 22:08:33 UTC (rev 159766)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.cpp        2013-11-25 22:55:39 UTC (rev 159767)
</span><span class="lines">@@ -46,19 +46,19 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(&amp;stream-&gt;registry() == this);
</span><span class="cx">     ASSERT(isMainThread());
</span><del>-    m_privateStreams.set(url.string(), static_cast&lt;MediaStream*&gt;(stream)-&gt;privateStream());
</del><ins>+    m_mediaStreams.set(url.string(), static_cast&lt;MediaStream*&gt;(stream));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void MediaStreamRegistry::unregisterURL(const URL&amp; url)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(isMainThread());
</span><del>-    m_privateStreams.remove(url.string());
</del><ins>+    m_mediaStreams.remove(url.string());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-MediaStreamPrivate* MediaStreamRegistry::lookupMediaStreamPrivate(const String&amp; url)
</del><ins>+URLRegistrable* MediaStreamRegistry::lookup(const String&amp; url)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(isMainThread());
</span><del>-    return m_privateStreams.get(url);
</del><ins>+    return m_mediaStreams.get(url);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.h (159766 => 159767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.h        2013-11-25 22:08:33 UTC (rev 159766)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.h        2013-11-25 22:55:39 UTC (rev 159767)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> 
</span><span class="cx"> class URL;
</span><span class="cx"> class MediaStream;
</span><del>-class MediaStreamPrivate;
</del><span class="cx"> 
</span><span class="cx"> class MediaStreamRegistry : public URLRegistry {
</span><span class="cx"> public:
</span><span class="lines">@@ -48,10 +47,10 @@
</span><span class="cx">     virtual void registerURL(SecurityOrigin*, const URL&amp;, URLRegistrable*) OVERRIDE;
</span><span class="cx">     virtual void unregisterURL(const URL&amp;) OVERRIDE;
</span><span class="cx"> 
</span><del>-    MediaStreamPrivate* lookupMediaStreamPrivate(const String&amp; url);
</del><ins>+    virtual URLRegistrable* lookup(const String&amp;) OVERRIDE;
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    HashMap&lt;String, RefPtr&lt;MediaStreamPrivate&gt;&gt; m_privateStreams;
</del><ins>+    HashMap&lt;String, RefPtr&lt;MediaStream&gt;&gt; m_mediaStreams;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (159766 => 159767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp        2013-11-25 22:08:33 UTC (rev 159766)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp        2013-11-25 22:55:39 UTC (rev 159767)
</span><span class="lines">@@ -1087,7 +1087,7 @@
</span><span class="cx">     LOG(Media, &quot;HTMLMediaElement::loadResource - m_currentSrc -&gt; %s&quot;, urlForLoggingMedia(m_currentSrc).utf8().data());
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><del>-    if (MediaStreamRegistry::registry().lookupMediaStreamPrivate(url.string()))
</del><ins>+    if (MediaStreamRegistry::registry().lookup(url.string()))
</ins><span class="cx">         removeBehaviorRestriction(RequireUserGestureForRateChangeRestriction);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>