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

Unified Diff: content/common/gpu/media/vaapi_drm_picture.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_drm_picture.h
diff --git a/content/common/gpu/media/vaapi_drm_picture.h b/content/common/gpu/media/vaapi_drm_picture.h
index 4a0b83bce17a37105060604e6e6f5df47bfe50ce..4ea787fbcff4738a6799907b4559a3badd5b300c 100644
--- a/content/common/gpu/media/vaapi_drm_picture.h
+++ b/content/common/gpu/media/vaapi_drm_picture.h
@@ -15,7 +15,7 @@
#include "content/common/gpu/media/vaapi_picture.h"
#include "ui/gfx/geometry/size.h"
-namespace gfx {
+namespace gl {
class GLImage;
}
@@ -42,7 +42,7 @@ class VaapiDrmPicture : public VaapiPicture {
bool DownloadFromSurface(const scoped_refptr<VASurface>& va_surface) override;
- scoped_refptr<gfx::GLImage> GetImageToBind() override;
+ scoped_refptr<gl::GLImage> GetImageToBind() override;
bool AllowOverlay() const override;
@@ -69,7 +69,7 @@ class VaapiDrmPicture : public VaapiPicture {
scoped_refptr<ui::NativePixmap> scaled_pixmap_;
// EGLImage bound to the GL textures used by the VDA client.
- scoped_refptr<gfx::GLImage> gl_image_;
+ scoped_refptr<gl::GLImage> gl_image_;
// VASurface used to transfer from the decoder's pixel format.
scoped_refptr<VASurface> va_surface_;

Powered by Google App Engine
This is Rietveld 408576698