Revert of Mac: Decode hardware to 420 instead of 422

content/common/gpu/media/gpu_video_decode_accelerator.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 CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 104 matching lines @@
   void OnReset();
   void OnDestroy();
 
   // Called on IO thread when |filter_| has been removed.
   void OnFilterRemoved();
 
   // Sets the texture to cleared.
   void SetTextureCleared(const media::Picture& picture);
 
 #if (defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)) || defined(OS_MACOSX)
-  // Helper to bind |image| to the texture specified by |client_texture_id|. If
-  // |can_bind_to_sampler| is true, then the image may be used as a sampler
-  // directly, otherwise a copy to a staging buffer is required.
+  // Helper to bind |image| to the texture specified by |client_texture_id|.
   void BindImage(uint32_t client_texture_id,
                  uint32_t texture_target,
-                 scoped_refptr<gl::GLImage> image,
-                 bool can_bind_to_sampler);
+                 scoped_refptr<gl::GLImage> image);
 #endif
 
   // Route ID to communicate with the host.
   const int32_t host_route_id_;
 
   // Unowned pointer to the underlying GpuCommandBufferStub.  |this| is
   // registered as a DestuctionObserver of |stub_| and will self-delete when
   // |stub_| is destroyed.
   GpuCommandBufferStub* const stub_;
 
@@ skipping 33 matching lines @@
 
   // A map from picture buffer ID to TextureRef that have not been cleared.
   std::map<int32_t, scoped_refptr<gpu::gles2::TextureRef>> uncleared_textures_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(GpuVideoDecodeAccelerator);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_GPU_VIDEO_DECODE_ACCELERATOR_H_