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

Unified Diff: media/gpu/avda_shared_state.h

Issue 1998723002: Move code in ui/gl/* from gfx:: to gl:: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 7 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
« no previous file with comments | « media/gpu/avda_codec_image.cc ('k') | media/gpu/avda_shared_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/avda_shared_state.h
diff --git a/media/gpu/avda_shared_state.h b/media/gpu/avda_shared_state.h
index 1366b1f17fe72b7421d9f2c87b82c9d65b55b63a..5fde720f0711057ed2f8d658246585a6ffd0981f 100644
--- a/media/gpu/avda_shared_state.h
+++ b/media/gpu/avda_shared_state.h
@@ -13,7 +13,7 @@
#include "ui/gl/gl_image.h"
#include "ui/gl/gl_surface.h"
-namespace gfx {
+namespace gl {
class SurfaceTexture;
}
@@ -45,9 +45,9 @@ class AVDASharedState : public base::RefCounted<AVDASharedState> {
// Context that the surface texture is bound to, or nullptr if it is not in
// the attached state.
- gfx::GLContext* context() const { return context_.get(); }
+ gl::GLContext* context() const { return context_.get(); }
- gfx::GLSurface* surface() const { return surface_.get(); }
+ gl::GLSurface* surface() const { return surface_.get(); }
bool surface_texture_is_attached() const {
return surface_texture_is_attached_;
@@ -112,8 +112,8 @@ class AVDASharedState : public base::RefCounted<AVDASharedState> {
// Context and surface that the surface texture is attached to, if it is
// currently attached.
- scoped_refptr<gfx::GLContext> context_;
- scoped_refptr<gfx::GLSurface> surface_;
+ scoped_refptr<gl::GLContext> context_;
+ scoped_refptr<gl::GLSurface> surface_;
// Maps a picture buffer id to a AVDACodecImage.
std::map<int, AVDACodecImage*> codec_images_;
« no previous file with comments | « media/gpu/avda_codec_image.cc ('k') | media/gpu/avda_shared_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698