| Index: ui/gl/gl_image_surface_texture.cc
|
| diff --git a/ui/gl/gl_image_surface_texture.cc b/ui/gl/gl_image_surface_texture.cc
|
| index 6ad3667221be59e72f0395bf4a6143e963f6653e..910551da3a40ecb63239bfa5689c3fb72079661d 100644
|
| --- a/ui/gl/gl_image_surface_texture.cc
|
| +++ b/ui/gl/gl_image_surface_texture.cc
|
| @@ -9,8 +9,9 @@
|
|
|
| namespace gfx {
|
|
|
| -GLImageSurfaceTexture::GLImageSurfaceTexture(const Size& size)
|
| - : size_(size), texture_id_(0) {}
|
| +GLImageSurfaceTexture::GLImageSurfaceTexture(const gfx::Size& size)
|
| + : size_(size), texture_id_(0) {
|
| +}
|
|
|
| GLImageSurfaceTexture::~GLImageSurfaceTexture() {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| @@ -31,9 +32,7 @@
|
| texture_id_ = 0;
|
| }
|
|
|
| -Size GLImageSurfaceTexture::GetSize() {
|
| - return size_;
|
| -}
|
| +gfx::Size GLImageSurfaceTexture::GetSize() { return size_; }
|
|
|
| unsigned GLImageSurfaceTexture::GetInternalFormat() { return GL_RGBA; }
|
|
|
| @@ -79,17 +78,13 @@
|
| return true;
|
| }
|
|
|
| -bool GLImageSurfaceTexture::CopyTexImage(unsigned target) {
|
| - return false;
|
| -}
|
| -
|
| bool GLImageSurfaceTexture::CopyTexSubImage(unsigned target,
|
| const Point& offset,
|
| const Rect& rect) {
|
| return false;
|
| }
|
|
|
| -bool GLImageSurfaceTexture::ScheduleOverlayPlane(AcceleratedWidget widget,
|
| +bool GLImageSurfaceTexture::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
|
| int z_order,
|
| OverlayTransform transform,
|
| const Rect& bounds_rect,
|
|
|