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

Unified Diff: ui/gl/gl_image_stub.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_stub.h
diff --git a/ui/gl/gl_image_stub.h b/ui/gl/gl_image_stub.h
index c95fda9ce3a1b3e369ca054ecc71ab05b4bad310..b5f57445124b68f020177aa8f8d9fbe1deee9dea 100644
--- a/ui/gl/gl_image_stub.h
+++ b/ui/gl/gl_image_stub.h
@@ -7,7 +7,7 @@
#include "ui/gl/gl_image.h"
-namespace gfx {
+namespace gl {
// A GLImage that does nothing for unit tests.
class GL_EXPORT GLImageStub : public GLImage {
@@ -16,19 +16,19 @@ class GL_EXPORT GLImageStub : public GLImage {
// 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 {}
@@ -37,6 +37,6 @@ class GL_EXPORT GLImageStub : public GLImage {
~GLImageStub() override;
};
-} // namespace gfx
+} // namespace gl
#endif // UI_GL_GL_IMAGE_STUB_H_

Powered by Google App Engine
This is Rietveld 408576698