Seeking media fragment URI before loadeddata event

Source/core/html/HTMLMediaElement.cpp

Index: Source/core/html/HTMLMediaElement.cpp
diff --git a/Source/core/html/HTMLMediaElement.cpp b/Source/core/html/HTMLMediaElement.cpp
index 297200ac63334d0e5ee4d36028048b6a16e59a94..24b04b3f199a2b5581f2d3c41e5f09fc0d35447c 100644
--- a/Source/core/html/HTMLMediaElement.cpp
+++ b/Source/core/html/HTMLMediaElement.cpp
@@ -332,7 +332,6 @@ HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document& docum
     , m_preload(MediaPlayer::Auto)
     , m_displayMode(Unknown)
     , m_cachedTime(MediaPlayer::invalidTime())
-    , m_fragmentStartTime(MediaPlayer::invalidTime())
     , m_fragmentEndTime(MediaPlayer::invalidTime())
     , m_pendingActionFlags(0)
     , m_userGestureRequiredForPlay(false)
@@ -1808,10 +1807,11 @@ void HTMLMediaElement::setReadyState(ReadyState state)
     if (m_readyState >= HAVE_METADATA && oldState < HAVE_METADATA) {
         createPlaceholderTracksIfNecessary();
 
-        prepareMediaFragmentURI();
-
         selectInitialTracksIfNecessary();
 
+        MediaFragmentURIParser fragmentParser(m_currentSrc);
+        m_fragmentEndTime = fragmentParser.endTime();
+
         m_duration = duration();
         scheduleEvent(EventTypeNames::durationchange);
 
@@ -1819,10 +1819,34 @@ void HTMLMediaElement::setReadyState(ReadyState state)
             scheduleEvent(EventTypeNames::resize);
         scheduleEvent(EventTypeNames::loadedmetadata);
 
-        if (m_defaultPlaybackStartPosition > 0)
+        bool jumped = false;
+        if (m_defaultPlaybackStartPosition > 0) {
             seek(m_defaultPlaybackStartPosition);
-
+            jumped = true;
+        }
         m_defaultPlaybackStartPosition = 0;
+
+        double initialPlaybackPosition = fragmentParser.startTime();
+        if (initialPlaybackPosition == MediaPlayer::invalidTime())
+            initialPlaybackPosition = 0;
+
+        if (!jumped) {
+            if (initialPlaybackPosition > 0) {

[philipj_slow, 2014/09/11 14:38:28]

Can you invert the order of these two conditions or merge them, so that it more
obviously does what the spec says? If you like you can merge everything into an
if (fragmentParser.startTime() != MediaPlayer::invalidTime()).

[amogh.bihani, 2014/09/12 11:02:23]

Done.
Pardon me if I got it wrong, but then I guess we wont be needing line 1830. That
would cause a problem on line 1844 if we do not set it to 0.

+                m_sentEndEvent = false;
+                UseCounter::count(document(), UseCounter::HTMLMediaElementSeekToFragmentStart);
+                seek(initialPlaybackPosition);
+                jumped = true;
+            }
+            // FIXME: Add support for selecting tracks by ID with the Media Fragments track dimension.

[philipj_slow, 2014/09/11 14:38:28]

Maybe it's time to drop or move this FIXME, because this isn't where it should
be fixed.

[amogh.bihani, 2014/09/12 11:02:23]

Done.

+        }
+
+        if (m_mediaController) {
+            if (jumped && initialPlaybackPosition > m_mediaController->currentTime())
+                m_mediaController->setCurrentTime(initialPlaybackPosition);
+            else
+                seek(m_mediaController->currentTime());
+        }
+
         if (hasMediaControls())
             mediaControls()->reset();
         if (renderer())
@@ -1836,7 +1860,6 @@ void HTMLMediaElement::setReadyState(ReadyState state)
         shouldUpdateDisplayState = true;
         scheduleEvent(EventTypeNames::loadeddata);
         setShouldDelayLoadEvent(false);
-        applyMediaFragmentURI();
     }
 
     bool isPotentiallyPlaying = potentiallyPlaying();
@@ -3851,42 +3874,6 @@ bool HTMLMediaElement::isBlockedOnMediaController() const
     return false;
 }
 
-void HTMLMediaElement::prepareMediaFragmentURI()
-{
-    MediaFragmentURIParser fragmentParser(m_currentSrc);
-    double dur = duration();
-
-    double start = fragmentParser.startTime();
-    if (start != MediaFragmentURIParser::invalidTimeValue() && start > 0) {
-        m_fragmentStartTime = start;
-        if (m_fragmentStartTime > dur)
-            m_fragmentStartTime = dur;
-    } else
-        m_fragmentStartTime = MediaPlayer::invalidTime();
-
-    double end = fragmentParser.endTime();
-    if (end != MediaFragmentURIParser::invalidTimeValue() && end > 0 && end > m_fragmentStartTime) {
-        m_fragmentEndTime = end;
-        if (m_fragmentEndTime > dur)
-            m_fragmentEndTime = dur;
-    } else
-        m_fragmentEndTime = MediaPlayer::invalidTime();
-
-    // FIXME: Add support for selecting tracks by ID with the Media Fragments track dimension.
-
-    if (m_fragmentStartTime != MediaPlayer::invalidTime() && m_readyState < HAVE_FUTURE_DATA)
-        prepareToPlay();
-}
-
-void HTMLMediaElement::applyMediaFragmentURI()
-{
-    if (m_fragmentStartTime != MediaPlayer::invalidTime()) {
-        m_sentEndEvent = false;
-        UseCounter::count(document(), UseCounter::HTMLMediaElementSeekToFragmentStart);
-        seek(m_fragmentStartTime);
-    }
-}
-
 WebMediaPlayer::CORSMode HTMLMediaElement::corsMode() const
 {
     const AtomicString& crossOriginMode = fastGetAttribute(crossoriginAttr);