| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/gl/gl_surface.h" | 5 #include "ui/gl/gl_surface.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 const Rect& bounds_rect, | 236 const Rect& bounds_rect, |
| 237 const RectF& crop_rect) { | 237 const RectF& crop_rect) { |
| 238 NOTIMPLEMENTED(); | 238 NOTIMPLEMENTED(); |
| 239 return false; | 239 return false; |
| 240 } | 240 } |
| 241 | 241 |
| 242 bool GLSurface::IsSurfaceless() const { | 242 bool GLSurface::IsSurfaceless() const { |
| 243 return false; | 243 return false; |
| 244 } | 244 } |
| 245 | 245 |
| 246 void GLSurface::SetPageFlipCompletionCallback( |
| 247 const PageFlipCompletionCallback& callback) { |
| 248 } |
| 249 |
| 246 GLSurface* GLSurface::GetCurrent() { | 250 GLSurface* GLSurface::GetCurrent() { |
| 247 return current_surface_.Pointer()->Get(); | 251 return current_surface_.Pointer()->Get(); |
| 248 } | 252 } |
| 249 | 253 |
| 250 GLSurface::~GLSurface() { | 254 GLSurface::~GLSurface() { |
| 251 if (GetCurrent() == this) | 255 if (GetCurrent() == this) |
| 252 SetCurrent(NULL); | 256 SetCurrent(NULL); |
| 253 } | 257 } |
| 254 | 258 |
| 255 void GLSurface::SetCurrent(GLSurface* surface) { | 259 void GLSurface::SetCurrent(GLSurface* surface) { |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 357 const Rect& bounds_rect, | 361 const Rect& bounds_rect, |
| 358 const RectF& crop_rect) { | 362 const RectF& crop_rect) { |
| 359 return surface_->ScheduleOverlayPlane( | 363 return surface_->ScheduleOverlayPlane( |
| 360 z_order, transform, image, bounds_rect, crop_rect); | 364 z_order, transform, image, bounds_rect, crop_rect); |
| 361 } | 365 } |
| 362 | 366 |
| 363 bool GLSurfaceAdapter::IsSurfaceless() const { | 367 bool GLSurfaceAdapter::IsSurfaceless() const { |
| 364 return surface_->IsSurfaceless(); | 368 return surface_->IsSurfaceless(); |
| 365 } | 369 } |
| 366 | 370 |
| 371 void GLSurfaceAdapter::SetPageFlipCompletionCallback( |
| 372 const PageFlipCompletionCallback& callback) { |
| 373 surface_->SetPageFlipCompletionCallback(callback); |
| 374 } |
| 375 |
| 367 GLSurfaceAdapter::~GLSurfaceAdapter() {} | 376 GLSurfaceAdapter::~GLSurfaceAdapter() {} |
| 368 | 377 |
| 369 } // namespace gfx | 378 } // namespace gfx |
| OLD | NEW |