1 files changed, 18 insertions, 7 deletions
diff --git a/chromium/content/renderer/media/websourcebuffer_impl.h b/chromium/content/renderer/media/websourcebuffer_impl.h
index abfec405ad2..b0e4fa686ae 100644
--- a/chromium/content/renderer/media/websourcebuffer_impl.h
+++ b/chromium/content/renderer/media/websourcebuffer_impl.h
@@ -9,6 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/time/time.h"
 #include "third_party/WebKit/public/platform/WebSourceBuffer.h"
 
 namespace media {
@@ -23,21 +24,31 @@ class WebSourceBufferImpl : public blink::WebSourceBuffer {
   virtual ~WebSourceBufferImpl();
 
   // blink::WebSourceBuffer implementation.
-  virtual blink::WebTimeRanges buffered() OVERRIDE;
-  virtual void append(const unsigned char* data, unsigned length) OVERRIDE;
-  virtual void abort() OVERRIDE;
-  // TODO(acolwell): Add OVERRIDE when Blink-side changes land.
+  virtual bool setMode(AppendMode mode);
+  virtual blink::WebTimeRanges buffered();
+  virtual void append(
+      const unsigned char* data,
+      unsigned length,
+      double* timestamp_offset);
+  virtual void abort();
   virtual void remove(double start, double end);
-  virtual bool setTimestampOffset(double offset) OVERRIDE;
-  // TODO(acolwell): Add OVERRIDE when Blink-side changes land.
+  virtual bool setTimestampOffset(double offset);
   virtual void setAppendWindowStart(double start);
   virtual void setAppendWindowEnd(double end);
-  virtual void removedFromMediaSource() OVERRIDE;
+  virtual void removedFromMediaSource();
 
  private:
   std::string id_;
   media::ChunkDemuxer* demuxer_;  // Owned by WebMediaPlayerImpl.
 
+  // Controls the offset applied to timestamps when processing appended media
+  // segments. It is initially 0, which indicates that no offset is being
+  // applied. Both setTimestampOffset() and append() may update this value.
+  base::TimeDelta timestamp_offset_;
+
+  base::TimeDelta append_window_start_;
+  base::TimeDelta append_window_end_;
+
   DISALLOW_COPY_AND_ASSIGN(WebSourceBufferImpl);
 };