<!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>[211820] 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/211820">211820</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2017-02-07 10:53:01 -0800 (Tue, 07 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unnecessary exports on inline functions. They were causing build failures
with some compilers.
* Modules/mediasource/SampleMap.h:
(WebCore::PresentationOrderSampleMap::begin):
(WebCore::PresentationOrderSampleMap::end):
(WebCore::PresentationOrderSampleMap::rbegin):
(WebCore::PresentationOrderSampleMap::rend):
(WebCore::DecodeOrderSampleMap::begin):
(WebCore::DecodeOrderSampleMap::end):
(WebCore::DecodeOrderSampleMap::rbegin):
(WebCore::DecodeOrderSampleMap::rend):
(WebCore::SampleMap::sizeInBytes):
(WebCore::SampleMap::decodeOrder):
(WebCore::SampleMap::presentationOrder):
(WebCore::SampleMap::addRange):
(WebCore::SampleMap::SampleMap): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceSampleMaph">trunk/Source/WebCore/Modules/mediasource/SampleMap.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211819 => 211820)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-07 18:42:01 UTC (rev 211819)
+++ trunk/Source/WebCore/ChangeLog 2017-02-07 18:53:01 UTC (rev 211820)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-02-07 Sam Weinig <sam@webkit.org>
+
+ Remove unnecessary exports on inline functions. They were causing build failures
+ with some compilers.
+
+ * Modules/mediasource/SampleMap.h:
+ (WebCore::PresentationOrderSampleMap::begin):
+ (WebCore::PresentationOrderSampleMap::end):
+ (WebCore::PresentationOrderSampleMap::rbegin):
+ (WebCore::PresentationOrderSampleMap::rend):
+ (WebCore::DecodeOrderSampleMap::begin):
+ (WebCore::DecodeOrderSampleMap::end):
+ (WebCore::DecodeOrderSampleMap::rbegin):
+ (WebCore::DecodeOrderSampleMap::rend):
+ (WebCore::SampleMap::sizeInBytes):
+ (WebCore::SampleMap::decodeOrder):
+ (WebCore::SampleMap::presentationOrder):
+ (WebCore::SampleMap::addRange):
+ (WebCore::SampleMap::SampleMap): Deleted.
+
</ins><span class="cx"> 2017-02-07 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, manual roll out of r211777
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceSampleMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/SampleMap.h (211819 => 211820)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/SampleMap.h 2017-02-07 18:42:01 UTC (rev 211819)
+++ trunk/Source/WebCore/Modules/mediasource/SampleMap.h 2017-02-07 18:53:01 UTC (rev 211820)
</span><span class="lines">@@ -46,14 +46,14 @@
</span><span class="cx"> typedef MapType::const_reverse_iterator const_reverse_iterator;
</span><span class="cx"> typedef std::pair<iterator, iterator> iterator_range;
</span><span class="cx">
</span><del>- WEBCORE_EXPORT iterator begin() { return m_samples.begin(); }
- WEBCORE_EXPORT const_iterator begin() const { return m_samples.begin(); }
- WEBCORE_EXPORT iterator end() { return m_samples.end(); }
- WEBCORE_EXPORT const_iterator end() const { return m_samples.end(); }
- WEBCORE_EXPORT reverse_iterator rbegin() { return m_samples.rbegin(); }
- WEBCORE_EXPORT const_reverse_iterator rbegin() const { return m_samples.rbegin(); }
- WEBCORE_EXPORT reverse_iterator rend() { return m_samples.rend(); }
- WEBCORE_EXPORT const_reverse_iterator rend() const { return m_samples.rend(); }
</del><ins>+ iterator begin() { return m_samples.begin(); }
+ const_iterator begin() const { return m_samples.begin(); }
+ iterator end() { return m_samples.end(); }
+ const_iterator end() const { return m_samples.end(); }
+ reverse_iterator rbegin() { return m_samples.rbegin(); }
+ const_reverse_iterator rbegin() const { return m_samples.rbegin(); }
+ reverse_iterator rend() { return m_samples.rend(); }
+ const_reverse_iterator rend() const { return m_samples.rend(); }
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT iterator findSampleWithPresentationTime(const MediaTime&);
</span><span class="cx"> WEBCORE_EXPORT iterator findSampleContainingPresentationTime(const MediaTime&);
</span><span class="lines">@@ -79,14 +79,14 @@
</span><span class="cx"> typedef MapType::const_reverse_iterator const_reverse_iterator;
</span><span class="cx"> typedef std::pair<reverse_iterator, reverse_iterator> reverse_iterator_range;
</span><span class="cx">
</span><del>- WEBCORE_EXPORT iterator begin() { return m_samples.begin(); }
- WEBCORE_EXPORT const_iterator begin() const { return m_samples.begin(); }
- WEBCORE_EXPORT iterator end() { return m_samples.end(); }
- WEBCORE_EXPORT const_iterator end() const { return m_samples.end(); }
- WEBCORE_EXPORT reverse_iterator rbegin() { return m_samples.rbegin(); }
- WEBCORE_EXPORT const_reverse_iterator rbegin() const { return m_samples.rbegin(); }
- WEBCORE_EXPORT reverse_iterator rend() { return m_samples.rend(); }
- WEBCORE_EXPORT const_reverse_iterator rend() const { return m_samples.rend(); }
</del><ins>+ iterator begin() { return m_samples.begin(); }
+ const_iterator begin() const { return m_samples.begin(); }
+ iterator end() { return m_samples.end(); }
+ const_iterator end() const { return m_samples.end(); }
+ reverse_iterator rbegin() { return m_samples.rbegin(); }
+ const_reverse_iterator rbegin() const { return m_samples.rbegin(); }
+ reverse_iterator rend() { return m_samples.rend(); }
+ const_reverse_iterator rend() const { return m_samples.rend(); }
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT iterator findSampleWithDecodeKey(const KeyType&);
</span><span class="cx"> WEBCORE_EXPORT reverse_iterator reverseFindSampleWithDecodeKey(const KeyType&);
</span><span class="lines">@@ -103,32 +103,29 @@
</span><span class="cx">
</span><span class="cx"> class SampleMap {
</span><span class="cx"> public:
</span><del>- WEBCORE_EXPORT SampleMap()
- : m_totalSize(0)
- {
- }
</del><ins>+ SampleMap() = default;
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool empty() const;
</span><span class="cx"> WEBCORE_EXPORT void clear();
</span><span class="cx"> WEBCORE_EXPORT void addSample(MediaSample&);
</span><span class="cx"> WEBCORE_EXPORT void removeSample(MediaSample*);
</span><del>- WEBCORE_EXPORT size_t sizeInBytes() const { return m_totalSize; }
</del><ins>+ size_t sizeInBytes() const { return m_totalSize; }
</ins><span class="cx">
</span><span class="cx"> template<typename I>
</span><span class="cx"> void addRange(I begin, I end);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT DecodeOrderSampleMap& decodeOrder() { return m_decodeOrder; }
- WEBCORE_EXPORT const DecodeOrderSampleMap& decodeOrder() const { return m_decodeOrder; }
- WEBCORE_EXPORT PresentationOrderSampleMap& presentationOrder() { return m_decodeOrder.m_presentationOrder; }
- WEBCORE_EXPORT const PresentationOrderSampleMap& presentationOrder() const { return m_decodeOrder.m_presentationOrder; }
</del><ins>+ DecodeOrderSampleMap& decodeOrder() { return m_decodeOrder; }
+ const DecodeOrderSampleMap& decodeOrder() const { return m_decodeOrder; }
+ PresentationOrderSampleMap& presentationOrder() { return m_decodeOrder.m_presentationOrder; }
+ const PresentationOrderSampleMap& presentationOrder() const { return m_decodeOrder.m_presentationOrder; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> DecodeOrderSampleMap m_decodeOrder;
</span><del>- size_t m_totalSize;
</del><ins>+ size_t m_totalSize { 0 };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename I>
</span><del>-void SampleMap::addRange(I begin, I end)
</del><ins>+inline void SampleMap::addRange(I begin, I end)
</ins><span class="cx"> {
</span><span class="cx"> for (I iter = begin; iter != end; ++iter)
</span><span class="cx"> addSample(*iter->second);
</span></span></pre>
</div>
</div>
</body>
</html>