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

Unified Diff: content/common/gpu/media/vt_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/vt_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/vt_video_decode_accelerator.cc b/content/common/gpu/media/vt_video_decode_accelerator.cc
index 076c9dcd3c8f32a0ebd786446cf72c0d530dcf0d..2947fe1dc303b2c2fce5a53e814cf27d27f14ade 100644
--- a/content/common/gpu/media/vt_video_decode_accelerator.cc
+++ b/content/common/gpu/media/vt_video_decode_accelerator.cc
@@ -300,7 +300,7 @@ bool VTVideoDecodeAccelerator::FrameOrder::operator()(
VTVideoDecodeAccelerator::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)
: make_context_current_(make_context_current),
bind_image_(bind_image),
@@ -1044,8 +1044,8 @@ bool VTVideoDecodeAccelerator::SendFrame(const Frame& frame) {
}
bool allow_overlay = false;
- scoped_refptr<gfx::GLImageIOSurface> gl_image(
- new gfx::GLImageIOSurface(frame.coded_size, GL_BGRA_EXT));
+ scoped_refptr<gl::GLImageIOSurface> gl_image(
+ new gl::GLImageIOSurface(frame.coded_size, GL_BGRA_EXT));
if (gl_image->Initialize(surface, gfx::GenericSharedMemoryId(),
gfx::BufferFormat::BGRA_8888)) {
allow_overlay = true;

Powered by Google App Engine
This is Rietveld 408576698