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

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

Issue 1421903006: ui/gl: Move GLImage into gl namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ozone demo Created 5 years, 2 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 b0ecbd045bbcb2557d24d1b59babe7085bf62118..d5b70aa814066aeaeda4824911614c91210fdb59 100644
--- a/content/common/gpu/media/vaapi_video_decode_accelerator.cc
+++ b/content/common/gpu/media/vaapi_video_decode_accelerator.cc
@@ -291,7 +291,7 @@ VaapiPicture* VaapiVideoDecodeAccelerator::PictureById(
VaapiVideoDecodeAccelerator::VaapiVideoDecodeAccelerator(
const base::Callback<bool(void)>& make_context_current,
- const base::Callback<void(uint32, uint32, scoped_refptr<gfx::GLImage>)>&
+ const base::Callback<void(uint32, uint32, scoped_refptr<gl::GLImage>)>&
bind_image)
: make_context_current_(make_context_current),
state_(kUninitialized),
@@ -732,7 +732,7 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers(
vaapi_wrapper_.get(), make_context_current_, buffers[i].id(),
buffers[i].texture_id(), requested_pic_size_));
- scoped_refptr<gfx::GLImage> image = picture->GetImageToBind();
+ scoped_refptr<gl::GLImage> image = picture->GetImageToBind();
if (image) {
bind_image_.Run(buffers[i].internal_texture_id(),
VaapiPicture::GetGLTextureTarget(), image);

Powered by Google App Engine
This is Rietveld 408576698