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

Unified Diff: ui/gl/gl_image_surface_texture.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: ui/gl/gl_image_surface_texture.h
diff --git a/ui/gl/gl_image_surface_texture.h b/ui/gl/gl_image_surface_texture.h
index f18eaa2cfdf38851f19d87914e6edbca467f056e..808f85b7d5dccb4b8a6df27a2a886abad1b644d4 100644
--- a/ui/gl/gl_image_surface_texture.h
+++ b/ui/gl/gl_image_surface_texture.h
@@ -12,28 +12,31 @@
namespace gfx {
class SurfaceTexture;
+}
+
+namespace gl {
class GL_EXPORT GLImageSurfaceTexture : public GLImage {
public:
- explicit GLImageSurfaceTexture(const Size& size);
+ explicit GLImageSurfaceTexture(const gfx::Size& size);
- bool Initialize(SurfaceTexture* surface_texture);
+ bool Initialize(gfx::SurfaceTexture* surface_texture);
// Overridden from GLImage:
void Destroy(bool have_context) override;
- Size GetSize() override;
+ gfx::Size GetSize() override;
unsigned GetInternalFormat() override;
bool BindTexImage(unsigned target) override;
void ReleaseTexImage(unsigned target) override {}
bool CopyTexImage(unsigned target) override;
bool CopyTexSubImage(unsigned target,
- const Point& offset,
- const Rect& rect) override;
- bool ScheduleOverlayPlane(AcceleratedWidget widget,
+ const gfx::Point& offset,
+ const gfx::Rect& rect) override;
+ bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
int z_order,
- OverlayTransform transform,
- const Rect& bounds_rect,
- const RectF& crop_rect) override;
+ gfx::OverlayTransform transform,
+ const gfx::Rect& bounds_rect,
+ const gfx::RectF& crop_rect) override;
void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd,
uint64_t process_tracing_id,
const std::string& dump_name) override;
@@ -42,14 +45,14 @@ class GL_EXPORT GLImageSurfaceTexture : public GLImage {
~GLImageSurfaceTexture() override;
private:
- scoped_refptr<SurfaceTexture> surface_texture_;
- const Size size_;
+ scoped_refptr<gfx::SurfaceTexture> surface_texture_;
+ const gfx::Size size_;
GLint texture_id_;
base::ThreadChecker thread_checker_;
DISALLOW_COPY_AND_ASSIGN(GLImageSurfaceTexture);
};
-} // namespace gfx
+} // namespace gl
#endif // UI_GL_GL_IMAGE_SURFACE_TEXTURE_H_

Powered by Google App Engine
This is Rietveld 408576698