From f61de903c4b3fb9b8dd907368ccd94ee29d937f7 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Mon, 5 Sep 2016 21:41:12 -0700
Subject: [PATCH] Backed out changeset cbf25d6711b7 (bug 1291946) for timeouts
 in test_peerConnection_addtrack_removetrack_events.html

---
 dom/media/MediaStreamGraph.cpp | 11 +----------
 dom/media/VideoSegment.h       |  6 +-----
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/dom/media/MediaStreamGraph.cpp b/dom/media/MediaStreamGraph.cpp
index 82aa867c49d9..acc4273b96e2 100644
--- a/dom/media/MediaStreamGraph.cpp
+++ b/dom/media/MediaStreamGraph.cpp
@@ -2889,16 +2889,7 @@ SourceMediaStream::AddDirectTrackListenerImpl(already_AddRefed<DirectMediaStream
       MediaStreamVideoSink* videoSink = listener->AsMediaStreamVideoSink();
       // Re-send missed VideoSegment to new added MediaStreamVideoSink.
       if (streamTrack->GetType() == MediaSegment::VIDEO && videoSink) {
-        VideoSegment videoSegment;
-        if (mTracks.GetForgottenDuration() < streamTrack->GetSegment()->GetDuration()) {
-          videoSegment.AppendSlice(*streamTrack->GetSegment(),
-                                   mTracks.GetForgottenDuration(),
-                                   streamTrack->GetSegment()->GetDuration());
-        }
-        if (found) {
-          videoSegment.AppendSlice(*data->mData, 0, data->mData->GetDuration());
-        }
-        videoSink->SetCurrentFrames(videoSegment);
+        videoSink->SetCurrentFrames(*(static_cast<VideoSegment*>(streamTrack->GetSegment())));
       }
     }
 
diff --git a/dom/media/VideoSegment.h b/dom/media/VideoSegment.h
index e090012f1df7..6e871d244b1b 100644
--- a/dom/media/VideoSegment.h
+++ b/dom/media/VideoSegment.h
@@ -92,13 +92,9 @@ struct VideoChunk {
 
   PrincipalHandle GetPrincipalHandle() const { return mFrame.GetPrincipalHandle(); }
 
-  TimeStamp GetTimeStamp() const {
-    return mTimeStamp;
-  }
-
   StreamTime mDuration;
   VideoFrame mFrame;
-  TimeStamp mTimeStamp;
+  mozilla::TimeStamp mTimeStamp;
 };
 
 class VideoSegment : public MediaSegmentBase<VideoSegment, VideoChunk> {