| Index: content/common/gpu/media/gpu_video_decode_accelerator.cc
|
| diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc
|
| index 160d0c31c5cbe2f1517d33d4a916c8a506ad1859..e91ba28b2eb9a33a5d019552930c8f39610dd7d4 100644
|
| --- a/content/common/gpu/media/gpu_video_decode_accelerator.cc
|
| +++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc
|
| @@ -57,7 +57,7 @@ static bool MakeDecoderContextCurrent(
|
| return true;
|
| }
|
|
|
| -#if (defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)) || defined(OS_MACOSX)
|
| +#if ((defined(OS_CHROMEOS) || defined(OS_LINUX)) && defined(ARCH_CPU_X86_FAMILY)) || defined(OS_MACOSX)
|
| static bool BindImage(const base::WeakPtr<gpu::GpuCommandBufferStub>& stub,
|
| uint32_t client_texture_id,
|
| uint32_t texture_target,
|
| @@ -169,7 +169,7 @@ GpuVideoDecodeAccelerator::GpuVideoDecodeAccelerator(
|
| get_gl_context_cb_ = base::Bind(&GetGLContext, stub_->AsWeakPtr());
|
| make_context_current_cb_ =
|
| base::Bind(&MakeDecoderContextCurrent, stub_->AsWeakPtr());
|
| -#if (defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)) || defined(OS_MACOSX)
|
| +#if ((defined(OS_CHROMEOS) || defined(OS_LINUX)) && defined(ARCH_CPU_X86_FAMILY)) || defined(OS_MACOSX)
|
| bind_image_cb_ = base::Bind(&BindImage, stub_->AsWeakPtr());
|
| #endif
|
| get_gles2_decoder_cb_ = base::Bind(&GetGLES2Decoder, stub_->AsWeakPtr());
|
|
|