Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1776)

Unified Diff: content/common/gpu/media/vaapi_video_decode_accelerator.cc

Issue 10827074: Replace the explicit *VDA::Set{CGL,Egl,Glx}Context() methods with ctor params. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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());

Powered by Google App Engine
This is Rietveld 408576698