Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Side by Side Diff: Source/core/html/TimeRanges.cpp

Issue 559993004: Fix TimeRanges::nearest() to actually calculate nearest time. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Comments. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/html/TimeRanges.h ('k') | Source/core/html/TimeRangesTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2009, 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 175
176 bool TimeRanges::contain(double time) const 176 bool TimeRanges::contain(double time) const
177 { 177 {
178 for (unsigned n = 0; n < length(); n++) { 178 for (unsigned n = 0; n < length(); n++) {
179 if (time >= start(n, IGNORE_EXCEPTION) && time <= end(n, IGNORE_EXCEPTIO N)) 179 if (time >= start(n, IGNORE_EXCEPTION) && time <= end(n, IGNORE_EXCEPTIO N))
180 return true; 180 return true;
181 } 181 }
182 return false; 182 return false;
183 } 183 }
184 184
185 double TimeRanges::nearest(double time) const 185 double TimeRanges::nearest(double newPlaybackPosition, double currentPlaybackPos ition) const
186 { 186 {
187 double closest = 0;
188 unsigned count = length(); 187 unsigned count = length();
188 double bestMatch = 0;
189 double bestDelta = std::numeric_limits<double>::infinity();
189 for (unsigned ndx = 0; ndx < count; ndx++) { 190 for (unsigned ndx = 0; ndx < count; ndx++) {
190 double startTime = start(ndx, IGNORE_EXCEPTION); 191 double startTime = start(ndx, IGNORE_EXCEPTION);
191 double endTime = end(ndx, IGNORE_EXCEPTION); 192 double endTime = end(ndx, IGNORE_EXCEPTION);
192 if (time >= startTime && time <= endTime) 193 if (newPlaybackPosition >= startTime && newPlaybackPosition <= endTime)
193 return time; 194 return newPlaybackPosition;
194 if (fabs(startTime - time) < closest) 195
195 closest = fabs(startTime - time); 196 double delta, match;
196 else if (fabs(endTime - time) < closest) 197 if (newPlaybackPosition < startTime) {
197 closest = fabs(endTime - time); 198 delta = startTime - newPlaybackPosition;
199 match = startTime;
200 } else {
201 delta = newPlaybackPosition - endTime;
202 match = endTime;
203 }
204
205 if (delta < bestDelta || (delta == bestDelta
206 && std::abs(currentPlaybackPosition - match) < std::abs(currentPlayb ackPosition - bestMatch))) {
207 bestDelta = delta;
208 bestMatch = match;
209 }
198 } 210 }
199 return closest; 211 return bestMatch;
200 } 212 }
201 213
202 void TimeRanges::trace(Visitor* visitor) 214 void TimeRanges::trace(Visitor* visitor)
203 { 215 {
204 visitor->trace(m_ranges); 216 visitor->trace(m_ranges);
205 } 217 }
OLDNEW
« no previous file with comments | « Source/core/html/TimeRanges.h ('k') | Source/core/html/TimeRangesTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698