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

Unified Diff: content/common/gpu/media/vt_video_decode_accelerator.h

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/vt_video_decode_accelerator.h
diff --git a/content/common/gpu/media/vt_video_decode_accelerator.h b/content/common/gpu/media/vt_video_decode_accelerator.h
index 0a385096d437969b7de6b7dcee66c8bd5bb4736f..c7289684351d47abc51caac51b6dcc15d1cc2456 100644
--- a/content/common/gpu/media/vt_video_decode_accelerator.h
+++ b/content/common/gpu/media/vt_video_decode_accelerator.h
@@ -36,7 +36,7 @@ class VTVideoDecodeAccelerator : public media::VideoDecodeAccelerator {
public:
explicit VTVideoDecodeAccelerator(
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);
~VTVideoDecodeAccelerator() override;
@@ -127,7 +127,7 @@ class VTVideoDecodeAccelerator : public media::VideoDecodeAccelerator {
// The GLImage representation of |cv_image|. This is kept around to ensure
// that Destroy is called on it before it hits its destructor (there is a
// DCHECK that requires this).
- scoped_refptr<gfx::GLImageIOSurface> gl_image;
+ scoped_refptr<gl::GLImageIOSurface> gl_image;
// Texture IDs for the image buffer.
const uint32_t client_texture_id;
@@ -187,7 +187,7 @@ class VTVideoDecodeAccelerator : public media::VideoDecodeAccelerator {
// GPU thread state.
//
base::Callback<bool(void)> make_context_current_;
- base::Callback<void(uint32, uint32, scoped_refptr<gfx::GLImage>)> bind_image_;
+ base::Callback<void(uint32, uint32, scoped_refptr<gl::GLImage>)> bind_image_;
media::VideoDecodeAccelerator::Client* client_;
State state_;

Powered by Google App Engine
This is Rietveld 408576698