Index: content/common/gpu/media/vaapi_video_decode_accelerator.cc |
diff --git a/content/common/gpu/media/vaapi_video_decode_accelerator.cc b/content/common/gpu/media/vaapi_video_decode_accelerator.cc |
index 75fc61d370769d86c2682e3398c41b02644d6c83..065f8e49d9d624fc88e1c2ccd9196e81c43eeea4 100644 |
--- a/content/common/gpu/media/vaapi_video_decode_accelerator.cc |
+++ b/content/common/gpu/media/vaapi_video_decode_accelerator.cc |
@@ -52,9 +52,12 @@ void VaapiVideoDecodeAccelerator::NotifyError(Error error) { |
} |
VaapiVideoDecodeAccelerator::VaapiVideoDecodeAccelerator( |
+ Display* x_display, GLXContext glx_context, |
Client* client, |
const base::Callback<bool(void)>& make_context_current) |
- : make_context_current_(make_context_current), |
+ : x_display_(x_display), |
+ glx_context_(glx_context), |
+ make_context_current_(make_context_current), |
state_(kUninitialized), |
input_ready_(&lock_), |
output_ready_(&lock_), |
@@ -96,15 +99,6 @@ bool VaapiVideoDecodeAccelerator::Initialize( |
return true; |
} |
-// TODO(posciak, fischman): try to move these to constructor parameters, |
-// but while removing SetEglState from OVDA as well for symmetry. |
-void VaapiVideoDecodeAccelerator::SetGlxState(Display* x_display, |
- GLXContext glx_context) { |
- DCHECK_EQ(message_loop_, MessageLoop::current()); |
- x_display_ = x_display; |
- glx_context_ = glx_context; |
-} |
- |
void VaapiVideoDecodeAccelerator::SyncAndNotifyPictureReady(int32 input_id, |
int32 output_id) { |
DCHECK_EQ(message_loop_, MessageLoop::current()); |