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

Unified Diff: content/common/gpu/media/vaapi_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/vaapi_video_decode_accelerator.h
diff --git a/content/common/gpu/media/vaapi_video_decode_accelerator.h b/content/common/gpu/media/vaapi_video_decode_accelerator.h
index fe929381218190bbe95247e46018877db36604eb..ac9f4be941e2e89dccd0801757d0c65989afd0a1 100644
--- a/content/common/gpu/media/vaapi_video_decode_accelerator.h
+++ b/content/common/gpu/media/vaapi_video_decode_accelerator.h
@@ -28,7 +28,7 @@
#include "media/video/picture.h"
#include "media/video/video_decode_accelerator.h"
-namespace gfx {
+namespace gl {
class GLImage;
}
@@ -52,7 +52,7 @@ class CONTENT_EXPORT 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);
~VaapiVideoDecodeAccelerator() override;
@@ -303,7 +303,7 @@ class CONTENT_EXPORT VaapiVideoDecodeAccelerator
// Binds the provided GLImage to a givenr client texture ID & texture target
// combination in GLES.
- base::Callback<void(uint32, uint32, scoped_refptr<gfx::GLImage>)> bind_image_;
+ base::Callback<void(uint32, uint32, scoped_refptr<gl::GLImage>)> bind_image_;
// The WeakPtrFactory for |weak_this_|.
base::WeakPtrFactory<VaapiVideoDecodeAccelerator> weak_this_factory_;

Powered by Google App Engine
This is Rietveld 408576698