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

Unified Diff: ui/gl/gl_surface.cc

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 | « ui/gl/gl_surface.h ('k') | ui/gl/gl_surface_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_surface.cc
diff --git a/ui/gl/gl_surface.cc b/ui/gl/gl_surface.cc
index 4716e58b48ff54ad8138c3d79b92e7b93a784a79..541d80656d9c99d0912ca54959940f01efde0a1f 100644
--- a/ui/gl/gl_surface.cc
+++ b/ui/gl/gl_surface.cc
@@ -17,7 +17,7 @@
#include "ui/gl/gl_implementation.h"
#include "ui/gl/gl_switches.h"
-namespace gfx {
+namespace gl {
namespace {
base::LazyInstance<base::ThreadLocalPointer<GLSurface> >::Leaky
@@ -192,28 +192,28 @@ GLSurface::Format GLSurface::GetFormat() {
return SURFACE_DEFAULT;
}
-VSyncProvider* GLSurface::GetVSyncProvider() {
+gfx::VSyncProvider* GLSurface::GetVSyncProvider() {
return NULL;
}
bool GLSurface::ScheduleOverlayPlane(int z_order,
- OverlayTransform transform,
+ gfx::OverlayTransform transform,
gl::GLImage* image,
- const Rect& bounds_rect,
- const RectF& crop_rect) {
+ const gfx::Rect& bounds_rect,
+ const gfx::RectF& crop_rect) {
NOTIMPLEMENTED();
return false;
}
bool GLSurface::ScheduleCALayer(gl::GLImage* contents_image,
- const RectF& contents_rect,
+ const gfx::RectF& contents_rect,
float opacity,
unsigned background_color,
unsigned edge_aa_mask,
- const RectF& rect,
+ const gfx::RectF& rect,
bool is_clipped,
- const RectF& clip_rect,
- const Transform& transform,
+ const gfx::RectF& clip_rect,
+ const gfx::Transform& transform,
int sorting_content_id,
unsigned filter) {
NOTIMPLEMENTED();
@@ -375,15 +375,15 @@ GLSurface::Format GLSurfaceAdapter::GetFormat() {
return surface_->GetFormat();
}
-VSyncProvider* GLSurfaceAdapter::GetVSyncProvider() {
+gfx::VSyncProvider* GLSurfaceAdapter::GetVSyncProvider() {
return surface_->GetVSyncProvider();
}
bool GLSurfaceAdapter::ScheduleOverlayPlane(int z_order,
- OverlayTransform transform,
+ gfx::OverlayTransform transform,
gl::GLImage* image,
- const Rect& bounds_rect,
- const RectF& crop_rect) {
+ const gfx::Rect& bounds_rect,
+ const gfx::RectF& crop_rect) {
return surface_->ScheduleOverlayPlane(
z_order, transform, image, bounds_rect, crop_rect);
}
@@ -402,4 +402,4 @@ bool GLSurfaceAdapter::BuffersFlipped() const {
GLSurfaceAdapter::~GLSurfaceAdapter() {}
-} // namespace gfx
+} // namespace gl
« no previous file with comments | « ui/gl/gl_surface.h ('k') | ui/gl/gl_surface_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698