Mac h264: Work around CGLContext+VTDecompresionSession deadlock

ui/gl/gl_image_io_surface.h

Index: ui/gl/gl_image_io_surface.h
diff --git a/ui/gl/gl_image_io_surface.h b/ui/gl/gl_image_io_surface.h
index 1df77e068892c120b2bdb5a2500c0b12018e6358..99c97fadc767c69944cfb1c020bf492beca708ac 100644
--- a/ui/gl/gl_image_io_surface.h
+++ b/ui/gl/gl_image_io_surface.h
@@ -11,6 +11,7 @@
 
 #include "base/mac/scoped_cftyperef.h"
 #include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "ui/gfx/buffer_types.h"
 #include "ui/gfx/generic_shared_memory_id.h"
@@ -71,6 +72,8 @@ class GL_EXPORT GLImageIOSurface : public GLImage {
   ~GLImageIOSurface() override;
 
  private:
+  class RGBConverter;
+
   const gfx::Size size_;
   const unsigned internalformat_;
   gfx::BufferFormat format_;
@@ -80,13 +83,7 @@ class GL_EXPORT GLImageIOSurface : public GLImage {
   base::ThreadChecker thread_checker_;
 
   // GL state to support 420v IOSurface conversion to RGB.
-  unsigned framebuffer_ = 0;
-  unsigned vertex_shader_ = 0;
-  unsigned fragment_shader_ = 0;
-  unsigned program_ = 0;
-  int size_location_ = -1;
-  unsigned vertex_buffer_ = 0;
-  unsigned yuv_textures_[2] = {};
+  scoped_ptr<RGBConverter> rgb_converter_;
 
   DISALLOW_COPY_AND_ASSIGN(GLImageIOSurface);
 };