Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d

1 files changed, 9 insertions, 3 deletions

diff --git a/content/common/gpu/media/dxva_video_decode_accelerator.h b/content/common/gpu/media/dxva_video_decode_accelerator.h
index b137946548..26b1ba7d46 100644
--- a/content/common/gpu/media/dxva_video_decode_accelerator.h
+++ b/content/common/gpu/media/dxva_video_decode_accelerator.h
@@ -147,6 +147,15 @@ class CONTENT_EXPORT DXVAVideoDecodeAccelerator
   // Helper for handling the Decode operation.
   void DecodeInternal(const base::win::ScopedComPtr<IMFSample>& input_sample);
 
+  // Handles mid stream resolution changes.
+  void HandleResolutionChanged(int width, int height);
+
+  struct DXVAPictureBuffer;
+  typedef std::map<int32, linked_ptr<DXVAPictureBuffer> > OutputBuffers;
+
+  // Tells the client to dismiss the stale picture buffers passed in.
+  void DismissStaleBuffers(const OutputBuffers& picture_buffers);
+
   // To expose client callbacks from VideoDecodeAccelerator.
   media::VideoDecodeAccelerator::Client* client_;
 
@@ -186,11 +195,8 @@ class CONTENT_EXPORT DXVAVideoDecodeAccelerator
   // List of decoded output samples.
   PendingOutputSamples pending_output_samples_;
 
-  struct DXVAPictureBuffer;
-
   // This map maintains the picture buffers passed the client for decoding.
   // The key is the picture buffer id.
-  typedef std::map<int32, linked_ptr<DXVAPictureBuffer> > OutputBuffers;
   OutputBuffers output_picture_buffers_;
 
   // Set to true if we requested picture slots from the client.