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

Unified Diff: content/common/gpu/gpu_video_decode_accelerator.h

Issue 6979017: Revert 86681 - Updated OMX decoder for recent PPAPI changes, and added to the build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 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/gpu_video_decode_accelerator.h
===================================================================
--- content/common/gpu/gpu_video_decode_accelerator.h (revision 86686)
+++ content/common/gpu/gpu_video_decode_accelerator.h (working copy)
@@ -45,8 +45,7 @@
void set_video_decode_accelerator(
media::VideoDecodeAccelerator* accelerator) {
- DCHECK(!video_decode_accelerator_.get());
- video_decode_accelerator_.reset(accelerator);
+ video_decode_accelerator_ = accelerator;
}
private:
@@ -73,7 +72,7 @@
int32 route_id_;
// Pointer to the underlying VideoDecodeAccelerator.
- scoped_ptr<media::VideoDecodeAccelerator> video_decode_accelerator_;
+ media::VideoDecodeAccelerator* video_decode_accelerator_;
DISALLOW_IMPLICIT_CONSTRUCTORS(GpuVideoDecodeAccelerator);
};
« no previous file with comments | « content/common/gpu/gles2_texture_to_egl_image_translator.cc ('k') | content/common/gpu/gpu_video_decode_accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698