Remove MediaPlayer::invalidTime()

Source/core/html/MediaFragmentURIParser.cpp

 /*
  * Copyright (C) 2011, 2012 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
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/html/MediaFragmentURIParser.h"
 
-#include "platform/graphics/media/MediaPlayer.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/StringBuilder.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 const int secondsPerHour = 3600;
 const int secondsPerMinute = 60;
 const unsigned nptIdentiferLength = 4; // "npt:"
 
@@ skipping 16 matching lines @@
     // [ "." *DIGIT ]
     if (input[position] != '.')
         return String();
 
     digits.append(input[position++]);
     while (position < length && isASCIIDigit(input[position]))
         digits.append(input[position++]);
     return digits.toString();
 }
 
-double MediaFragmentURIParser::invalidTimeValue()
-{
-    return MediaPlayer::invalidTime();
-}
-
 MediaFragmentURIParser::MediaFragmentURIParser(const KURL& url)
     : m_url(url)
     , m_timeFormat(None)
-    , m_startTime(MediaPlayer::invalidTime())
-    , m_endTime(MediaPlayer::invalidTime())
+    , m_startTime(std::numeric_limits<double>::quiet_NaN())
+    , m_endTime(std::numeric_limits<double>::quiet_NaN())
 {
 }
 
 double MediaFragmentURIParser::startTime()
 {
     if (!m_url.isValid())
-        return MediaPlayer::invalidTime();
+        return std::numeric_limits<double>::quiet_NaN();
     if (m_timeFormat == None)
         parseTimeFragment();
     return m_startTime;
 }
 
 double MediaFragmentURIParser::endTime()
 {
     if (!m_url.isValid())
-        return MediaPlayer::invalidTime();
+        return std::numeric_limits<double>::quiet_NaN();
     if (m_timeFormat == None)
         parseTimeFragment();
     return m_endTime;
 }
 
 void MediaFragmentURIParser::parseFragments()
 {
     if (!m_url.hasFragmentIdentifier())
         return;
     String fragmentString = m_url.fragmentIdentifier();
@@ skipping 67 matching lines @@
         // time and an end time
         if (fragment.first != "t")
             continue;
 
         // http://www.w3.org/2008/WebVideo/Fragments/WD-media-fragments-spec/#npt-time
         // Temporal clipping can be specified either as Normal Play Time (npt) RFC 2326, as SMPTE timecodes,
         // SMPTE, or as real-world clock time (clock) RFC 2326. Begin and end times are always specified
         // in the same format. The format is specified by name, followed by a colon (:), with npt: being
         // the default.
 
-        double start = MediaPlayer::invalidTime();
-        double end = MediaPlayer::invalidTime();
+        double start = std::numeric_limits<double>::quiet_NaN();
+        double end = std::numeric_limits<double>::quiet_NaN();
         if (parseNPTFragment(fragment.second.characters8(), fragment.second.length(), start, end)) {
             m_startTime = start;
             m_endTime = end;
             m_timeFormat = NormalPlayTime;
 
             // Although we have a valid fragment, don't return yet because when a fragment dimensions
             // occurs multiple times, only the last occurrence of that dimension is used:
             // http://www.w3.org/2008/WebVideo/Fragments/WD-media-fragments-spec/#error-uri-general
             // Multiple occurrences of the same dimension: only the last valid occurrence of a dimension
             // (e.g., t=10 in #t=2&t=10) is interpreted, all previous occurrences (valid or invalid)
@@ skipping 119 matching lines @@
     }
 
     if (offset < length && timeString[offset] == '.')
         fraction = collectFraction(timeString, length, offset).toDouble();
 
     time = (value1 * secondsPerHour) + (value2 * secondsPerMinute) + value3 + fraction;
     return true;
 }
 
 }