Title: [211820] trunk/Source/WebCore
- Revision
- 211820
- Author
- wei...@apple.com
- Date
- 2017-02-07 10:53:01 -0800 (Tue, 07 Feb 2017)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (211819 => 211820)
--- 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)
@@ -1,3 +1,23 @@
+2017-02-07 Sam Weinig <s...@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.
+
2017-02-07 Yusuke Suzuki <utatane....@gmail.com>
Unreviewed, manual roll out of r211777
Modified: trunk/Source/WebCore/Modules/mediasource/SampleMap.h (211819 => 211820)
--- 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)
@@ -46,14 +46,14 @@
typedef MapType::const_reverse_iterator const_reverse_iterator;
typedef std::pair<iterator, iterator> iterator_range;
- 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(); }
+ 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(); }
WEBCORE_EXPORT iterator findSampleWithPresentationTime(const MediaTime&);
WEBCORE_EXPORT iterator findSampleContainingPresentationTime(const MediaTime&);
@@ -79,14 +79,14 @@
typedef MapType::const_reverse_iterator const_reverse_iterator;
typedef std::pair<reverse_iterator, reverse_iterator> reverse_iterator_range;
- 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(); }
+ 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(); }
WEBCORE_EXPORT iterator findSampleWithDecodeKey(const KeyType&);
WEBCORE_EXPORT reverse_iterator reverseFindSampleWithDecodeKey(const KeyType&);
@@ -103,32 +103,29 @@
class SampleMap {
public:
- WEBCORE_EXPORT SampleMap()
- : m_totalSize(0)
- {
- }
+ SampleMap() = default;
WEBCORE_EXPORT bool empty() const;
WEBCORE_EXPORT void clear();
WEBCORE_EXPORT void addSample(MediaSample&);
WEBCORE_EXPORT void removeSample(MediaSample*);
- WEBCORE_EXPORT size_t sizeInBytes() const { return m_totalSize; }
+ size_t sizeInBytes() const { return m_totalSize; }
template<typename I>
void addRange(I begin, I end);
- 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; }
+ 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; }
private:
DecodeOrderSampleMap m_decodeOrder;
- size_t m_totalSize;
+ size_t m_totalSize { 0 };
};
template<typename I>
-void SampleMap::addRange(I begin, I end)
+inline void SampleMap::addRange(I begin, I end)
{
for (I iter = begin; iter != end; ++iter)
addSample(*iter->second);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
