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

Unified Diff: ui/gl/gl_image_memory.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_memory.h
diff --git a/ui/gl/gl_image_memory.h b/ui/gl/gl_image_memory.h
index 3ee67b29f99d909eedad34da52bfd5a2d027c596..3ce0440146d2ac53f26880ffa8244686063b0db1 100644
--- a/ui/gl/gl_image_memory.h
+++ b/ui/gl/gl_image_memory.h
@@ -10,46 +10,46 @@
#include "base/numerics/safe_math.h"
#include "ui/gfx/buffer_types.h"
-namespace gfx {
+namespace gl {
class GL_EXPORT GLImageMemory : public GLImage {
public:
- GLImageMemory(const Size& size, unsigned internalformat);
+ GLImageMemory(const gfx::Size& size, unsigned internalformat);
- bool Initialize(const unsigned char* memory, BufferFormat format);
+ bool Initialize(const unsigned char* memory, gfx::BufferFormat format);
// 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;
- static unsigned GetInternalFormatForTesting(BufferFormat format);
+ static unsigned GetInternalFormatForTesting(gfx::BufferFormat format);
protected:
~GLImageMemory() override;
- BufferFormat format() const { return format_; }
+ gfx::BufferFormat format() const { return format_; }
private:
- const Size size_;
+ const gfx::Size size_;
const unsigned internalformat_;
const unsigned char* memory_;
- BufferFormat format_;
+ gfx::BufferFormat format_;
DISALLOW_COPY_AND_ASSIGN(GLImageMemory);
};
-} // namespace gfx
+} // namespace gl
#endif // UI_GL_GL_IMAGE_MEMORY_H_

Powered by Google App Engine
This is Rietveld 408576698