<!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>[168099] 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/168099">168099</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-05-01 08:43:13 -0700 (Thu, 01 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MSE] Seeking between two buffered ranges enquues incorrect buffers.
https://bugs.webkit.org/show_bug.cgi?id=132416
Reviewed by Eric Carlson.
std::equal_range(begin, end, value) will return an empty range if equal values cannot
be found. But the range is not necessarily [end, end). It may be some other value n,
such that the empty range is [n, n). Check to see if the returned range is empty in
findSampleContainingPresentationTime() and its reverse version, and if so, explicitly
return presentationEnd() or reversePresentationEnd() respectively.
Drive-by fix: make the comparator functions take const& arguments to minimize object
creation.
* Modules/mediasource/SampleMap.cpp:
(WebCore::SampleIsLessThanMediaTimeComparator::operator()):
(WebCore::SampleIsGreaterThanMediaTimeComparator::operator()):
(WebCore::SampleMap::findSampleContainingPresentationTime):
(WebCore::SampleMap::reverseFindSampleContainingPresentationTime):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceSampleMapcpp">trunk/Source/WebCore/Modules/mediasource/SampleMap.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168098 => 168099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-01 15:39:17 UTC (rev 168098)
+++ trunk/Source/WebCore/ChangeLog 2014-05-01 15:43:13 UTC (rev 168099)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-04-30 Jer Noble <jer.noble@apple.com>
+
+ [MSE] Seeking between two buffered ranges enquues incorrect buffers.
+ https://bugs.webkit.org/show_bug.cgi?id=132416
+
+ Reviewed by Eric Carlson.
+
+ std::equal_range(begin, end, value) will return an empty range if equal values cannot
+ be found. But the range is not necessarily [end, end). It may be some other value n,
+ such that the empty range is [n, n). Check to see if the returned range is empty in
+ findSampleContainingPresentationTime() and its reverse version, and if so, explicitly
+ return presentationEnd() or reversePresentationEnd() respectively.
+
+ Drive-by fix: make the comparator functions take const& arguments to minimize object
+ creation.
+
+ * Modules/mediasource/SampleMap.cpp:
+ (WebCore::SampleIsLessThanMediaTimeComparator::operator()):
+ (WebCore::SampleIsGreaterThanMediaTimeComparator::operator()):
+ (WebCore::SampleMap::findSampleContainingPresentationTime):
+ (WebCore::SampleMap::reverseFindSampleContainingPresentationTime):
+
</ins><span class="cx"> 2014-05-01 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Subpixel rendering: Inline text selection painting should not snap to integral CSS pixel position.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceSampleMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/SampleMap.cpp (168098 => 168099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/SampleMap.cpp 2014-05-01 15:39:17 UTC (rev 168098)
+++ trunk/Source/WebCore/Modules/mediasource/SampleMap.cpp 2014-05-01 15:43:13 UTC (rev 168099)
</span><span class="lines">@@ -34,12 +34,12 @@
</span><span class="cx">
</span><span class="cx"> class SampleIsLessThanMediaTimeComparator {
</span><span class="cx"> public:
</span><del>- bool operator()(std::pair<MediaTime, RefPtr<MediaSample>> value, MediaTime time)
</del><ins>+ bool operator()(const SampleMap::MapType::value_type& value, const MediaTime& time)
</ins><span class="cx"> {
</span><span class="cx"> MediaTime presentationEndTime = value.second->presentationTime() + value.second->duration();
</span><span class="cx"> return presentationEndTime <= time;
</span><span class="cx"> }
</span><del>- bool operator()(MediaTime time, std::pair<MediaTime, RefPtr<MediaSample>> value)
</del><ins>+ bool operator()(const MediaTime& time, const SampleMap::MapType::value_type& value)
</ins><span class="cx"> {
</span><span class="cx"> MediaTime presentationStartTime = value.second->presentationTime();
</span><span class="cx"> return time < presentationStartTime;
</span><span class="lines">@@ -48,12 +48,12 @@
</span><span class="cx">
</span><span class="cx"> class SampleIsGreaterThanMediaTimeComparator {
</span><span class="cx"> public:
</span><del>- bool operator()(std::pair<MediaTime, RefPtr<MediaSample>> value, MediaTime time)
</del><ins>+ bool operator()(const SampleMap::MapType::value_type& value, const MediaTime& time)
</ins><span class="cx"> {
</span><span class="cx"> MediaTime presentationStartTime = value.second->presentationTime();
</span><span class="cx"> return presentationStartTime > time;
</span><span class="cx"> }
</span><del>- bool operator()(MediaTime time, std::pair<MediaTime, RefPtr<MediaSample>> value)
</del><ins>+ bool operator()(const MediaTime& time, const SampleMap::MapType::value_type& value)
</ins><span class="cx"> {
</span><span class="cx"> MediaTime presentationEndTime = value.second->presentationTime() + value.second->duration();
</span><span class="cx"> return time >= presentationEndTime;
</span><span class="lines">@@ -97,7 +97,10 @@
</span><span class="cx">
</span><span class="cx"> SampleMap::iterator SampleMap::findSampleContainingPresentationTime(const MediaTime& time)
</span><span class="cx"> {
</span><del>- return std::equal_range(presentationBegin(), presentationEnd(), time, SampleIsLessThanMediaTimeComparator()).first;
</del><ins>+ auto range = std::equal_range(presentationBegin(), presentationEnd(), time, SampleIsLessThanMediaTimeComparator());
+ if (range.first == range.second)
+ return presentationEnd();
+ return range.first;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SampleMap::iterator SampleMap::findSampleAfterPresentationTime(const MediaTime& time)
</span><span class="lines">@@ -112,7 +115,10 @@
</span><span class="cx">
</span><span class="cx"> SampleMap::reverse_iterator SampleMap::reverseFindSampleContainingPresentationTime(const MediaTime& time)
</span><span class="cx"> {
</span><del>- return std::equal_range(reversePresentationBegin(), reversePresentationEnd(), time, SampleIsGreaterThanMediaTimeComparator()).first;
</del><ins>+ auto range = std::equal_range(reversePresentationBegin(), reversePresentationEnd(), time, SampleIsGreaterThanMediaTimeComparator());
+ if (range.first == range.second)
+ return reversePresentationEnd();
+ return range.first;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SampleMap::reverse_iterator SampleMap::reverseFindSampleBeforePresentationTime(const MediaTime& time)
</span></span></pre>
</div>
</div>
</body>
</html>