Merge M54: "Transition to have nothing if background rendering evicts all frames."

media/renderers/video_renderer_impl.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_RENDERERS_VIDEO_RENDERER_IMPL_H_
 #define MEDIA_RENDERERS_VIDEO_RENDERER_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 106 matching lines @@
   void AttemptRead_Locked();
 
   // Called when VideoFrameStream::Reset() completes.
   void OnVideoFrameStreamResetDone();
 
   // Returns true if the renderer has enough data for playback purposes.
   // Note that having enough data may be due to reaching end of stream.
   bool HaveEnoughData_Locked();
   void TransitionToHaveEnough_Locked();
   void TransitionToHaveNothing();
+  void TransitionToHaveNothing_Locked();
 
   // Runs |statistics_cb_| with |frames_decoded_| and |frames_dropped_|, resets
   // them to 0.
   void UpdateStats_Locked();
 
   // Returns true if there is no more room for additional buffered frames.
   bool HaveReachedBufferingCap();
 
   // Starts or stops |sink_| respectively. Do not call while |lock_| is held.
   void StartSink();
@@ skipping 155 matching lines @@
   // want to discard video frames that might be received after the stream has
   // been reset.
   base::WeakPtrFactory<VideoRendererImpl> frame_callback_weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoRendererImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_RENDERERS_VIDEO_RENDERER_IMPL_H_