Remove VideoDecoder::natural_size() & added VideoFrame::natural_size().

media/filters/video_renderer_base.h

 // Copyright (c) 2012 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_FILTERS_VIDEO_RENDERER_BASE_H_
 #define MEDIA_FILTERS_VIDEO_RENDERER_BASE_H_
 
 #include <deque>
 
 #include "base/memory/ref_counted.h"
@@ skipping 98 matching lines @@
 
   // Safely handles entering to an error state.
   void EnterErrorState_Locked(PipelineStatus status);
 
   // Helper function that flushes the buffers when a Stop() or error occurs.
   void DoStopOrError_Locked();
 
   // Return the number of frames currently held by this class.
   int NumFrames_Locked() const;
 
+  // Updates |current_frame_| to the next frame on |ready_frames_| and calls
+  // |size_changed_cb_| if the natural size changes.
+  void SetCurrentFrameToNextReadyFrame();
+
   // Used for accessing data members.
   base::Lock lock_;
 
   scoped_refptr<VideoDecoder> decoder_;
 
   // Queue of incoming frames as well as the current frame since the last time
   // OnFrameAvailable() was called.
   typedef std::deque<scoped_refptr<VideoFrame> > VideoFrameQueue;
   VideoFrameQueue ready_frames_;
 
@@ skipping 92 matching lines @@
   // |preroll_timestamp_| is between this frame and the next one.
   scoped_refptr<VideoFrame> prerolling_delayed_frame_;
 
   // Embedder callback for notifying a new frame is available for painting.
   base::Closure paint_cb_;
 
   // Callback to execute to inform the player if the video decoder's output is
   // opaque.
   SetOpaqueCB set_opaque_cb_;
 
+  // The last natural size |size_changed_cb_| was called with.
+  gfx::Size last_natural_size_;
+
   DISALLOW_COPY_AND_ASSIGN(VideoRendererBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_VIDEO_RENDERER_BASE_H_