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

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

Issue 10826238: Ensure that the correct open gl context is made current before attempting to write to the open (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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
« no previous file with comments | « content/common/gpu/media/gpu_video_decode_accelerator.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/media/video_decode_accelerator_unittest.cc
===================================================================
--- content/common/gpu/media/video_decode_accelerator_unittest.cc (revision 150949)
+++ content/common/gpu/media/video_decode_accelerator_unittest.cc (working copy)
@@ -310,7 +310,7 @@
SetState(CS_DESTROYED);
}
-#if !defined(OS_WIN) && !defined(OS_MACOSX) && defined(ARCH_CPU_X86_FAMILY)
+#if !defined(OS_MACOSX) && defined(ARCH_CPU_X86_FAMILY)
static bool DoNothingReturnTrue() { return true; }
#endif
@@ -318,7 +318,8 @@
CHECK(decoder_deleted());
CHECK(!decoder_.get());
#if defined(OS_WIN)
- decoder_.reset(new DXVAVideoDecodeAccelerator(this));
+ decoder_.reset(new DXVAVideoDecodeAccelerator(
+ this, base::Bind(&DoNothingReturnTrue)));
#elif defined(OS_MACOSX)
decoder_.reset(new MacVideoDecodeAccelerator(
static_cast<CGLContextObj>(rendering_helper_->GetGLContext()), this));
« no previous file with comments | « content/common/gpu/media/gpu_video_decode_accelerator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698