<!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>[159771] 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/159771">159771</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-11-25 15:50:36 -0800 (Mon, 25 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Mark URLRegistry's lookup() as const and its child classes as final
https://bugs.webkit.org/show_bug.cgi?id=124865
Patch by Nick Diego Yamane <nick.yamane@openbossa.org> on 2013-11-25
Reviewed by Eric Carlson.
No new tests needed. No behavior changes.
* Modules/mediasource/MediaSourceRegistry.cpp:
(WebCore::MediaSourceRegistry::lookup): marked as const.
* Modules/mediasource/MediaSourceRegistry.h: MediaSourceRegistry
marked as final.
* Modules/mediastream/MediaStreamRegistry.cpp:
(WebCore::MediaStreamRegistry::lookup): marked as const.
* Modules/mediastream/MediaStreamRegistry.h: MediaStreamRegistry
marked as final.
* fileapi/Blob.cpp:
* html/URLRegistry.h: lookup() marked as const.
(WebCore::URLRegistry::lookup): marked as const.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceMediaSourceRegistrycpp">trunk/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceMediaSourceRegistryh">trunk/Source/WebCore/Modules/mediasource/MediaSourceRegistry.h</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="#trunkSourceWebCorefileapiBlobcpp">trunk/Source/WebCore/fileapi/Blob.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlURLRegistryh">trunk/Source/WebCore/html/URLRegistry.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (159770 => 159771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-11-25 23:50:27 UTC (rev 159770)
+++ trunk/Source/WebCore/ChangeLog 2013-11-25 23:50:36 UTC (rev 159771)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2013-11-25 Nick Diego Yamane <nick.yamane@openbossa.org>
+
+ Mark URLRegistry's lookup() as const and its child classes as final
+ https://bugs.webkit.org/show_bug.cgi?id=124865
+
+ Reviewed by Eric Carlson.
+
+ No new tests needed. No behavior changes.
+
+ * Modules/mediasource/MediaSourceRegistry.cpp:
+ (WebCore::MediaSourceRegistry::lookup): marked as const.
+ * Modules/mediasource/MediaSourceRegistry.h: MediaSourceRegistry
+ marked as final.
+ * Modules/mediastream/MediaStreamRegistry.cpp:
+ (WebCore::MediaStreamRegistry::lookup): marked as const.
+ * Modules/mediastream/MediaStreamRegistry.h: MediaStreamRegistry
+ marked as final.
+ * fileapi/Blob.cpp:
+ * html/URLRegistry.h: lookup() marked as const.
+ (WebCore::URLRegistry::lookup): marked as const.
+
</ins><span class="cx"> 2013-11-25 Sergio Correia <sergio.correia@openbossa.org>
</span><span class="cx">
</span><span class="cx"> [MediaStream] Use std::unique_ptr instead of OwnPtr/PassOwnPtr
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceMediaSourceRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp (159770 => 159771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp 2013-11-25 23:50:27 UTC (rev 159770)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp 2013-11-25 23:50:36 UTC (rev 159771)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> source->removedFromRegistry();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-URLRegistrable* MediaSourceRegistry::lookup(const String& url)
</del><ins>+URLRegistrable* MediaSourceRegistry::lookup(const String& url) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> return m_mediaSources.get(url);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceMediaSourceRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/MediaSourceRegistry.h (159770 => 159771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/MediaSourceRegistry.h 2013-11-25 23:50:27 UTC (rev 159770)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSourceRegistry.h 2013-11-25 23:50:36 UTC (rev 159771)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> class URL;
</span><span class="cx"> class MediaSourceBase;
</span><span class="cx">
</span><del>-class MediaSourceRegistry : public URLRegistry {
</del><ins>+class MediaSourceRegistry FINAL : public URLRegistry {
</ins><span class="cx"> public:
</span><span class="cx"> // Returns a single instance of MediaSourceRegistry.
</span><span class="cx"> static MediaSourceRegistry& registry();
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> // Registers a blob URL referring to the specified media source.
</span><span class="cx"> virtual void registerURL(SecurityOrigin*, const URL&, URLRegistrable*) OVERRIDE;
</span><span class="cx"> virtual void unregisterURL(const URL&) OVERRIDE;
</span><del>- virtual URLRegistrable* lookup(const String&) OVERRIDE;
</del><ins>+ virtual URLRegistrable* lookup(const String&) const OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> MediaSourceRegistry();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.cpp (159770 => 159771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.cpp 2013-11-25 23:50:27 UTC (rev 159770)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.cpp 2013-11-25 23:50:36 UTC (rev 159771)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> m_mediaStreams.remove(url.string());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-URLRegistrable* MediaStreamRegistry::lookup(const String& url)
</del><ins>+URLRegistrable* MediaStreamRegistry::lookup(const String& url) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> return m_mediaStreams.get(url);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.h (159770 => 159771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.h 2013-11-25 23:50:27 UTC (rev 159770)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.h 2013-11-25 23:50:36 UTC (rev 159771)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> class URL;
</span><span class="cx"> class MediaStream;
</span><span class="cx">
</span><del>-class MediaStreamRegistry : public URLRegistry {
</del><ins>+class MediaStreamRegistry FINAL : public URLRegistry {
</ins><span class="cx"> public:
</span><span class="cx"> // Returns a single instance of MediaStreamRegistry.
</span><span class="cx"> static MediaStreamRegistry& registry();
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> virtual void registerURL(SecurityOrigin*, const URL&, URLRegistrable*) OVERRIDE;
</span><span class="cx"> virtual void unregisterURL(const URL&) OVERRIDE;
</span><span class="cx">
</span><del>- virtual URLRegistrable* lookup(const String&) OVERRIDE;
</del><ins>+ virtual URLRegistrable* lookup(const String&) const OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> HashMap<String, RefPtr<MediaStream>> m_mediaStreams;
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiBlobcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/Blob.cpp (159770 => 159771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/Blob.cpp 2013-11-25 23:50:27 UTC (rev 159770)
+++ trunk/Source/WebCore/fileapi/Blob.cpp 2013-11-25 23:50:36 UTC (rev 159771)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace
</span><span class="cx">
</span><del>-class BlobURLRegistry : public URLRegistry {
</del><ins>+class BlobURLRegistry FINAL : public URLRegistry {
</ins><span class="cx"> public:
</span><span class="cx"> virtual void registerURL(SecurityOrigin*, const URL&, URLRegistrable*) OVERRIDE;
</span><span class="cx"> virtual void unregisterURL(const URL&) OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlURLRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/URLRegistry.h (159770 => 159771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/URLRegistry.h 2013-11-25 23:50:27 UTC (rev 159770)
+++ trunk/Source/WebCore/html/URLRegistry.h 2013-11-25 23:50:36 UTC (rev 159771)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> virtual void unregisterURL(const URL&) = 0;
</span><span class="cx">
</span><span class="cx"> // This is an optional API
</span><del>- virtual URLRegistrable* lookup(const String&) { ASSERT_NOT_REACHED(); return 0; }
</del><ins>+ virtual URLRegistrable* lookup(const String&) const { ASSERT_NOT_REACHED(); return 0; }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>