Fix TimeRanges::nearest() to actually calculate nearest time.

Source/core/html/TimeRanges.cpp

 /*
  * Copyright (C) 2007, 2009, 2010 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 164 matching lines @@
 
 bool TimeRanges::contain(double time) const
 {
     for (unsigned n = 0; n < length(); n++) {
         if (time >= start(n, IGNORE_EXCEPTION) && time <= end(n, IGNORE_EXCEPTION))
             return true;
     }
     return false;
 }
 
-double TimeRanges::nearest(double time) const
+double TimeRanges::nearest(double time, double now) const

[acolwell GONE FROM CHROMIUM, 2014/09/11 22:24:39]

ditto.

[DaleCurtis, 2014/09/11 22:40:01]

Done.

 {
-    double closest = 0;
     unsigned count = length();
+    double bestMatch = 0;
+    double bestDelta = std::numeric_limits<double>::infinity();
     for (unsigned ndx = 0; ndx < count; ndx++) {
         double startTime = start(ndx, IGNORE_EXCEPTION);
         double endTime = end(ndx, IGNORE_EXCEPTION);
         if (time >= startTime && time <= endTime)
             return time;
-        if (fabs(startTime - time) < closest)
-            closest = fabs(startTime - time);
-        else if (fabs(endTime - time) < closest)
-            closest = fabs(endTime - time);
+
+        double delta, match;
+        if (time < startTime) {
+            delta = startTime - time;
+            match = startTime;
+        } else {
+            delta = time - endTime;
+            match = endTime;
+        }
+
+        if (delta < bestDelta || (delta == bestDelta && std::abs(now - match) < std::abs(now - bestMatch))) {
+            bestDelta = delta;
+            bestMatch = match;
+        }
     }
-    return closest;
+    return bestMatch;
 }
 
 void TimeRanges::trace(Visitor* visitor)
 {
     visitor->trace(m_ranges);
 }