From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebCore/html/MediaFragmentURIParser.h | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'Source/WebCore/html/MediaFragmentURIParser.h') diff --git a/Source/WebCore/html/MediaFragmentURIParser.h b/Source/WebCore/html/MediaFragmentURIParser.h index c276b7879..7c7736c34 100644 --- a/Source/WebCore/html/MediaFragmentURIParser.h +++ b/Source/WebCore/html/MediaFragmentURIParser.h @@ -10,10 +10,10 @@ * 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 + * THIS SOFTWARE IS PROVIDED BY APPLE 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 + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE 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 @@ -23,12 +23,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MediaFragmentURIParser_h -#define MediaFragmentURIParser_h +#pragma once #if ENABLE(VIDEO) #include "URL.h" +#include #include namespace WebCore { @@ -40,10 +40,8 @@ public: MediaFragmentURIParser(const URL&); - double startTime(); - double endTime(); - - static double invalidTimeValue(); + MediaTime startTime(); + MediaTime endTime(); private: @@ -51,17 +49,16 @@ private: enum TimeFormat { None, Invalid, NormalPlayTime, SMPTETimeCode, WallClockTimeCode }; void parseTimeFragment(); - bool parseNPTFragment(const LChar*, unsigned length, double& startTime, double& endTime); - bool parseNPTTime(const LChar*, unsigned length, unsigned& offset, double& time); + bool parseNPTFragment(const LChar*, unsigned length, MediaTime& startTime, MediaTime& endTime); + bool parseNPTTime(const LChar*, unsigned length, unsigned& offset, MediaTime&); URL m_url; TimeFormat m_timeFormat; - double m_startTime; - double m_endTime; + MediaTime m_startTime; + MediaTime m_endTime; Vector> m_fragments; }; } // namespace WebCore -#endif -#endif +#endif // ENABLE(VIDEO) -- cgit v1.2.1