Switch to using make_context_current in VTVideoDecodeAccelerator.

content/common/gpu/media/vt_video_decode_accelerator.h

 // Copyright 2014 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 CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 15 matching lines @@
 }  // namespace base
 
 namespace content {
 
 // VideoToolbox.framework implementation of the VideoDecodeAccelerator
 // interface for Mac OS X (currently limited to 10.9+).
 class VTVideoDecodeAccelerator
     : public media::VideoDecodeAccelerator,
       public base::NonThreadSafe {
  public:
-  explicit VTVideoDecodeAccelerator(CGLContextObj cgl_context);
+  explicit VTVideoDecodeAccelerator(
+    CGLContextObj cgl_context,

[Pawel Osciak, 2014/10/20 08:03:29]

Bad indent.

[sandersd (OOO until July 31), 2014/10/20 17:55:50]

Done.

+    const base::Callback<bool(void)>& make_context_current);
   virtual ~VTVideoDecodeAccelerator();
 
   // VideoDecodeAccelerator implementation.
   virtual bool Initialize(
       media::VideoCodecProfile profile,
       Client* client) override;
   virtual void Decode(const media::BitstreamBuffer& bitstream) override;
   virtual void AssignPictureBuffers(
       const std::vector<media::PictureBuffer>& pictures) override;
   virtual void ReusePictureBuffer(int32_t picture_id) override;
@@ skipping 69 matching lines @@
   void CompleteAction(Action action);
 
   // Complete all actions pending for a particular |bitstream_id|.
   // Warning: Do not call if there is a pending ACTION_DESTROY.
   void CompleteActions(int32_t bitstream_id);
 
   //
   // GPU thread state.
   //
   CGLContextObj cgl_context_;
+  base::Callback<bool(void)> make_context_current_;
   media::VideoDecodeAccelerator::Client* client_;
   bool has_error_;  // client_->NotifyError() called.
   gfx::Size texture_size_;
   std::queue<PendingAction> pending_actions_;
   std::queue<int32_t> pending_bitstream_ids_;
 
   // Texture IDs of pictures.
   // TODO(sandersd): A single map of structs holding picture data.
   std::map<int32_t, uint32_t> texture_ids_;
 
@@ skipping 27 matching lines @@
   // Declared last to ensure that all decoder thread tasks complete before any
   // state is destructed.
   base::Thread decoder_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(VTVideoDecodeAccelerator);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_