| 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 <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 NOTIMPLEMENTED(); | 186 NOTIMPLEMENTED(); |
| 187 return 0; | 187 return 0; |
| 188 } | 188 } |
| 189 | 189 |
| 190 VSyncProvider* GLSurface::GetVSyncProvider() { | 190 VSyncProvider* GLSurface::GetVSyncProvider() { |
| 191 return NULL; | 191 return NULL; |
| 192 } | 192 } |
| 193 | 193 |
| 194 bool GLSurface::ScheduleOverlayPlane(int z_order, | 194 bool GLSurface::ScheduleOverlayPlane(int z_order, |
| 195 OverlayTransform transform, | 195 OverlayTransform transform, |
| 196 gfx::BufferFormat storage_format, |
| 196 gl::GLImage* image, | 197 gl::GLImage* image, |
| 197 const Rect& bounds_rect, | 198 const Rect& bounds_rect, |
| 198 const RectF& crop_rect) { | 199 const RectF& crop_rect, |
| 200 bool handle_scaling) { |
| 199 NOTIMPLEMENTED(); | 201 NOTIMPLEMENTED(); |
| 200 return false; | 202 return false; |
| 201 } | 203 } |
| 202 | 204 |
| 203 bool GLSurface::ScheduleCALayer(gl::GLImage* contents_image, | 205 bool GLSurface::ScheduleCALayer(gl::GLImage* contents_image, |
| 204 const RectF& contents_rect, | 206 const RectF& contents_rect, |
| 205 float opacity, | 207 float opacity, |
| 206 unsigned background_color, | 208 unsigned background_color, |
| 207 const SizeF& bounds_size, | 209 const SizeF& bounds_size, |
| 208 const gfx::Transform& transform) { | 210 const gfx::Transform& transform) { |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 unsigned GLSurfaceAdapter::GetFormat() { | 356 unsigned GLSurfaceAdapter::GetFormat() { |
| 355 return surface_->GetFormat(); | 357 return surface_->GetFormat(); |
| 356 } | 358 } |
| 357 | 359 |
| 358 VSyncProvider* GLSurfaceAdapter::GetVSyncProvider() { | 360 VSyncProvider* GLSurfaceAdapter::GetVSyncProvider() { |
| 359 return surface_->GetVSyncProvider(); | 361 return surface_->GetVSyncProvider(); |
| 360 } | 362 } |
| 361 | 363 |
| 362 bool GLSurfaceAdapter::ScheduleOverlayPlane(int z_order, | 364 bool GLSurfaceAdapter::ScheduleOverlayPlane(int z_order, |
| 363 OverlayTransform transform, | 365 OverlayTransform transform, |
| 366 gfx::BufferFormat storage_format, |
| 364 gl::GLImage* image, | 367 gl::GLImage* image, |
| 365 const Rect& bounds_rect, | 368 const Rect& bounds_rect, |
| 366 const RectF& crop_rect) { | 369 const RectF& crop_rect, |
| 370 bool handle_scaling) { |
| 367 return surface_->ScheduleOverlayPlane( | 371 return surface_->ScheduleOverlayPlane( |
| 368 z_order, transform, image, bounds_rect, crop_rect); | 372 z_order, transform, storage_format, image, bounds_rect, crop_rect, |
| 373 handle_scaling); |
| 369 } | 374 } |
| 370 | 375 |
| 371 bool GLSurfaceAdapter::IsSurfaceless() const { | 376 bool GLSurfaceAdapter::IsSurfaceless() const { |
| 372 return surface_->IsSurfaceless(); | 377 return surface_->IsSurfaceless(); |
| 373 } | 378 } |
| 374 | 379 |
| 375 GLSurfaceAdapter::~GLSurfaceAdapter() {} | 380 GLSurfaceAdapter::~GLSurfaceAdapter() {} |
| 376 | 381 |
| 377 } // namespace gfx | 382 } // namespace gfx |
| OLD | NEW |